Skip to content

Bumping to Gradle9 #3454

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

Draft
oldergod wants to merge 3 commits into
base: master
Choose a base branch
from
+140 −138
Draft

Bumping to Gradle9 #3454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88b49aa
Upgrade to Gradle 9.1.0
oldergod Jan 20, 2026
577e3e6
Robust url for local maven urls
oldergod Jan 20, 2026
17481d9
Xcode back to 26.1.1
oldergod Jan 20, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
xcode-version: '26.2.0'

# We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
- name: Check test files
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
xcode-version: '26.2.0'

# We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
- name: Test Swift Runtime
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
xcode-version: '26.2.0'

# We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
- name: Upload Artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
xcode-version: '26.2.0'

# We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
- name: Upload Artifacts
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-8.14.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion wire-benchmarks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
sourceSets {
main {
// Adds protobuf generated classes to our source sets.
java.srcDir("$buildDir/generated/source/proto/main/java")
java.srcDir(layout.buildDirectory.dir("generated/source/proto/main/java"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/cache-include-paths-1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/cache-include-paths-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/cache-relocation-1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/cache-relocation-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/configuration-cache-failure/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
setUrl("file://${rootDir.absolutePath}/../../../../../build/localMaven")
setUrl(File(rootDir, "../../../../../build/localMaven").toURI().toString())
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/configuration-cache-failure/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
repositories {
maven {
url = uri("file://${rootDir.absolutePath}/../../../../../build/localMaven")
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/consecutive-runs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/custom-output-no-such-class/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/custom-output/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
4 changes: 2 additions & 2 deletions wire-gradle-plugin/src/test/projects/customize-configuration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand All @@ -18,7 +18,7 @@ apply plugin: 'com.squareup.wire'
// See installProtoJars task in wire-gradle-plugin/build.gradle.kts
repositories {
maven {
url "file://${projectDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
}

Expand Down
4 changes: 2 additions & 2 deletions wire-gradle-plugin/src/test/projects/customize-task/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand All @@ -18,7 +18,7 @@ apply plugin: 'com.squareup.wire'
// See installProtoJars task in wire-gradle-plugin/build.gradle.kts
repositories {
maven {
url "file://${projectDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
}

Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/different-java-out/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/different-kotlin-out/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/different-proto-out/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/do-not-emit-wire-runtime-protos/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
4 changes: 2 additions & 2 deletions wire-gradle-plugin/src/test/projects/dry-run/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand All @@ -17,7 +17,7 @@ apply plugin: 'com.squareup.wire'

repositories {
maven {
url "file://${projectDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
}
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-java-options/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-java-then-emit-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-kotlin-and-emit-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-kotlin-options/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-kotlin-then-emit-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-options-with-includes/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-options-without-conflicts/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-proto-with-prune/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-proto-with-root/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-proto/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-service-name-suffix/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-service-none/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-service-two-ways/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/emit-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/field-prune/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/field-prunes/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/field-root/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/field-roots/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
2 changes: 1 addition & 1 deletion wire-gradle-plugin/src/test/projects/field-rule-prune/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

repositories {
maven {
url "file://${rootDir.absolutePath}/../../../../../build/localMaven"
url new File(rootDir, "../../../../../build/localMaven").toURI().toString()
}
mavenCentral()
google()
Expand Down
Loading
Loading