Merge remote-tracking branch 'goog/github/main' into fix-automerger

ggfan · ggfan · commit cca5ccbb643c · 2021-06-07T12:41:48.000-07:00
Change-Id: I96dbf1cfde342a0757e2319037cb00a40f8df08d
diff --git a/BiometricAuthentication/build.gradle b/BiometricAuthentication/build.gradle
@@ -6,19 +6,19 @@ buildscript {
 
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.1'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
 allprojects {
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
 }
 
diff --git a/BiometricAuthentication/gradle/wrapper/gradle-wrapper.properties b/BiometricAuthentication/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/BiometricLoginKotlin/app/build.gradle b/BiometricLoginKotlin/app/build.gradle
@@ -35,8 +35,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    viewBinding {
-        enabled = true
+    buildFeatures {
+      viewBinding = true
     }
     compileOptions {
         sourceCompatibility = 1.8
@@ -60,4 +60,4 @@ dependencies {
     testImplementation "junit:junit:$junit_versoin"
     androidTestImplementation "androidx.test.ext:junit:$ext_junit_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
-}
+}
diff --git a/BiometricLoginKotlin/build.gradle b/BiometricLoginKotlin/build.gradle
@@ -31,10 +31,10 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -44,6 +44,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
-}
+}
diff --git a/BiometricLoginKotlin/gradle/wrapper/gradle-wrapper.properties b/BiometricLoginKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/DirectBoot/Application/build.gradle b/DirectBoot/Application/build.gradle
@@ -2,19 +2,19 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
 apply plugin: 'com.android.application'
 
 repositories {
     google()
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
diff --git a/DirectBoot/gradle/wrapper/gradle-wrapper.properties b/DirectBoot/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/Fido/build.gradle b/Fido/build.gradle
@@ -3,18 +3,17 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
-        mavenLocal()
+        mavenCentral()
     }
 }
 
diff --git a/Fido/gradle/wrapper/gradle-wrapper.properties b/Fido/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/FileLocker/app/build.gradle b/FileLocker/app/build.gradle
@@ -29,8 +29,8 @@ android {
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    dataBinding {
-        enabled true
+    buildFeatures {
+        dataBinding true
     }
     buildTypes {
         release {
diff --git a/FileLocker/build.gradle b/FileLocker/build.gradle
@@ -16,24 +16,24 @@
 
 buildscript {
     ext {
-        appcompat_version = '1.1.0'
-        constraint_layout_version = '1.1.3'
-        coroutines_version = '1.2.1'
+        appcompat_version = '1.3.0'
+        constraint_layout_version = '2.0.4'
+        coroutines_version = '1.4.3'
         espresso_version = '3.2.0'
-        gradleVersion = '3.6.1'
+        gradleVersion = '4.2.1'
         junit_version = '4.12'
-        kotlin_version = '1.3.50'
-        ktx_version = '1.1.0'
-        lifecycle_version = '2.2.0-rc01'
+        kotlin_version = '1.4.32'
+        ktx_version = '1.5.0'
+        lifecycle_version = '2.3.1'
         material_version = '1.2.0-alpha01'
-        navigation_version = '2.1.0'
-        recyclerview_version = '1.1.0-rc01'
-        security_crypto_version = '1.0.0-alpha02'
-        test_runner_version = '1.2.0'
+        navigation_version = '2.3.5'
+        recyclerview_version = '1.2.1'
+        security_crypto_version = '1.0.0'
+        test_runner_version = '1.3.0'
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$gradleVersion"
@@ -45,7 +45,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/FileLocker/gradle/wrapper/gradle-wrapper.properties b/FileLocker/gradle/wrapper/gradle-wrapper.properties
@@ -20,4 +20,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,19 @@ buildscript {`
`6`	`6`
`7`	`7`	`repositories {`
`8`	`8`	`google()`
`9`		`- jcenter()`
	`9`	`+ mavenCentral()`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- classpath 'com.android.tools.build:gradle:3.5.1'`
	`13`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`14`	`14`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`allprojects {`
`19`	`19`	`repositories {`
`20`	`20`	`google()`
`21`		`- jcenter()`
	`21`	`+ mavenCentral()`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ android {`
`35`	`35`	`proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`- viewBinding {`
`39`		`- enabled = true`
	`38`	`+ buildFeatures {`
	`39`	`+ viewBinding = true`
`40`	`40`	`}`
`41`	`41`	`compileOptions {`
`42`	`42`	`sourceCompatibility = 1.8`
`@@ -60,4 +60,4 @@ dependencies {`
`60`	`60`	`testImplementation "junit:junit:$junit_versoin"`
`61`	`61`	`androidTestImplementation "androidx.test.ext:junit:$ext_junit_version"`
`62`	`62`	`androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"`
`63`		`-}`
	`63`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,19 @@`
`2`	`2`	`buildscript {`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`		`- jcenter()`
	`5`	`+ mavenCentral()`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.4.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`apply plugin: 'com.android.application'`
`14`	`14`
`15`	`15`	`repositories {`
`16`	`16`	`google()`
`17`		`- jcenter()`
	`17`	`+ mavenCentral()`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -3,18 +3,17 @@`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`	`5`	`google()`
`6`		`- jcenter()`
	`6`	`+ mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.3.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`allprojects {`
`14`	`14`	`repositories {`
`15`	`15`	`google()`
`16`		`- jcenter()`
`17`		`- mavenLocal()`
	`16`	`+ mavenCentral()`
`18`	`17`	`}`
`19`	`18`	`}`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ android {`
`29`	`29`	`versionName "1.0"`
`30`	`30`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`31`	`31`	`}`
`32`		`- dataBinding {`
`33`		`- enabled true`
	`32`	`+ buildFeatures {`
	`33`	`+ dataBinding true`
`34`	`34`	`}`
`35`	`35`	`buildTypes {`
`36`	`36`	`release {`