diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-11-12 11:52:51 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-11-12 11:52:51 -0330 |
| commit | 5718b35c8b226fb8b08f6086153a2e3af6065b7c (patch) | |
| tree | 8b345d962b5a5b7ad604ac1b87456088cf8e377e /java/src | |
| parent | Moved the IceGridGUI proguard config file (diff) | |
| download | ice-5718b35c8b226fb8b08f6086153a2e3af6065b7c.tar.bz2 ice-5718b35c8b226fb8b08f6086153a2e3af6065b7c.tar.xz ice-5718b35c8b226fb8b08f6086153a2e3af6065b7c.zip | |
- Add as documented src/main/slice to the gradle slice plugin.
- Simplifications and cleanup to the gradle build files.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceDiscovery/build.gradle | 13 | ||||
| -rw-r--r-- | java/src/IceGridGUI/build.gradle | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle index dde3bef5021..241f6cc45d3 100644 --- a/java/src/IceDiscovery/build.gradle +++ b/java/src/IceDiscovery/build.gradle @@ -12,19 +12,12 @@ targetCompatibility = iceTargetCompatibility slice { java { - set1 { - include = ["${sliceDir}"] - args = "--ice" - files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) - } + include = ["${sliceDir}"] + args = "--ice" + files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } } -idea.module { - excludeDirs -= file(buildDir) - buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } -} - dependencies { compile project(':ice') } diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index a6db81532e1..fa3b9d988de 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -103,7 +103,7 @@ if(macosx) displayname: appName, identifier: "com.zeroc.IceGridGUI", icon: "${projectDir}/src/main/resources/icons/icegrid.icns", - shortversion: "${iceVersion}", + shortversion: "${project.version}", applicationCategory: "public.app-category.utilities", mainclassname: "IceGridGUI/MainProxy", copyright: "Copyright © 2005-2014 ZeroC, Inc. All rights reserved.") { |