diff options
| author | Jose <jose@zeroc.com> | 2019-07-11 16:36:16 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-11 16:36:16 +0200 |
| commit | 4192f6be40be8c17edda3bcb38f6774775e89ec9 (patch) | |
| tree | 0acbbc871ce8b8c1ead36541bfe6edf21bcb24fa /java | |
| parent | Fixed Ruby crash (and similar issues in other mappings), fixes #432 (diff) | |
| download | ice-4192f6be40be8c17edda3bcb38f6774775e89ec9.tar.bz2 ice-4192f6be40be8c17edda3bcb38f6774775e89ec9.tar.xz ice-4192f6be40be8c17edda3bcb38f6774775e89ec9.zip | |
Update gradle wrapper used with Android test controller
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/android/controller/build.gradle | 2 | ||||
| -rw-r--r-- | java/test/android/controller/gradle/wrapper/gradle-wrapper.jar | bin | 56177 -> 55190 bytes | |||
| -rw-r--r-- | java/test/android/controller/gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rwxr-xr-x | java/test/android/controller/gradlew | 2 | ||||
| -rw-r--r-- | java/test/android/controller/gradlew.bat | 2 | ||||
| -rw-r--r-- | java/test/android/controller/settings.gradle | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/java/test/android/controller/build.gradle b/java/test/android/controller/build.gradle index 2e5f8ca9e75..e8f9040f821 100644 --- a/java/test/android/controller/build.gradle +++ b/java/test/android/controller/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.4.2' classpath 'gradle.plugin.com.zeroc.gradle.ice-builder:slice:1.4.7' } } diff --git a/java/test/android/controller/gradle/wrapper/gradle-wrapper.jar b/java/test/android/controller/gradle/wrapper/gradle-wrapper.jar Binary files differindex 29953ea141f..87b738cbd05 100644 --- a/java/test/android/controller/gradle/wrapper/gradle-wrapper.jar +++ b/java/test/android/controller/gradle/wrapper/gradle-wrapper.jar diff --git a/java/test/android/controller/gradle/wrapper/gradle-wrapper.properties b/java/test/android/controller/gradle/wrapper/gradle-wrapper.properties index e0b3fb8d70b..558870dad58 100644 --- a/java/test/android/controller/gradle/wrapper/gradle-wrapper.properties +++ b/java/test/android/controller/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java/test/android/controller/gradlew b/java/test/android/controller/gradlew index cccdd3d517f..af6708ff229 100755 --- a/java/test/android/controller/gradlew +++ b/java/test/android/controller/gradlew @@ -28,7 +28,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/java/test/android/controller/gradlew.bat b/java/test/android/controller/gradlew.bat index f9553162f12..6d57edc706c 100644 --- a/java/test/android/controller/gradlew.bat +++ b/java/test/android/controller/gradlew.bat @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/java/test/android/controller/settings.gradle b/java/test/android/controller/settings.gradle new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/java/test/android/controller/settings.gradle |