Update AGP & Gradle versions.

Also sync some internal changes. Change-Id: I5bdbfb3c56b095799f0f7ce2fdd7e6424f9476e1
aami4141 · Jan 25, 2022 · 52295b2 · 52295b2
1 parent 52d25ad
commit 52295b2
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 36 deletions.
diff --git a/android/automl/app/build.gradle b/android/automl/app/build.gradle
@@ -11,7 +11,6 @@ android {
         // Version code for next release (version 9 is now in Play Store)
         versionCode 11
         versionName "1.11"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         setProperty("archivesBaseName", "vision-automl-remote-model-quickstart")
     }
@@ -71,18 +70,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:27.1-android'
 
-    // For how to setup gradle dependencies in Android X, see:
-    // https://developer.android.com/training/testing/set-up-project#gradle-dependencies
-    // Core library
-    androidTestImplementation 'androidx.test:core:1.3.0'
-
-    // AndroidJUnitRunner and JUnit Rules
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-
-    // Assertions
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-
     // ViewModel and LiveData
     implementation "androidx.lifecycle:lifecycle-livedata:2.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.1"

diff --git a/android/automl/build.gradle b/android/automl/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/automl/gradle/wrapper/gradle-wrapper.properties b/android/automl/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 06 15:00:42 PST 2021
+#Mon Jan 24 22:56:49 UTC 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/android/digitalink/app/build.gradle b/android/digitalink/app/build.gradle
@@ -11,6 +11,7 @@ android {
         multiDexEnabled true
         versionCode 1
         versionName "1.0"
+        setProperty("archivesBaseName", "vision-digital-ink")
         testApplicationId "com.google.mlkit.vision.digitalink"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/android/digitalink/build.gradle b/android/digitalink/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath "com.android.tools.build:gradle:4.2.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/android/digitalink/gradle/wrapper/gradle-wrapper.properties b/android/digitalink/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 28 08:09:10 PDT 2020
+#Mon Jan 24 22:29:24 UTC 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/android/entityextraction/app/build.gradle b/android/entityextraction/app/build.gradle
@@ -10,6 +10,7 @@ android {
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
+        setProperty("archivesBaseName", "nl-entity-extraction")
     }
 
     buildTypes {

diff --git a/android/entityextraction/build.gradle b/android/entityextraction/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/entityextraction/gradle/wrapper/gradle-wrapper.properties b/android/entityextraction/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 15 01:54:05 UTC 2021
+#Mon Jan 24 22:39:58 UTC 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/langid/build.gradle b/android/langid/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/langid/gradle/wrapper/gradle-wrapper.properties b/android/langid/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 24 23:06:26 PDT 2020
+#Mon Jan 24 22:44:42 UTC 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/...artreply/app/src/main/java/com/google/mlkit/samples/nl/smartreply/kotlin/model/Message.kt b/...artreply/app/src/main/java/com/google/mlkit/samples/nl/smartreply/kotlin/model/Message.kt
@@ -31,9 +31,9 @@ class Message(val text: String, val isLocalUser: Boolean, val timestamp: Long) {
         ?: throw IllegalStateException("Could not get drawable ic_tag_faces_black_24dp")
 
     if (isLocalUser) {
-      DrawableCompat.setTint(drawable, Color.BLUE)
+      DrawableCompat.setTint(drawable.mutate(), Color.BLUE)
     } else {
-      DrawableCompat.setTint(drawable, Color.RED)
+      DrawableCompat.setTint(drawable.mutate(), Color.RED)
     }
 
     return drawable

diff --git a/android/smartreply/build.gradle b/android/smartreply/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/smartreply/gradle/wrapper/gradle-wrapper.properties b/android/smartreply/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Jan 24 22:50:04 UTC 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/android/translate/build.gradle b/android/translate/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/translate/gradle.properties b/android/translate/gradle.properties
@@ -1,2 +1,3 @@
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4g
diff --git a/android/translate/gradle/wrapper/gradle-wrapper.properties b/android/translate/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 16 17:39:20 PDT 2021
+#Mon Jan 24 22:53:12 UTC 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME