Merge pull request #215 from android/update-agp-4-2-1

ggfan · web-flow · commit f22069a57d5d · 2021-06-07T11:24:33.000-07:00
Update build script to AGP 4.2.1
diff --git a/AnimationsInterpolatorPlayground/build.gradle b/AnimationsInterpolatorPlayground/build.gradle
@@ -3,10 +3,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/AnimationsInterpolatorPlayground/gradle/wrapper/gradle-wrapper.properties b/AnimationsInterpolatorPlayground/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-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/CardView/Application/build.gradle b/CardView/Application/build.gradle
@@ -2,31 +2,23 @@
 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 {
-
-
-
-
     implementation 'com.android.support:cardview-v7:24.0.0'
-
-
-
-
 }
 
 // The sample build uses multiple directories to
diff --git a/CardView/gradle/wrapper/gradle-wrapper.properties b/CardView/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/CardViewKotlin/build.gradle b/CardViewKotlin/build.gradle
@@ -6,24 +6,24 @@ buildscript {
 
         espressoVersion = '3.0.1'
         junitVersion = '4.12'
-        kotlinVersion = '1.3.11'
+        kotlinVersion = '1.3.20'
         supportLibVersion = '27.0.2'
         supportTestVersion = '1.0.1'
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/CardViewKotlin/gradle/wrapper/gradle-wrapper.properties b/CardViewKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ConstraintLayoutExamples/build.gradle b/ConstraintLayoutExamples/build.gradle
@@ -19,7 +19,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     ext {
@@ -37,7 +37,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -48,7 +48,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/ConstraintLayoutExamples/gradle/wrapper/gradle-wrapper.properties b/ConstraintLayoutExamples/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/DataBindingDataBoundList/app/build.gradle b/DataBindingDataBoundList/app/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.0'
-    dataBinding.enabled = true
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
+    buildFeatures.dataBinding = true
     defaultConfig {
         applicationId "com.example.android.databoundlist"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -36,7 +36,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 }
diff --git a/DataBindingDataBoundList/build.gradle b/DataBindingDataBoundList/build.gradle
@@ -18,10 +18,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -30,7 +31,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
 }
 
diff --git a/DataBindingDataBoundList/gradle.properties b/DataBindingDataBoundList/gradle.properties
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 # Project-wide Gradle settings.
 
 # IDE (e.g. Android Studio) users:
diff --git a/DataBindingDataBoundList/gradle/wrapper/gradle-wrapper.properties b/DataBindingDataBoundList/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-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/DataBindingDataBoundRecyclerView/build.gradle b/DataBindingDataBoundRecyclerView/build.gradle
@@ -19,10 +19,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -32,6 +32,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
diff --git a/DataBindingDataBoundRecyclerView/gradle/wrapper/gradle-wrapper.properties b/DataBindingDataBoundRecyclerView/gradle/wrapper/gradle-wrapper.properties
@@ -13,10 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#
+#Mon Jun 07 09:36:42 PDT 2021
 
-#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,10 @@`
`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.5.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
`@@ -16,7 +16,7 @@ buildscript {`
`16`	`16`	`allprojects {`
`17`	`17`	`repositories {`
`18`	`18`	`google()`
`19`		`- jcenter()`
	`19`	`+ mavenCentral()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -6,24 +6,24 @@ buildscript {`
`6`	`6`
`7`	`7`	`espressoVersion = '3.0.1'`
`8`	`8`	`junitVersion = '4.12'`
`9`		`- kotlinVersion = '1.3.11'`
	`9`	`+ kotlinVersion = '1.3.20'`
`10`	`10`	`supportLibVersion = '27.0.2'`
`11`	`11`	`supportTestVersion = '1.0.1'`
`12`	`12`	`}`
`13`	`13`	`repositories {`
`14`	`14`	`google()`
`15`		`- jcenter()`
	`15`	`+ mavenCentral()`
`16`	`16`	`}`
`17`	`17`	`dependencies {`
`18`		`- classpath 'com.android.tools.build:gradle:3.3.0'`
	`18`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`19`	`19`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`allprojects {`
`24`	`24`	`repositories {`
`25`	`25`	`google()`
`26`		`- jcenter()`
	`26`	`+ mavenCentral()`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`buildscript {`
`20`	`20`	`repositories {`
`21`	`21`	`google()`
`22`		`- jcenter()`
	`22`	`+ mavenCentral()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`ext {`
`@@ -37,7 +37,7 @@ buildscript {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`dependencies {`
`40`		`- classpath 'com.android.tools.build:gradle:4.0.1'`
	`40`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`41`	`41`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`42`	`42`
`43`	`43`	`// NOTE: Do not place your application dependencies here; they belong`
`@@ -48,7 +48,7 @@ buildscript {`
`48`	`48`	`allprojects {`
`49`	`49`	`repositories {`
`50`	`50`	`google()`
`51`		`- jcenter()`
	`51`	`+ mavenCentral()`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,11 @@`
`18`	`18`
`19`	`19`	`buildscript {`
`20`	`20`	`repositories {`
`21`		`- jcenter()`
	`21`	`+ google()`
	`22`	`+ mavenCentral()`
`22`	`23`	`}`
`23`	`24`	`dependencies {`
`24`		`- classpath 'com.android.tools.build:gradle:2.2.3'`
	`25`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`25`	`26`
`26`	`27`	`// NOTE: Do not place your application dependencies here; they belong`
`27`	`28`	`// in the individual module build.gradle files`
`@@ -30,7 +31,8 @@ buildscript {`
`30`	`31`
`31`	`32`	`allprojects {`
`32`	`33`	`repositories {`
`33`		`- jcenter()`
	`34`	`+ google()`
	`35`	`+ mavenCentral()`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-`
`17`	`16`	`# Project-wide Gradle settings.`
`18`	`17`
`19`	`18`	`# IDE (e.g. Android Studio) users:`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`	`buildscript {`
`20`	`20`	`repositories {`
`21`	`21`	`google()`
`22`		`- jcenter()`
	`22`	`+ mavenCentral()`
`23`	`23`	`}`
`24`	`24`	`dependencies {`
`25`		`- classpath 'com.android.tools.build:gradle:3.5.0'`
	`25`	`+ classpath 'com.android.tools.build:gradle:4.2.1'`
`26`	`26`
`27`	`27`	`// NOTE: Do not place your application dependencies here; they belong`
`28`	`28`	`// in the individual module build.gradle files`
`@@ -32,6 +32,6 @@ buildscript {`
`32`	`32`	`allprojects {`
`33`	`33`	`repositories {`
`34`	`34`	`google()`
`35`		`- jcenter()`
	`35`	`+ mavenCentral()`
`36`	`36`	`}`
`37`	`37`	`}`