Simplified gradle structure.

2 files changed, 17 insertions, 40 deletions

diff --git a/java/demo/Manual/build.gradle b/java/demo/Manual/build.gradle
index 32a101b37b9..d9242037b88 100644
--- a/java/demo/Manual/build.gradle
+++ b/java/demo/Manual/build.gradle
@@ -27,43 +27,31 @@
 			}
 		}
 
-		if (useMavenJars) {
-			dependencies {
-				compile "com.zeroc:ice:${iceVersion}"
-			}
-		} else if (distJarDir != null) {
-			dependencies {
-				compile files("${distJarDir}/Ice${versionSuffix}.jar")
-			}
-		} else {
-			dependencies {
-				compile project(':Ice')
-			}
+		dependencies {
+			compile localDependency("ice")
 		}
 
 		if(name == "EvictorFilesystem") {
-			if (distJarDir == null) {
-				dependencies {
-					compile project(':Freeze')
-				}
-			} else {
-				dependencies {
-					compile files("${distJarDir}/Freeze${versionSuffix}.jar")
-					compile 'com.sleepycat:db:5.3.28'
-				}
+			dependencies {
+				compile localDependency("freeze")
+			}
+			dependencies {
+				runtime "com.sleepycat:db:${dbVersion}"
 			}
 		}
 
 		// Create a jar for the client & server which includes everything in the demo.
 		task clientJar(type: Jar) {
- 		   baseName = "client"
+			version = ""
+ 		   	baseName = "client"
     		from(sourceSets.main.output) {
         		include "**"
     		}
 		}
 
 		task serverJar(type: Jar) {
- 		   baseName = "server"
+			version = ""
+ 		    baseName = "server"
     		from(sourceSets.main.output) {
         		include "**"
     		}
diff --git a/java/demo/Manual/map_filesystem/build.gradle b/java/demo/Manual/map_filesystem/build.gradle
index 9cfcbe348b2..e1716c5730e 100644
--- a/java/demo/Manual/map_filesystem/build.gradle
+++ b/java/demo/Manual/map_filesystem/build.gradle
@@ -43,27 +43,15 @@ sourceSets {
 	}
 }
 
-if (useMavenJars) {
-	dependencies {
-		compile "com.zeroc:ice:${iceVersion}"
-		compile "com.zeroc:freeze:${iceVersion}"
-		compile 'com.sleepycat:db:5.3.28'
-	}
-} else if (distJarDir != null) {
-	dependencies {
-		compile files("${distJarDir}/Ice${versionSuffix}.jar")
-		compile files("${distJarDir}/Freeze${versionSuffix}.jar")
-		compile 'com.sleepycat:db:5.3.28'
-	}
-} else {
-	dependencies {
-		compile project(':Ice')
-		compile project(':Freeze')
-	}
+dependencies {
+	compile localDependency("ice")
+	compile localDependency("freeze")
+	compile "com.sleepycat:db:${dbVersion}"
 }
 
 // Create a jar for the client & server which includes everything in the demo.
 task clientJar(type: Jar) {
+	version = ""
    	baseName = "client"
     from(sourceSets.main.output) {
     	include "**"
@@ -71,6 +59,7 @@ task clientJar(type: Jar) {
 }
 
 task serverJar(type: Jar) {
+	version = ""
     baseName = "server"
     from(sourceSets.main.output) {
     	include "**"