Skip to content

Commit 1b96a49

Browse files
brettchabotbrettchabot
authored
Merge pull request #517 from android/updateVers
Update versions of test dependencies + AGP.
2 parents 8def210 + ee515c8 commit 1b96a49

File tree

58 files changed

+213
-211
lines changed

Some content is hidden

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

58 files changed

+213
-211
lines changed

‎integration/ServiceTestRuleSample/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111

‎integration/ServiceTestRuleSample/build.gradle‎

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

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -24,8 +24,8 @@ allprojects {
2424
}
2525

2626
ext {
27-
coreVersion = "1.6.0-alpha01"
28-
extJUnitVersion = "1.2.0-alpha01"
29-
runnerVersion = "1.6.0-alpha03"
30-
rulesVersion = "1.6.0-alpha01"
27+
coreVersion = "1.6.1"
28+
extJUnitVersion = "1.2.1"
29+
runnerVersion = "1.6.1"
30+
rulesVersion = "1.6.1"
3131
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎runner/AndroidJunitRunnerSample/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: "com.android.application"
22

33

44
android {
5-
compileSdk 33
5+
compileSdk 34
66
defaultConfig {
77
applicationId "com.example.android.testing.androidjunitrunnersample"
8-
minSdkVersion 14
9-
targetSdkVersion 33
8+
minSdkVersion 21
9+
targetSdkVersion 34
1010
versionCode 1
1111
versionName "1.0"
1212

‎runner/AndroidJunitRunnerSample/build.gradle‎

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

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -27,10 +27,10 @@ ext {
2727
buildToolsVersion = "32.0.0"
2828
androidxAnnotationVersion = "1.5.0"
2929
guavaVersion = "31.1-android"
30-
coreVersion = "1.6.0-alpha01"
31-
extJUnitVersion = "1.2.0-alpha01"
32-
runnerVersion = "1.6.0-alpha03"
33-
rulesVersion = "1.6.0-alpha01"
34-
espressoVersion = "3.6.0-alpha01"
30+
coreVersion = "1.6.1"
31+
extJUnitVersion = "1.2.1"
32+
runnerVersion = "1.6.1"
33+
rulesVersion = "1.6.1"
34+
espressoVersion = "3.6.1"
3535
truthVersion = "1.1.3"
3636
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎runner/AndroidTestOrchestratorSample/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: "com.android.application"
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
defaultConfig {
66
applicationId "com.example.android.testing.androidtestorchestratorsample"
7-
minSdkVersion 14
8-
targetSdkVersion 33
7+
minSdkVersion 21
8+
targetSdkVersion 34
99
versionCode 1
1010
versionName "1.0"
1111

‎runner/AndroidTestOrchestratorSample/build.gradle‎

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

33
buildscript {
4-
ext.agpVersion = "8.1.1"
4+
ext.agpVersion = "8.5.0"
55
repositories {
66
// Insert local test repo here
77
google()
@@ -26,12 +26,12 @@ allprojects {
2626
ext {
2727
androidxAnnotationVersion = "1.5.0"
2828
guavaVersion = "31.1-android"
29-
coreVersion = "1.6.0-alpha01"
30-
extJUnitVersion = "1.2.0-alpha01"
31-
runnerVersion = "1.6.0-alpha03"
32-
monitorVersion = "1.7.0-alpha01"
33-
rulesVersion = "1.6.0-alpha01"
34-
espressoVersion = "3.6.0-alpha01"
35-
orchestratorVersion = "1.5.0-alpha01"
29+
coreVersion = "1.6.1"
30+
extJUnitVersion = "1.2.1"
31+
runnerVersion = "1.6.1"
32+
monitorVersion = "1.7.1"
33+
rulesVersion = "1.6.1"
34+
espressoVersion = "3.6.1"
35+
orchestratorVersion = "1.5.0"
3636
truthVersion = "1.1.3"
3737
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Jun 01 11:09:45 PDT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
distributionPath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)