Skip to content

Commit d46e049

Browse files
brettchabotbrettchabot
committed
Update to latest dependencies.
 - swap jcenter for mavenCentral - AGP -> 7.0.2 - build tools -> 31.0.0 - androidx.annotation -> 1.2.0 - androidx.core -> 1.6.0 - androidx.recyclerview -> 1.2.1 - truth -> 1.1.3 - guava -> 30.1.1-android
1 parent a391553 commit d46e049

File tree

45 files changed

+185
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+185
-156
lines changed

‎integration/ServiceTestRuleSample/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
ext.agpVersion = "7.0.2"
45
repositories {
56
// Insert local test repo here
6-
jcenter()
77
google()
8+
mavenCentral()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
11+
classpath "com.android.tools.build:gradle:$agpVersion"
1112

1213
// NOTE: Do not place your application dependencies here; they belong
1314
// in the individual module build.gradle files
@@ -17,13 +18,13 @@ buildscript {
1718
allprojects {
1819
repositories {
1920
// Insert local test repo here
20-
jcenter()
2121
google()
22+
mavenCentral()
2223
}
2324
}
2425

2526
ext {
26-
buildToolsVersion = "30.0.2"
27+
buildToolsVersion = "31.0.0"
2728
coreVersion = "1.4.1-alpha01"
2829
extJUnitVersion = "1.1.4-alpha01"
2930
runnerVersion = "1.4.1-alpha01"

‎integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

‎runner/AndroidJunitRunnerSample/build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
ext.agpVersion = "7.0.2"
45
repositories {
56
// Insert local test repo here
6-
jcenter()
77
google()
8+
mavenCentral()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
11+
classpath "com.android.tools.build:gradle:$agpVersion"
1112

1213
// NOTE: Do not place your application dependencies here; they belong
1314
// in the individual module build.gradle files
@@ -17,15 +18,15 @@ buildscript {
1718
allprojects {
1819
repositories {
1920
// Insert local test repo here
20-
jcenter()
2121
google()
22+
mavenCentral()
2223
}
2324
}
2425

2526
ext {
26-
buildToolsVersion = "30.0.2"
27-
androidxAnnotationVersion = "1.1.0"
28-
guavaVersion = "29.0-android"
27+
buildToolsVersion = "31.0.0"
28+
androidxAnnotationVersion = "1.2.0"
29+
guavaVersion = "30.1.1-android"
2930
coreVersion = "1.4.1-alpha01"
3031
extJUnitVersion = "1.1.4-alpha01"
3132
runnerVersion = "1.4.1-alpha01"

‎runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

‎runner/AndroidTestOrchestratorSample/build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
ext.agpVersion = "7.0.2"
45
repositories {
56
// Insert local test repo here
6-
jcenter()
77
google()
8+
mavenCentral()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
11+
classpath "com.android.tools.build:gradle:$agpVersion"
1112

1213
// NOTE: Do not place your application dependencies here; they belong
1314
// in the individual module build.gradle files
@@ -17,15 +18,15 @@ buildscript {
1718
allprojects {
1819
repositories {
1920
// Insert local test repo here
20-
jcenter()
2121
google()
22+
mavenCentral()
2223
}
2324
}
2425

2526
ext {
26-
buildToolsVersion = "30.0.2"
27-
androidxAnnotationVersion = "1.1.0"
28-
guavaVersion = "29.0-android"
27+
buildToolsVersion = "31.0.0"
28+
androidxAnnotationVersion = "1.2.0"
29+
guavaVersion = "30.1.1-android"
2930
coreVersion = "1.4.1-alpha01"
3031
extJUnitVersion = "1.1.4-alpha01"
3132
runnerVersion = "1.4.1-alpha01"

‎runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

‎ui/espresso/AccessibilitySample/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.20'
4+
ext.kotlinVersion = "1.4.31"
5+
ext.agpVersion = "7.0.2"
56
repositories {
67
// Insert local test repo here
7-
jcenter()
88
google()
9-
mavenLocal()
9+
mavenCentral()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.2.0'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12+
classpath "com.android.tools.build:gradle:$agpVersion"
13+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1414

1515
// NOTE: Do not place your application dependencies here; they belong
1616
// in the individual module build.gradle files
@@ -20,19 +20,19 @@ buildscript {
2020
allprojects {
2121
repositories {
2222
// Insert local test repo here
23-
jcenter()
2423
google()
24+
mavenCentral()
2525
}
2626
}
2727

2828
ext {
29-
buildToolsVersion = "30.0.2"
30-
androidxAnnotationVersion = "1.1.0"
31-
robolectricVersion = "4.5.1"
29+
buildToolsVersion = "31.0.0"
30+
androidxAnnotationVersion = "1.2.0"
31+
robolectricVersion = "4.6.1"
3232
extTruthVersion = '1.3.1-alpha02'
3333
coreVersion = "1.4.1-alpha01"
3434
extJUnitVersion = "1.1.4-alpha01"
3535
runnerVersion = "1.4.1-alpha01"
3636
espressoVersion = "3.5.0-alpha01"
37-
guavaVersion = "29.0-android"
37+
guavaVersion = "30.1.1-android"
3838
}

‎ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

‎ui/espresso/BasicSample/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
4141

4242
// Testing-only dependencies
43-
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
43+
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4444
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion
4545
androidTestImplementation 'androidx.test:core-ktx:' + rootProject.coreVersion
4646
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion

‎ui/espresso/BasicSample/build.gradle‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.4.31'
4+
ext.kotlinVersion = "1.4.31"
5+
ext.agpVersion = "7.0.2"
56
repositories {
67
// Insert local test repo here
7-
jcenter()
88
google()
9+
mavenCentral()
910
}
1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.1.1'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12+
classpath "com.android.tools.build:gradle:$agpVersion"
13+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1314

1415
// NOTE: Do not place your application dependencies here; they belong
1516
// in the individual module build.gradle files
@@ -19,16 +20,16 @@ buildscript {
1920
allprojects {
2021
repositories {
2122
// Insert local test repo here
22-
jcenter()
2323
google()
24+
mavenCentral()
2425
}
2526
}
2627

2728
ext {
28-
buildToolsVersion = "30.0.2"
29-
androidxAnnotationVersion = "1.1.0"
30-
robolectricVersion = "4.5.1"
31-
guavaVersion = "29.0-android"
29+
buildToolsVersion = "31.0.0"
30+
androidxAnnotationVersion = "1.2.0"
31+
robolectricVersion = "4.6.1"
32+
guavaVersion = "30.1.1-android"
3233
extTruthVersion = '1.3.0-rc01'
3334
coreVersion = "1.4.1-alpha01"
3435
extJUnitVersion = "1.1.4-alpha01"

0 commit comments

Comments
 (0)