Skip to content

Gradle 8.3 and AGP 7.3.1 #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RBusarow merged 1 commit into from
Sep 28, 2023
Merged

Gradle 8.3 and AGP 7.3.1 #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#

[versions]
agp = "7.1.0"
agp = "7.3.1"
Copy link
Copy Markdown

@apramana apramana Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updating to AGP 8 should resolve the lint job failure, but that will also require use of JDK 17.

Copy link
Copy Markdown
Contributor Author

@RBusarow RBusarow Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lint issue was easy enough to fix, since it's just a sample app.

autoService = "1.1.1"
autoValue = "1.10.1"
dagger = "2.46.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
Copy link
Copy Markdown
Collaborator

@vRallev vRallev Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bin is good enough

Copy link
Copy Markdown
Contributor Author

@RBusarow RBusarow Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, but it's a pain in the butt when you're doing Gradle things and want to click into the source or even just read the javadoc.

Since Gradle's not being bundled into the release, it doesn't do any harm to just improve the devx a little bit.

networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
13 changes: 10 additions & 3 deletions integration-tests/mpp/android-module/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

lint {
Expand All @@ -37,7 +37,14 @@ android {
}

kotlin {
android()

// The `android()` target is deprecated in Kotlin 1.9.0+,
// but the new `androidTarget()` alternative doesn't exist in KGP 1.8.x.
if (kotlin.coreLibrariesVersion < "1.9.0")
android()
else {
androidTarget()
}

sourceSets {
androidMain {
Expand Down
4 changes: 2 additions & 2 deletions sample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

lint {
Expand Down
1 change: 0 additions & 1 deletion sample/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

<application
android:name="com.squareup.anvil.sample.App"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
Expand Down