Updated gradle build system.

12 files changed, 38 insertions, 55 deletions

diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index 475bbb6e142..43fe7c805b8 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -21,15 +21,13 @@ sourceSets {
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.Glacier2.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.Glacier2.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index 931d0250427..cd94efe243b 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -13,13 +13,8 @@ project.ext.description = "Ice is a comprehensive RPC framework that helps you b
 
 slice {
     java {
-        stream {
-            files = [file("$project.ext.topSrcDir/slice/Ice/BuiltinSequences.ice")]
-        }
-        nostream {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice'],
-                excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice'])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice'],
+                excludes:['Ice/*F.ice'])
     }
 }
 
diff --git a/java/src/IceBT/build.gradle b/java/src/IceBT/build.gradle
index 50af1bc4a86..1f4d6ff2adf 100644
--- a/java/src/IceBT/build.gradle
+++ b/java/src/IceBT/build.gradle
@@ -17,7 +17,7 @@ slice {
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index 99c6799a01a..208048212a0 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -12,15 +12,13 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IceBox.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IceBox.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index f1cd6fa569a..84be9b17e73 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -17,7 +17,7 @@ slice {
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index 37f92fedffd..481fdfbab9b 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -12,16 +12,14 @@ project.ext.description = "Locate, deploy, and manage Ice servers"
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IceGrid.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IceGrid.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
-    compile project(':glacier2')
+    implementation project(':ice')
+    implementation project(':glacier2')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index c6fa42c7340..228933ecf58 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -54,21 +54,21 @@ tasks.withType(JavaCompile) {
 }
 
 dependencies {
-      compile project(':ice')
-      compile project(':icessl')
-      compile project(':icelocatordiscovery')
-      compile project(':icebox')
-      compile project(':icestorm')
-      compile project(':glacier2')
-      compile project(':icegrid')
-      compile "com.jgoodies:jgoodies-looks:${jgoodiesLooksVersion}"
-      compile "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
+      implementation project(':ice')
+      implementation project(':icessl')
+      implementation project(':icelocatordiscovery')
+      implementation project(':icebox')
+      implementation project(':icestorm')
+      implementation project(':glacier2')
+      implementation project(':icegrid')
+      implementation "com.jgoodies:jgoodies-looks:${jgoodiesLooksVersion}"
+      implementation "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
 
       if(hasJavaFx && GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
-           compile "org.openjfx:javafx-base:11:$platform"
-           compile "org.openjfx:javafx-swing:11:$platform"
-           compile "org.openjfx:javafx-controls:11:$platform"
-           compile "org.openjfx:javafx-graphics:11:$platform"
+           implementation "org.openjfx:javafx-base:11:$platform"
+           implementation "org.openjfx:javafx-swing:11:$platform"
+           implementation "org.openjfx:javafx-controls:11:$platform"
+           implementation "org.openjfx:javafx-graphics:11:$platform"
       }
 }
 
diff --git a/java/src/IceGridGUI/plain-jar.gradle b/java/src/IceGridGUI/plain-jar.gradle
index 5964cb0d163..42cade1f2f4 100644
--- a/java/src/IceGridGUI/plain-jar.gradle
+++ b/java/src/IceGridGUI/plain-jar.gradle
@@ -20,7 +20,7 @@ task updateManifest(dependsOn: copyTmpJars) {
             delegate.manifest {
                 attribute(name: "Main-Class", value: "com.zeroc.IceGridGUI.Main")
                 attribute(name: "Built-By", value: "ZeroC, Inc.")
-                attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.toURI().getRawPath()}" }.join(' '))
+                attribute(name: "Class-Path", value: configurations.runtimeClasspath.resolve().collect { "file://${it.toURI().getRawPath()}" }.join(' '))
             }
         }
     }
@@ -47,7 +47,7 @@ task updateInstallManifest(dependsOn: copyJars) {
             delegate.manifest {
                 attribute(name: "Main-Class", value: "com.zeroc.IceGridGUI.Main")
                 attribute(name: "Built-By", value: "ZeroC, Inc.")
-                attribute(name: "Class-Path", value: configurations.runtime.resolve().collect {
+                attribute(name: "Class-Path", value: configurations.runtimeClasspath.resolve().collect {
                     "file://${it.toURI().getRawPath()}" }.join(' ').replaceAll("${libDir.replaceAll('\\\\', '/')}", "${jarDir.replaceAll('\\\\', '/')}"))
             }
         }
diff --git a/java/src/IceLocatorDiscovery/build.gradle b/java/src/IceLocatorDiscovery/build.gradle
index c73d0bb9ade..2bd026db35d 100644
--- a/java/src/IceLocatorDiscovery/build.gradle
+++ b/java/src/IceLocatorDiscovery/build.gradle
@@ -17,7 +17,7 @@ slice {
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index 35ee4df12c1..b218a36607c 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -12,15 +12,13 @@ project.ext.description = "File distribution and patching for Ice"
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IceSSL/build.gradle b/java/src/IceSSL/build.gradle
index f3f81fa71a7..9fd3544c901 100644
--- a/java/src/IceSSL/build.gradle
+++ b/java/src/IceSSL/build.gradle
@@ -12,14 +12,12 @@ project.ext.description = "The IceSSL plug-in"
 
 slice {
     java {
-        nostream {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['IceSSL/*.ice'])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['IceSSL/*.ice'])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 27a340480a5..71e074f9b50 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -21,15 +21,13 @@ sourceSets {
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IceStorm.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IceStorm.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"