diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-07-19 09:38:05 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-07-19 09:38:05 -0700 |
| commit | 67d1e95ac9ad3f309e467ec9ee52435223b88c2f (patch) | |
| tree | f7fc5a17e3b211e556915b2e27baffda1206e73d /java | |
| parent | Make icehahspassword executable (diff) | |
| download | ice-67d1e95ac9ad3f309e467ec9ee52435223b88c2f.tar.bz2 ice-67d1e95ac9ad3f309e467ec9ee52435223b88c2f.tar.xz ice-67d1e95ac9ad3f309e467ec9ee52435223b88c2f.zip | |
more gradle.properties edits
Diffstat (limited to 'java')
| -rw-r--r-- | java/android/gradle.properties | 26 | ||||
| -rw-r--r-- | java/gradle.properties | 10 |
2 files changed, 12 insertions, 24 deletions
diff --git a/java/android/gradle.properties b/java/android/gradle.properties index 135dd769943..e6dd2fb55ae 100644 --- a/java/android/gradle.properties +++ b/java/android/gradle.properties @@ -18,40 +18,26 @@ iceVersion = 3.7.0 prefixVersion = 3.7.0 // The Android versions used for the Ice build. -ice_buildToolsVersion = 26.0.0-rc1 +ice_buildToolsVersion = 26.0.0 ice_compileSdkVersion = 25 ice_minSdkVersion = 25 ice_targetSdkVersion = 25 // -// Select an installation base directory. The directory will be created -// if it does not exist. If this property is not set the default will be -// used. Default values are: -// - Windows: %SystemDrive%\Ice-${iceVersion} -// - Non Windows /opt/Ice-${iceVersion} -// -prefix = - -// -// Define debug as true if you want to build with debug information, -// false otherwise. Does nothing for Android builds. -// -debug = true - -// // Set iceHome to location of Ice installation if Ice was installed in a -// non-standard location. +// non-standard location. You must use forward slashes in the path, even on +// Windows. // // iceHome = // -// Set the version of the Ice Builder to use for building it must set to debian +// Set the version of the Ice Builder to use for building. It must be set to debian // when using the gradle-ice-builder-plugin package. // iceBuilderVersion = 1.4.1 // -// Set the builder artifact class path, it must be set to com.zeroc.gradle.ice-builder +// Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder // when using the gradle-ice-builder-plugin package. // iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder @@ -71,6 +57,8 @@ org.gradle.daemon = true // DESTDIR = appendVersionSuffix = yes +prefix = +debug = true // // Windows specific options diff --git a/java/gradle.properties b/java/gradle.properties index 795a7088c0b..1bd426aade9 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -28,8 +28,8 @@ jgoodiesLooksVersion = 2.7.0 jgoodiesFormsVersion = 1.9.0 // -// Set to true if you want IceGridGUI build to create an standalone jar -// using proguard +// Set to true if you want IceGridGUI build to create a standalone JAR +// using proguard. // icegridguiProguard = true @@ -40,13 +40,13 @@ icegridguiProguard = true debug = true // -// Set the version of the Ice Builder to use for building it must set to debian +// Set the version of the Ice Builder to use for building. It must be set to debian // when using the gradle-ice-builder-plugin package. // iceBuilderVersion = 1.4.1 // -// Set the builder artifact class path, it must be set to com.zeroc.gradle.ice-builder +// Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder // when using the gradle-ice-builder-plugin package. // iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder @@ -57,7 +57,7 @@ iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder iceBuilderHome = // -// If the dev repository it's set it will be used as first repository when +// If the dev repository is set it will be used as the first repository when // resolving dependencies // devRepo = |