summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Glacier2/build.gradle2
-rw-r--r--java/src/Ice/build.gradle4
-rw-r--r--java/src/IceBox/build.gradle2
-rw-r--r--java/src/IceDiscovery/build.gradle2
-rw-r--r--java/src/IceGrid/build.gradle2
-rw-r--r--java/src/IceGridGUI/build.gradle10
-rw-r--r--java/src/IceLocatorDiscovery/build.gradle2
-rw-r--r--java/src/IcePatch2/build.gradle2
-rw-r--r--java/src/IceStorm/build.gradle2
9 files changed, 14 insertions, 14 deletions
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index dc8f0defc4f..0dec9069821 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -13,7 +13,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
set1 {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice --tie --checksum Glacier2.SliceChecksums"
files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
}
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index acc5e1bcf89..661a467c324 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -17,10 +17,10 @@ slice {
files = [file("$sliceDir/Ice/BuiltinSequences.ice")]
}
nostream {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice"
files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice', 'IceSSL/*.ice'],
- excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice'])
+ excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice'])
}
}
}
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index 48e24968cdd..acd8d2a812c 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -13,7 +13,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
set1 {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice --tie --checksum IceBox.SliceChecksums"
files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"])
}
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index e1a26ffd2ec..344098b36f6 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -12,7 +12,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice"
files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
}
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index 21e975b9746..cfb2dd99525 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -13,7 +13,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
set1 {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice --tie --checksum IceGrid.SliceChecksums"
files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
}
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 112233c79e5..184fcffc8d7 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -84,11 +84,11 @@ if (hasJavaFx) {
}
task proguardJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
- injars configurations.compile.resolve(), filter: '!META-INF/**'
- injars "${projectDir}/build/libs/${tmpJarName}"
- outjars "${libDir}/${jarName}"
- libraryjars libJars
- configuration 'icegridgui.pro'
+ injars configurations.compile.resolve(), filter: '!META-INF/**'
+ injars "${projectDir}/build/libs/${tmpJarName}"
+ outjars "${libDir}/${jarName}"
+ libraryjars libJars
+ configuration 'icegridgui.pro'
}
task updateManifest(dependsOn: proguardJar) << {
if (hasJavaFx) {
diff --git a/java/src/IceLocatorDiscovery/build.gradle b/java/src/IceLocatorDiscovery/build.gradle
index 1a47ef9dd78..021611350e4 100644
--- a/java/src/IceLocatorDiscovery/build.gradle
+++ b/java/src/IceLocatorDiscovery/build.gradle
@@ -12,7 +12,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice"
files = fileTree(dir: "$sliceDir/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"])
}
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index 05f1944dab3..7b7957a5057 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -13,7 +13,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
set1 {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice --tie --checksum IcePatch2.SliceChecksums"
files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
}
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 66e2eed5e34..05f98882e65 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -13,7 +13,7 @@ targetCompatibility = iceTargetCompatibility
slice {
java {
set1 {
- include = ["${sliceDir}"]
+ include = ["${sliceDir}"]
args = "--ice --tie --checksum IceStorm.SliceChecksums"
files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
}