Skip to content

Commit a46d7c5

Browse files
brettchabotbrettchabot
authored
Merge pull request #401 from android/updategradle
Update to latest dependencies.
2 parents a391553 + ad2409b commit a46d7c5

File tree

38 files changed

+137
-138
lines changed

38 files changed

+137
-138
lines changed

‎integration/ServiceTestRuleSample/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
buildscript {
44
repositories {
55
// Insert local test repo here
6-
jcenter()
76
google()
7+
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
10+
classpath 'com.android.tools.build:gradle:7.0.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
@@ -17,13 +17,13 @@ buildscript {
1717
allprojects {
1818
repositories {
1919
// Insert local test repo here
20-
jcenter()
2120
google()
21+
mavenCentral()
2222
}
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.2"
26+
buildToolsVersion = "31.0.0"
2727
coreVersion = "1.4.1-alpha01"
2828
extJUnitVersion = "1.1.4-alpha01"
2929
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
buildscript {
44
repositories {
55
// Insert local test repo here
6-
jcenter()
76
google()
7+
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
10+
classpath 'com.android.tools.build:gradle:7.0.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
@@ -17,15 +17,15 @@ buildscript {
1717
allprojects {
1818
repositories {
1919
// Insert local test repo here
20-
jcenter()
2120
google()
21+
mavenCentral()
2222
}
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.2"
27-
androidxAnnotationVersion = "1.1.0"
28-
guavaVersion = "29.0-android"
26+
buildToolsVersion = "31.0.0"
27+
androidxAnnotationVersion = "1.2.0"
28+
guavaVersion = "30.1.1-android"
2929
coreVersion = "1.4.1-alpha01"
3030
extJUnitVersion = "1.1.4-alpha01"
3131
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
buildscript {
44
repositories {
55
// Insert local test repo here
6-
jcenter()
76
google()
7+
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
10+
classpath 'com.android.tools.build:gradle:7.0.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
@@ -17,15 +17,15 @@ buildscript {
1717
allprojects {
1818
repositories {
1919
// Insert local test repo here
20-
jcenter()
2120
google()
21+
mavenCentral()
2222
}
2323
}
2424

2525
ext {
26-
buildToolsVersion = "30.0.2"
27-
androidxAnnotationVersion = "1.1.0"
28-
guavaVersion = "29.0-android"
26+
buildToolsVersion = "31.0.0"
27+
androidxAnnotationVersion = "1.2.0"
28+
guavaVersion = "30.1.1-android"
2929
coreVersion = "1.4.1-alpha01"
3030
extJUnitVersion = "1.1.4-alpha01"
3131
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: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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.kotlin_version = '1.3.40'
55
repositories {
66
// Insert local test repo here
7-
jcenter()
87
google()
9-
mavenLocal()
8+
mavenCentral()
109
}
1110
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.2.0'
11+
classpath 'com.android.tools.build:gradle:7.0.2'
1312
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1413

1514
// NOTE: Do not place your application dependencies here; they belong
@@ -20,19 +19,19 @@ buildscript {
2019
allprojects {
2120
repositories {
2221
// Insert local test repo here
23-
jcenter()
2422
google()
23+
mavenCentral()
2524
}
2625
}
2726

2827
ext {
29-
buildToolsVersion = "30.0.2"
30-
androidxAnnotationVersion = "1.1.0"
31-
robolectricVersion = "4.5.1"
28+
buildToolsVersion = "31.0.0"
29+
androidxAnnotationVersion = "1.2.0"
30+
robolectricVersion = "4.6.1"
3231
extTruthVersion = '1.3.1-alpha02'
3332
coreVersion = "1.4.1-alpha01"
3433
extJUnitVersion = "1.1.4-alpha01"
3534
runnerVersion = "1.4.1-alpha01"
3635
espressoVersion = "3.5.0-alpha01"
37-
guavaVersion = "29.0-android"
36+
guavaVersion = "30.1.1-android"
3837
}

‎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/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ buildscript {
44
ext.kotlin_version = '1.4.31'
55
repositories {
66
// Insert local test repo here
7-
jcenter()
87
google()
8+
mavenCentral()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.1.1'
11+
classpath 'com.android.tools.build:gradle:7.0.2'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313

1414
// NOTE: Do not place your application dependencies here; they belong
@@ -19,16 +19,16 @@ buildscript {
1919
allprojects {
2020
repositories {
2121
// Insert local test repo here
22-
jcenter()
2322
google()
23+
mavenCentral()
2424
}
2525
}
2626

2727
ext {
28-
buildToolsVersion = "30.0.2"
29-
androidxAnnotationVersion = "1.1.0"
30-
robolectricVersion = "4.5.1"
31-
guavaVersion = "29.0-android"
28+
buildToolsVersion = "31.0.0"
29+
androidxAnnotationVersion = "1.2.0"
30+
robolectricVersion = "4.6.1"
31+
guavaVersion = "30.1.1-android"
3232
extTruthVersion = '1.3.0-rc01'
3333
coreVersion = "1.4.1-alpha01"
3434
extJUnitVersion = "1.1.4-alpha01"

‎ui/espresso/BasicSample/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

0 commit comments

Comments
 (0)