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/build.gradle | |
| 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/build.gradle')
| -rw-r--r-- | java/build.gradle | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/build.gradle b/java/build.gradle index ac5e6d0089f..85a387ba035 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -8,12 +8,13 @@ // ********************************************************************** subprojects { + project.version = iceVersion + project.group = "com.zeroc" + apply plugin: 'java' apply plugin: 'idea' apply from: "$rootProject.projectDir/gradle/ice.gradle" - project.version = iceVersion - project.group = "com.zeroc" repositories { if (distJarDir != null) { @@ -36,11 +37,15 @@ subprojects { tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options" } + + idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } + } } apply from: "$rootProject.projectDir/demo/Ice/build.gradle" apply from: "$rootProject.projectDir/demo/IceDiscovery/build.gradle" -apply from: "$rootProject.projectDir/demo/IceBox/build.gradle" apply from: "$rootProject.projectDir/demo/Glacier2/build.gradle" apply from: "$rootProject.projectDir/demo/IceGrid/build.gradle" apply from: "$rootProject.projectDir/demo/Manual/build.gradle" |