diff --git a/android/build.gradle b/android/build.gradle index 07d3b9a..342cde9 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ sourceCompatibility = 1.6 targetCompatibility = 1.6 // Description of the project -description = 'justCheckers' +description = 'justcheckers-android' version = '0.3' // Androids!!! @@ -42,6 +42,5 @@ repositories { // Dependency management dependencies { - - compile 'jdom:jdom:0.7' // TODO: Get rid of the JDOM and use Android's content provider. + compile project(':core') } \ No newline at end of file diff --git a/build.gradle b/build.gradle index c46cf6b..1800ef5 100755 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ sourceCompatibility = 1.6 targetCompatibility = 1.6 // Description of the project -description = 'justCheckers' +description = 'justcheckers' version = '0.3' // TODO Add in extra targets for project setup or a simplified Gradle build API. \ No newline at end of file diff --git a/console/build.gradle b/console/build.gradle index 30a9c04..db28046 100755 --- a/console/build.gradle +++ b/console/build.gradle @@ -15,7 +15,18 @@ sourceCompatibility = 1.6 targetCompatibility = 1.6 // Description of the project -description = 'justCheckers' +description = 'justcheckers-console' version = '0.3' -// TODO Add in build for the terminal client. \ No newline at end of file +// TODO Add in build for the terminal client. +// TODO Base of justcheckers-core + +// TODO Look into potential terminal libraries... +/* + Ideas: http://stackoverflow.com/questions/1321308/whats-the-best-way-to-get-text-user-interfaces-ncurses-like-functionality-in + - Laterna: https://code.google.com/p/lanterna/ + - jCurses: http://sourceforge.net/projects/javacurses/ + - TUIAWT: http://bmsi.com/tuipeer/ + - CHARVA: http://www.pitman.co.za/projects/charva/index.html +*/ + diff --git a/core/build.gradle b/core/build.gradle index 22f204a..9d7f3ce 100755 --- a/core/build.gradle +++ b/core/build.gradle @@ -15,7 +15,46 @@ sourceCompatibility = 1.6 targetCompatibility = 1.6 // Description of the project -description = 'justCheckers' +description = 'justcheckers-core' version = '0.3' -// TODO Add in a separate build for just the core application... \ No newline at end of file +project.ext { + appName = 'justcheckers-core' +} + +// Setup build script repositories starting with Maven repositories +repositories { + maven { + url 'http://repo1.maven.org/maven2' + } +} + +// Dependency management +dependencies { + compile 'jdom:jdom:0.7' + testCompile 'org.testng:testng:6.8' +} + +// At the end of day we just need a JAR and a WAR. +ext.sharedManifest = manifest { + + attributes( + 'App-Name' : project.appName, + 'App-Version' : version, + 'Build-User' : System.properties['user.name'], + 'Build-Time' : new Date().format('yyyy-MMMM-dd HH:mm:ss'), + 'Build-OS' : System.properties['os.name'] + ' - version ' + System.properties['os.version'], + 'Build-Sys' : System.properties['os.arch'], + 'Java-Version' : System.properties['java.version'], + 'Java-Vendor' : System.properties['java.vendor'], + 'Java-VM' : + System.properties['java.vm.vendor'] + ' ' + System.properties['java.vm.name'] + ' v' + + System.properties['java.vm.version']) +} + +// Build the JAR. +jar { + enabled = true + includeEmptyDirs = false + manifest = sharedManifest +} \ No newline at end of file diff --git a/android/src/main/java/org/justcheckers/common/GlobalConstants.java b/core/src/main/java/org/justcheckers/common/GlobalConstants.java similarity index 100% rename from android/src/main/java/org/justcheckers/common/GlobalConstants.java rename to core/src/main/java/org/justcheckers/common/GlobalConstants.java diff --git a/android/src/main/java/org/justcheckers/common/LoggingAndStatistics.java b/core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java similarity index 100% rename from android/src/main/java/org/justcheckers/common/LoggingAndStatistics.java rename to core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java diff --git a/android/src/main/java/org/justcheckers/game/Board.java b/core/src/main/java/org/justcheckers/game/Board.java similarity index 100% rename from android/src/main/java/org/justcheckers/game/Board.java rename to core/src/main/java/org/justcheckers/game/Board.java diff --git a/android/src/main/java/org/justcheckers/game/Game.java b/core/src/main/java/org/justcheckers/game/Game.java similarity index 100% rename from android/src/main/java/org/justcheckers/game/Game.java rename to core/src/main/java/org/justcheckers/game/Game.java diff --git a/android/src/main/java/org/justcheckers/game/GameEngine.java b/core/src/main/java/org/justcheckers/game/GameEngine.java similarity index 100% rename from android/src/main/java/org/justcheckers/game/GameEngine.java rename to core/src/main/java/org/justcheckers/game/GameEngine.java diff --git a/android/src/main/java/org/justcheckers/game/Player.java b/core/src/main/java/org/justcheckers/game/Player.java similarity index 100% rename from android/src/main/java/org/justcheckers/game/Player.java rename to core/src/main/java/org/justcheckers/game/Player.java diff --git a/android/src/main/java/org/justcheckers/game/Rulebook.java b/core/src/main/java/org/justcheckers/game/Rulebook.java similarity index 100% rename from android/src/main/java/org/justcheckers/game/Rulebook.java rename to core/src/main/java/org/justcheckers/game/Rulebook.java diff --git a/android/src/main/java/org/justcheckers/xml/ConfigSettings.java b/core/src/main/java/org/justcheckers/xml/ConfigSettings.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/ConfigSettings.java rename to core/src/main/java/org/justcheckers/xml/ConfigSettings.java diff --git a/android/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java b/core/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java rename to core/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java diff --git a/android/src/main/java/org/justcheckers/xml/GameSettings.java b/core/src/main/java/org/justcheckers/xml/GameSettings.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/GameSettings.java rename to core/src/main/java/org/justcheckers/xml/GameSettings.java diff --git a/android/src/main/java/org/justcheckers/xml/GameSettingsIO.java b/core/src/main/java/org/justcheckers/xml/GameSettingsIO.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/GameSettingsIO.java rename to core/src/main/java/org/justcheckers/xml/GameSettingsIO.java diff --git a/android/src/main/java/org/justcheckers/xml/Settings.java b/core/src/main/java/org/justcheckers/xml/Settings.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/Settings.java rename to core/src/main/java/org/justcheckers/xml/Settings.java diff --git a/android/src/main/java/org/justcheckers/xml/UserSettings.java b/core/src/main/java/org/justcheckers/xml/UserSettings.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/UserSettings.java rename to core/src/main/java/org/justcheckers/xml/UserSettings.java diff --git a/android/src/main/java/org/justcheckers/xml/UserSettingsIO.java b/core/src/main/java/org/justcheckers/xml/UserSettingsIO.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/UserSettingsIO.java rename to core/src/main/java/org/justcheckers/xml/UserSettingsIO.java diff --git a/android/src/main/java/org/justcheckers/xml/VisitDOM.java b/core/src/main/java/org/justcheckers/xml/VisitDOM.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/VisitDOM.java rename to core/src/main/java/org/justcheckers/xml/VisitDOM.java diff --git a/android/src/main/java/org/justcheckers/xml/XMLFileFilter.java b/core/src/main/java/org/justcheckers/xml/XMLFileFilter.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/XMLFileFilter.java rename to core/src/main/java/org/justcheckers/xml/XMLFileFilter.java diff --git a/android/src/main/java/org/justcheckers/xml/XML_IO.java b/core/src/main/java/org/justcheckers/xml/XML_IO.java similarity index 100% rename from android/src/main/java/org/justcheckers/xml/XML_IO.java rename to core/src/main/java/org/justcheckers/xml/XML_IO.java diff --git a/android/src/main/java/org/justcheckers/test/game/AmericanGameTest.java b/core/src/test/java/org/justcheckers/test/game/AmericanGameTest.java similarity index 100% rename from android/src/main/java/org/justcheckers/test/game/AmericanGameTest.java rename to core/src/test/java/org/justcheckers/test/game/AmericanGameTest.java diff --git a/android/src/main/java/org/justcheckers/test/game/GameLogicTest.java b/core/src/test/java/org/justcheckers/test/game/GameLogicTest.java similarity index 100% rename from android/src/main/java/org/justcheckers/test/game/GameLogicTest.java rename to core/src/test/java/org/justcheckers/test/game/GameLogicTest.java diff --git a/android/src/main/java/org/justcheckers/test/game/GameStateTest.java b/core/src/test/java/org/justcheckers/test/game/GameStateTest.java similarity index 100% rename from android/src/main/java/org/justcheckers/test/game/GameStateTest.java rename to core/src/test/java/org/justcheckers/test/game/GameStateTest.java diff --git a/android/src/main/java/org/justcheckers/test/game/InternationalGameTest.java b/core/src/test/java/org/justcheckers/test/game/InternationalGameTest.java similarity index 100% rename from android/src/main/java/org/justcheckers/test/game/InternationalGameTest.java rename to core/src/test/java/org/justcheckers/test/game/InternationalGameTest.java diff --git a/desktop/build.gradle b/desktop/build.gradle index 9604fde..675739d 100755 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -15,7 +15,7 @@ sourceCompatibility = 1.6 targetCompatibility = 1.6 // Description of the project -description = 'justCheckers' +description = 'justcheckers-desktop' version = '0.3' // TODO Add in build for the desktop client. \ No newline at end of file diff --git a/web/build.gradle b/web/build.gradle index 0a9f75c..44d1129 100755 --- a/web/build.gradle +++ b/web/build.gradle @@ -25,12 +25,12 @@ sourceCompatibility = 1.6 targetCompatibility = 1.6 // Description of the project -description = 'justCheckers' +description = 'justcheckers-web' version = '0.3' project.ext { - appName = 'justCheckers' + appName = 'justcheckers-web' appBaseName = "justcheckers" hibernateVersion = '3.5.4-Final'