diff options
| author | Jose <jose@zeroc.com> | 2019-09-13 13:18:58 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-13 13:19:52 +0200 |
| commit | 02a46dfe64b1a071078e3e00e8b2a52a1c0fce7f (patch) | |
| tree | ca9f06bbb465cb75834fe97d5fe13f81f64f1db4 /java | |
| parent | Misc updates to README files (diff) | |
| download | ice-02a46dfe64b1a071078e3e00e8b2a52a1c0fce7f.tar.bz2 ice-02a46dfe64b1a071078e3e00e8b2a52a1c0fce7f.tar.xz ice-02a46dfe64b1a071078e3e00e8b2a52a1c0fce7f.zip | |
Update android builds to use latest Android Studio
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/android/controller/build.gradle | 6 | ||||
| -rw-r--r-- | java/test/android/controller/gradle.properties | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/java/test/android/controller/build.gradle b/java/test/android/controller/build.gradle index e8f9040f821..d3567570161 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.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath 'gradle.plugin.com.zeroc.gradle.ice-builder:slice:1.4.7' } } @@ -51,12 +51,12 @@ repositories { } android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "com.zeroc.testcontroller" minSdkVersion 24 - targetSdkVersion 28 + targetSdkVersion 29 multiDexEnabled true // Necessary otherwise we'd exceed the 64K DEX limit. compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/java/test/android/controller/gradle.properties b/java/test/android/controller/gradle.properties index 52aed4f7ffd..d8c1c6b10d0 100644 --- a/java/test/android/controller/gradle.properties +++ b/java/test/android/controller/gradle.properties @@ -43,9 +43,3 @@ cppPlatform = x64 // directory. // cppConfiguration = Release - -// -// If the dev repository is set it will be used as the first repository when -// resolving dependencies -// -devRepo = |