ICE-8362 - simplify Android demo projects

zeroc-ice · Jul 19, 2017 · 8a17a3a · 8a17a3a
1 parent 2d16026
commit 8a17a3a
Show file tree

Hide file tree

Showing 15 changed files with 104 additions and 92 deletions.
diff --git a/java-compat/android/chat/build.gradle b/java-compat/android/chat/build.gradle
@@ -19,16 +19,16 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 21
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.zeroc.chat"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 21
+        targetSdkVersion 21
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
         }
     }
 
@@ -59,6 +59,6 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice-compat')
-    compile localDependency('glacier2-compat')
+    compile 'com.zeroc:ice-compat:3.7.0'
+    compile 'com.zeroc:glacier2-compat:3.7.0'
 }
diff --git a/java-compat/android/gradle.properties b/java-compat/android/gradle.properties
@@ -6,12 +6,6 @@
 
 iceVersion = 3.7.0
 
-// The Android versions used for the Ice build.
-ice_buildToolsVersion = 25.0.3
-ice_compileSdkVersion = 21
-ice_minSdkVersion = 21
-ice_targetSdkVersion = 21
-
 //
 // Set iceHome to location of Ice installation if Ice was installed in a
 // non-standard location. You must use forward slashes in the path, even
@@ -25,6 +19,12 @@ iceHome =
 //
 iceBuilderVersion = 1.4.1
 
+//
+// Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder
+// when using the gradle-ice-builder-plugin package on Debian.
+//
+iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
+
 //
 // Set the location of a local Ice Builder for Gradle source directory
 //
@@ -52,3 +52,8 @@ cppPlatform =
 // directory.
 //
 cppConfiguration =
+
+//
+// Development
+//
+devRepo =
diff --git a/java-compat/android/gradle/ice.gradle b/java-compat/android/gradle/ice.gradle
@@ -1,4 +1,3 @@
-
 apply from: "$rootProject.projectDir/../gradle/ice.gradle"
 project.version = slice.iceVersion
 
@@ -8,16 +7,22 @@ slice.compat = true
 repositories {
     if (slice.jarDir != null) {
         flatDir {
-        name "local"
+            name "local"
             dirs slice.jarDir
         }
     }
 
     if (!useLocalOnly) {
+        if(this.devRepo) {
+            maven {
+                url this.devRepo
+            }
+        }
+
         mavenCentral()
 
         maven {
-            url "https://${iceMavenRepo}/nexus/content/repositories/releases"
+            url "https://repo.zeroc.com/nexus/content/repositories/releases"
         }
     }
 }
diff --git a/java-compat/android/hello/build.gradle b/java-compat/android/hello/build.gradle
@@ -18,16 +18,16 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 21
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.zeroc.hello"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 21
+        targetSdkVersion 21
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
         }
     }
 
@@ -58,5 +58,5 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice-compat')
+    compile 'com.zeroc:ice-compat:3.7.0'
 }
diff --git a/java-compat/android/library/build.gradle b/java-compat/android/library/build.gradle
@@ -19,13 +19,13 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 21
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.zeroc.library"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 21
+        targetSdkVersion 21
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
@@ -59,6 +59,6 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice-compat')
-    compile localDependency('glacier2-compat')
+    compile 'com.zeroc:ice-compat:3.7.0'
+    compile 'com.zeroc:glacier2-compat:3.7.0'
 }
diff --git a/java-compat/android/mtalk/build.gradle b/java-compat/android/mtalk/build.gradle
@@ -18,16 +18,16 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 21
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.zeroc.mtalk"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 21
+        targetSdkVersion 21
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
         }
     }
 
@@ -62,5 +62,5 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice-compat')
+    compile 'com.zeroc:ice-compat:3.7.0'
 }
diff --git a/java-compat/android/talk/build.gradle b/java-compat/android/talk/build.gradle
@@ -18,16 +18,16 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 21
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.zeroc.talk"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 21
+        targetSdkVersion 21
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
         }
     }
 
@@ -52,6 +52,6 @@ android {
 }
 
 dependencies {
-    compile localDependency('ice-compat')
-    compile localDependency('icebt-compat')
+    compile 'com.zeroc:ice-compat:3.7.0'
+    compile 'com.zeroc:icebt-compat:3.7.0'
 }
diff --git a/java-compat/gradle/ice.gradle b/java-compat/gradle/ice.gradle
@@ -48,10 +48,8 @@ buildscript {
     }
 
     repositories {
-        if (!useLocalOnly) {
-            maven {
-                url "https://${iceMavenRepo}/nexus/content/repositories/releases"
-            }
+        maven {
+            url "https://plugins.gradle.org/m2/"
         }
     }
 

diff --git a/java/android/chat/build.gradle b/java/android/chat/build.gradle
@@ -19,13 +19,13 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 24
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "com.zeroc.chat"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 24
+        targetSdkVersion 24
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -59,7 +59,7 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice')
-    compile localDependency('icessl')
-    compile localDependency('glacier2')
+    implementation 'com.zeroc:ice:3.7.0'
+    implementation 'com.zeroc:icessl:3.7.0'
+    implementation 'com.zeroc:glacier2:3.7.0'
 }
diff --git a/java/android/gradle.properties b/java/android/gradle.properties
@@ -6,12 +6,6 @@
 
 iceVersion = 3.7.0
 
-// The Android versions used for the Ice build.
-ice_buildToolsVersion = 26.0.0
-ice_compileSdkVersion = 25
-ice_minSdkVersion = 25
-ice_targetSdkVersion = 25
-
 //
 // Set iceHome to location of Ice installation if Ice was installed in a
 // non-standard location. You must use forward slashes in the path, even
@@ -26,7 +20,7 @@ iceHome =
 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
@@ -58,3 +52,8 @@ cppPlatform =
 // directory.
 //
 cppConfiguration =
+
+//
+// Development
+//
+devRepo =
diff --git a/java/android/gradle/ice.gradle b/java/android/gradle/ice.gradle
@@ -1,20 +1,25 @@
-
 apply from: "$rootProject.projectDir/../gradle/ice.gradle"
 project.version = slice.iceVersion
 
 repositories {
     if (slice.jarDir != null) {
         flatDir {
-        name "local"
+            name "local"
             dirs slice.jarDir
         }
     }
 
     if (!useLocalOnly) {
+        if(this.devRepo) {
+            maven {
+                url this.devRepo
+            }
+        }
+
         mavenCentral()
 
         maven {
-            url "https://${iceMavenRepo}/nexus/content/repositories/releases"
+            url "https://repo.zeroc.com/nexus/content/repositories/releases"
         }
     }
 }
diff --git a/java/android/hello/build.gradle b/java/android/hello/build.gradle
@@ -18,13 +18,13 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 24
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "com.zeroc.hello"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 24
+        targetSdkVersion 24
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -58,6 +58,6 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice')
-    compile localDependency('icessl')
+    implementation 'com.zeroc:ice:3.7.0'
+    implementation 'com.zeroc:icessl:3.7.0'
 }
diff --git a/java/android/library/build.gradle b/java/android/library/build.gradle
@@ -19,13 +19,13 @@ slice {
 }
 
 android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
+    compileSdkVersion 24
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "com.zeroc.library"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
+        minSdkVersion 24
+        targetSdkVersion 24
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -59,7 +59,7 @@ clean {
 }
 
 dependencies {
-    compile localDependency('ice')
-    compile localDependency('icessl')
-    compile localDependency('glacier2')
+    implementation 'com.zeroc:ice:3.7.0'
+    implementation 'com.zeroc:icessl:3.7.0'
+    implementation 'com.zeroc:glacier2:3.7.0'
 }