Skip to content

[Gradle 8] Update to Gradle 8.13 #530

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
JakeWharton merged 17 commits into from
Jul 1, 2025
Merged

[Gradle 8] Update to Gradle 8.13 #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
337e18d
Switched from 'force' to 'strictly' to facilitate upgrading gradle wr…
MrMannWood Jun 29, 2025
b6c7548
Merge branch 'JakeWharton:trunk' into trunk
MrMannWood Jun 29, 2025
5e90974
[Gradle 8] Update build.grade to include namespace
MrMannWood Jun 29, 2025
6a78de0
Fixed issue with manifest causing build error
MrMannWood Jun 29, 2025
98eb003
updated gradle
MrMannWood Jun 29, 2025
d601293
jvmToolchain
MrMannWood Jun 30, 2025
7069251
made build work on gradle 8.13
MrMannWood Jun 30, 2025
dffe89f
./gradlew wrapper
MrMannWood Jun 30, 2025
9f8891c
updated ci java version to 17
MrMannWood Jun 30, 2025
b9a91e3
Remove Ben Manes versions plugin (#537)
JakeWharton Jun 30, 2025
1c21b6d
Merge branch 'trunk' into exploration
MrMannWood Jun 30, 2025
d934b77
Centralize CI build JDK, update with Renovate (#533)
JakeWharton Jun 30, 2025
3428d2a
fix broken merge
MrMannWood Jun 30, 2025
f95a302
[Gradle 8] Update build.grade to include namespace
MrMannWood Jun 29, 2025
6032643
update kotlin to 2.2.0
MrMannWood Jul 1, 2025
91ca49f
Restore newline
JakeWharton Jul 1, 2025
9e92ef4
Restore formatting, newline
JakeWharton Jul 1, 2025
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 .github/workflows/.java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
17
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ buildscript {
'minSdk': 14,
'compileSdk': 30,

'kotlin': '1.5.21',
'kotlin': '2.2.0',
'autoService': '1.1.1',

// Update WrongTimberUsageDetectorTest#innerStringFormatWithStaticImport when >= 7.1.0-alpha07
Copy link
Copy Markdown
Owner

@JakeWharton JakeWharton Jun 30, 2025

Choose a reason for hiding this comment

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

Do we need to do this then?

Copy link
Copy Markdown
Contributor Author

@MrMannWood MrMannWood Jun 30, 2025

Choose a reason for hiding this comment

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

until AGP plugin is upgraded, yes

'androidPlugin': '7.0.0',
'androidPlugin': '8.10.0',
'androidTools': '30.0.0',
Copy link
Copy Markdown
Owner

@JakeWharton JakeWharton Jun 30, 2025

Choose a reason for hiding this comment

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

This version should always be the previous one plus 23

Suggested change
'androidTools': '30.0.0',
'androidTools': '31.10.0',

Copy link
Copy Markdown
Contributor Author

@MrMannWood MrMannWood Jun 30, 2025

Choose a reason for hiding this comment

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

Unfortunately, making this change is going to be non-trivial. It appears that the lint rules have changed and updating the android tools causes the lint test to fail. I'm investigating how to minimize the LOC of the change, but I think it's going to be reasonably large.

I would really prefer to not change tests and these dependency numbers at the same time. My preference (if I was working with HG stacks and Phabricator) would be to have this be one diff, and the next diff on the stack would be the test fixes and the tools number bump. We could then review and have CI test each revision individually, and land the stack as a single unit. If this is possible in Git I'm unaware of how to do it.

For the time being, I'll be making the tools update and the test changes in a follow up PR, and will be awaiting your feedback before fixing this one.

]

Expand All @@ -31,7 +31,7 @@ buildscript {

junit: 'junit:junit:4.13.2',
truth: 'com.google.truth:truth:1.4.4',
robolectric: 'org.robolectric:robolectric:4.6.1',
robolectric: 'org.robolectric:robolectric:4.15.1',
]

repositories {
Expand All @@ -43,7 +43,7 @@ buildscript {
dependencies {
classpath deps.androidPlugin
classpath deps.kotlin.plugin
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.9'
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.20'
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 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,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
Comment thread
MrMannWood marked this conversation as resolved.
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
33 changes: 20 additions & 13 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions timber-lint/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ apply plugin: 'org.jetbrains.kotlin.jvm'
apply plugin: 'org.jetbrains.kotlin.kapt'
apply plugin: 'com.android.lint'

targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
kotlin {
jvmToolchain(17)
}
Comment on lines +5 to +7
Copy link
Copy Markdown
Owner

@JakeWharton JakeWharton Jun 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Toolchains are bad and I do not want them in use. See this. It's fine to land for now, but I will file an issue to track removal.

Copy link
Copy Markdown
Contributor Author

@MrMannWood MrMannWood Jul 1, 2025

Choose a reason for hiding this comment

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

Fixed with https://github.com/MrMannWood/timber/tree/toolchain

Will create a PR once the next few land


lint {
baseline = file("lint-baseline.xml")
}

dependencies {
compileOnly deps.lint.api
Expand Down
Loading