Skip to content

Commit e60b0b0

Browse files
brettchabotbrettchabot
authored
Merge pull request #485 from android/updateagp
Update to AGP 8.1.1, kotlin 1.8.20, and robolectric 4.10.3
2 parents 2fc9a4c + a8d4940 commit e60b0b0

119 files changed

Lines changed: 253 additions & 225 deletions

File tree

Some content is hidden

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

‎integration/ServiceTestRuleSample/app/build.gradle‎

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

33
android {
4-
compileSdkVersion 33
5-
buildToolsVersion rootProject.buildToolsVersion
4+
compileSdk 33
65
defaultConfig {
76
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
87
minSdkVersion 14
@@ -12,9 +11,6 @@ android {
1211

1312
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1413
}
15-
lintOptions {
16-
abortOnError false
17-
}
1814
productFlavors {
1915
}
2016
testOptions {
@@ -31,6 +27,10 @@ android {
3127
}
3228
}
3329
}
30+
namespace 'com.example.android.testing.ServiceTestRuleSample'
31+
lint {
32+
abortOnError false
33+
}
3434
}
3535

3636
dependencies {

‎integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
-->
1717

1818

19-
<manifest package="com.example.android.testing.ServiceTestRuleSample"
20-
xmlns:android="http://schemas.android.com/apk/res/android">
19+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2120

2221
<application
2322
android:icon="@mipmap/ic_launcher"

‎integration/ServiceTestRuleSample/build.gradle‎

Lines changed: 1 addition & 2 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 = "7.3.1"
4+
ext.agpVersion = '8.1.1'
55
repositories {
66
// Insert local test repo here
77
google()
@@ -24,7 +24,6 @@ allprojects {
2424
}
2525

2626
ext {
27-
buildToolsVersion = "32.0.0"
2827
coreVersion = "1.6.0-alpha01"
2928
extJUnitVersion = "1.2.0-alpha01"
3029
runnerVersion = "1.6.0-alpha03"

‎integration/ServiceTestRuleSample/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
android.defaults.buildfeatures.buildconfig=true
20+
android.nonFinalResIds=false
21+
android.nonTransitiveRClass=false
1922
android.useAndroidX=true

‎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-7.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎runner/AndroidJunitRunnerSample/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apply plugin: 'com.android.application'
22

33

44
android {
5-
compileSdkVersion 33
6-
buildToolsVersion rootProject.buildToolsVersion
5+
compileSdk 33
76
defaultConfig {
87
applicationId "com.example.android.testing.androidjunitrunnersample"
98
minSdkVersion 14
@@ -39,6 +38,7 @@ android {
3938

4039
useLibrary 'android.test.base'
4140
useLibrary 'android.test.mock'
41+
namespace 'com.example.android.testing.androidjunitrunnersample'
4242

4343
}
4444

‎runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
limitations under the License.
1616
-->
1717

18-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="com.example.android.testing.androidjunitrunnersample" >
18+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2019

2120
<application
2221
android:icon="@drawable/ic_launcher"

‎runner/AndroidJunitRunnerSample/build.gradle‎

Lines changed: 1 addition & 1 deletion
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 = "7.3.1"
4+
ext.agpVersion = '8.1.1'
55
repositories {
66
// Insert local test repo here
77
google()

‎runner/AndroidJunitRunnerSample/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
android.defaults.buildfeatures.buildconfig=true
20+
android.nonFinalResIds=false
21+
android.nonTransitiveRClass=false
1922
android.useAndroidX=true
2023
android.useAndroidX=true

‎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-7.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)