Skip to content

Commit a2a3ada

Browse files
authored
Merge pull request #752 from square/rick/gradle-agp
Gradle `8.3` and AGP `7.3.1`
2 parents 3bf4bf4 + 98f1f63 commit a2a3ada

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99

1010
[versions]
11-
agp = "7.1.0"
11+
agp = "7.3.1"
1212
autoService = "1.1.1"
1313
autoValue = "1.10.1"
1414
dagger = "2.46.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

integration-tests/mpp/android-module/build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
}
2222

2323
compileOptions {
24-
sourceCompatibility JavaVersion.VERSION_1_8
25-
targetCompatibility JavaVersion.VERSION_1_8
24+
sourceCompatibility JavaVersion.VERSION_11
25+
targetCompatibility JavaVersion.VERSION_11
2626
}
2727

2828
lint {
@@ -37,7 +37,14 @@ android {
3737
}
3838

3939
kotlin {
40-
android()
40+
41+
// The `android()` target is deprecated in Kotlin 1.9.0+,
42+
// but the new `androidTarget()` alternative doesn't exist in KGP 1.8.x.
43+
if (kotlin.coreLibrariesVersion < "1.9.0")
44+
android()
45+
else {
46+
androidTarget()
47+
}
4148

4249
sourceSets {
4350
androidMain {

sample/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
}
2323

2424
compileOptions {
25-
sourceCompatibility JavaVersion.VERSION_1_8
26-
targetCompatibility JavaVersion.VERSION_1_8
25+
sourceCompatibility JavaVersion.VERSION_11
26+
targetCompatibility JavaVersion.VERSION_11
2727
}
2828

2929
lint {

sample/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<application
55
android:name="com.squareup.anvil.sample.App"
6-
android:allowBackup="false"
76
android:icon="@mipmap/ic_launcher"
87
android:label="@string/app_name"
98
android:roundIcon="@mipmap/ic_launcher_round"

0 commit comments

Comments
 (0)