diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa2075c3f2..2a7584eb95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc1a091a5b..b04a4411dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..8bdaf60c75 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7705927e94..bcea9a72d5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/wire-benchmarks/build.gradle.kts b/wire-benchmarks/build.gradle.kts index 881c123ff2..7c0bcb687d 100644 --- a/wire-benchmarks/build.gradle.kts +++ b/wire-benchmarks/build.gradle.kts @@ -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")) } } diff --git a/wire-gradle-plugin/src/test/projects/cache-include-paths-1/build.gradle b/wire-gradle-plugin/src/test/projects/cache-include-paths-1/build.gradle index c6d0d95faf..09ffa521f2 100644 --- a/wire-gradle-plugin/src/test/projects/cache-include-paths-1/build.gradle +++ b/wire-gradle-plugin/src/test/projects/cache-include-paths-1/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/cache-include-paths-2/build.gradle b/wire-gradle-plugin/src/test/projects/cache-include-paths-2/build.gradle index b404c41735..026b764bb7 100644 --- a/wire-gradle-plugin/src/test/projects/cache-include-paths-2/build.gradle +++ b/wire-gradle-plugin/src/test/projects/cache-include-paths-2/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/cache-relocation-1/build.gradle b/wire-gradle-plugin/src/test/projects/cache-relocation-1/build.gradle index 472e400394..c33f6c7b57 100644 --- a/wire-gradle-plugin/src/test/projects/cache-relocation-1/build.gradle +++ b/wire-gradle-plugin/src/test/projects/cache-relocation-1/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/cache-relocation-2/build.gradle b/wire-gradle-plugin/src/test/projects/cache-relocation-2/build.gradle index 0da785c310..09df7f5971 100644 --- a/wire-gradle-plugin/src/test/projects/cache-relocation-2/build.gradle +++ b/wire-gradle-plugin/src/test/projects/cache-relocation-2/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/configuration-cache-failure/build.gradle.kts b/wire-gradle-plugin/src/test/projects/configuration-cache-failure/build.gradle.kts index bb36538d9b..fd99f88a95 100644 --- a/wire-gradle-plugin/src/test/projects/configuration-cache-failure/build.gradle.kts +++ b/wire-gradle-plugin/src/test/projects/configuration-cache-failure/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { repositories { maven { - setUrl("file://${rootDir.absolutePath}/../../../../../build/localMaven") + setUrl(File(rootDir, "../../../../../build/localMaven").toURI().toString()) } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/configuration-cache-failure/settings.gradle b/wire-gradle-plugin/src/test/projects/configuration-cache-failure/settings.gradle index e7454e4b35..7af53a5e7a 100644 --- a/wire-gradle-plugin/src/test/projects/configuration-cache-failure/settings.gradle +++ b/wire-gradle-plugin/src/test/projects/configuration-cache-failure/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { - url = uri("file://${rootDir.absolutePath}/../../../../../build/localMaven") + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } google() mavenCentral() diff --git a/wire-gradle-plugin/src/test/projects/consecutive-runs/build.gradle b/wire-gradle-plugin/src/test/projects/consecutive-runs/build.gradle index f87c10023a..b1076da5e5 100644 --- a/wire-gradle-plugin/src/test/projects/consecutive-runs/build.gradle +++ b/wire-gradle-plugin/src/test/projects/consecutive-runs/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/custom-output-no-such-class/build.gradle b/wire-gradle-plugin/src/test/projects/custom-output-no-such-class/build.gradle index dae00bf035..613ac18257 100644 --- a/wire-gradle-plugin/src/test/projects/custom-output-no-such-class/build.gradle +++ b/wire-gradle-plugin/src/test/projects/custom-output-no-such-class/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/custom-output/build.gradle b/wire-gradle-plugin/src/test/projects/custom-output/build.gradle index 62424afcfa..0850561cbb 100644 --- a/wire-gradle-plugin/src/test/projects/custom-output/build.gradle +++ b/wire-gradle-plugin/src/test/projects/custom-output/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/customize-configuration/build.gradle b/wire-gradle-plugin/src/test/projects/customize-configuration/build.gradle index f5f75c81a9..e9eb39488e 100644 --- a/wire-gradle-plugin/src/test/projects/customize-configuration/build.gradle +++ b/wire-gradle-plugin/src/test/projects/customize-configuration/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/customize-task/build.gradle b/wire-gradle-plugin/src/test/projects/customize-task/build.gradle index af10aeb4c8..f27f072764 100644 --- a/wire-gradle-plugin/src/test/projects/customize-task/build.gradle +++ b/wire-gradle-plugin/src/test/projects/customize-task/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/different-java-out/build.gradle b/wire-gradle-plugin/src/test/projects/different-java-out/build.gradle index 94944e6f3a..8c0426cb24 100644 --- a/wire-gradle-plugin/src/test/projects/different-java-out/build.gradle +++ b/wire-gradle-plugin/src/test/projects/different-java-out/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/different-kotlin-out/build.gradle b/wire-gradle-plugin/src/test/projects/different-kotlin-out/build.gradle index f87c10023a..b1076da5e5 100644 --- a/wire-gradle-plugin/src/test/projects/different-kotlin-out/build.gradle +++ b/wire-gradle-plugin/src/test/projects/different-kotlin-out/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/different-proto-out/build.gradle b/wire-gradle-plugin/src/test/projects/different-proto-out/build.gradle index 29771ad408..3e0ab1748c 100644 --- a/wire-gradle-plugin/src/test/projects/different-proto-out/build.gradle +++ b/wire-gradle-plugin/src/test/projects/different-proto-out/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/do-not-emit-wire-runtime-protos/build.gradle b/wire-gradle-plugin/src/test/projects/do-not-emit-wire-runtime-protos/build.gradle index 74146ed70a..c8b9e2c668 100644 --- a/wire-gradle-plugin/src/test/projects/do-not-emit-wire-runtime-protos/build.gradle +++ b/wire-gradle-plugin/src/test/projects/do-not-emit-wire-runtime-protos/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/dry-run/build.gradle b/wire-gradle-plugin/src/test/projects/dry-run/build.gradle index 4143cbe499..d11b83a615 100644 --- a/wire-gradle-plugin/src/test/projects/dry-run/build.gradle +++ b/wire-gradle-plugin/src/test/projects/dry-run/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } diff --git a/wire-gradle-plugin/src/test/projects/emit-java-options/build.gradle b/wire-gradle-plugin/src/test/projects/emit-java-options/build.gradle index 8bf141f953..1ea22ceac7 100644 --- a/wire-gradle-plugin/src/test/projects/emit-java-options/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-java-options/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-java-then-emit-kotlin/build.gradle b/wire-gradle-plugin/src/test/projects/emit-java-then-emit-kotlin/build.gradle index 5b60ee4548..c56c2f8b9c 100644 --- a/wire-gradle-plugin/src/test/projects/emit-java-then-emit-kotlin/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-java-then-emit-kotlin/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-kotlin-and-emit-java/build.gradle b/wire-gradle-plugin/src/test/projects/emit-kotlin-and-emit-java/build.gradle index 4a6e043739..2969543cfe 100644 --- a/wire-gradle-plugin/src/test/projects/emit-kotlin-and-emit-java/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-kotlin-and-emit-java/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-kotlin-options/build.gradle b/wire-gradle-plugin/src/test/projects/emit-kotlin-options/build.gradle index 1032d2c692..004400b7e7 100644 --- a/wire-gradle-plugin/src/test/projects/emit-kotlin-options/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-kotlin-options/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-kotlin-then-emit-java/build.gradle b/wire-gradle-plugin/src/test/projects/emit-kotlin-then-emit-java/build.gradle index d9924738f2..a1430f6f1f 100644 --- a/wire-gradle-plugin/src/test/projects/emit-kotlin-then-emit-java/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-kotlin-then-emit-java/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-options-with-includes/build.gradle b/wire-gradle-plugin/src/test/projects/emit-options-with-includes/build.gradle index ac0b2a8b5a..0e9fcf6da1 100644 --- a/wire-gradle-plugin/src/test/projects/emit-options-with-includes/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-options-with-includes/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-options-without-conflicts/build.gradle b/wire-gradle-plugin/src/test/projects/emit-options-without-conflicts/build.gradle index 1032d2c692..004400b7e7 100644 --- a/wire-gradle-plugin/src/test/projects/emit-options-without-conflicts/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-options-without-conflicts/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-proto-with-prune/build.gradle b/wire-gradle-plugin/src/test/projects/emit-proto-with-prune/build.gradle index e1de4a9b4d..f07d03cbb9 100644 --- a/wire-gradle-plugin/src/test/projects/emit-proto-with-prune/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-proto-with-prune/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-proto-with-root/build.gradle b/wire-gradle-plugin/src/test/projects/emit-proto-with-root/build.gradle index fdb949fe0c..0781e97889 100644 --- a/wire-gradle-plugin/src/test/projects/emit-proto-with-root/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-proto-with-root/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-proto/build.gradle b/wire-gradle-plugin/src/test/projects/emit-proto/build.gradle index 9ddc07a958..3fda9f344f 100644 --- a/wire-gradle-plugin/src/test/projects/emit-proto/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-proto/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-service-name-suffix/build.gradle b/wire-gradle-plugin/src/test/projects/emit-service-name-suffix/build.gradle index f7e95aacc3..c256587edb 100644 --- a/wire-gradle-plugin/src/test/projects/emit-service-name-suffix/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-service-name-suffix/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-service-none/build.gradle b/wire-gradle-plugin/src/test/projects/emit-service-none/build.gradle index d5ad6a77b7..cd5f2dbc92 100644 --- a/wire-gradle-plugin/src/test/projects/emit-service-none/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-service-none/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-service-two-ways/build.gradle b/wire-gradle-plugin/src/test/projects/emit-service-two-ways/build.gradle index 536a04105d..bc5eb88efc 100644 --- a/wire-gradle-plugin/src/test/projects/emit-service-two-ways/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-service-two-ways/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/emit-service/build.gradle b/wire-gradle-plugin/src/test/projects/emit-service/build.gradle index d4bb3eae96..1e0c81508e 100644 --- a/wire-gradle-plugin/src/test/projects/emit-service/build.gradle +++ b/wire-gradle-plugin/src/test/projects/emit-service/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/field-prune/build.gradle b/wire-gradle-plugin/src/test/projects/field-prune/build.gradle index 7829d00351..bec3f37f26 100644 --- a/wire-gradle-plugin/src/test/projects/field-prune/build.gradle +++ b/wire-gradle-plugin/src/test/projects/field-prune/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/field-prunes/build.gradle b/wire-gradle-plugin/src/test/projects/field-prunes/build.gradle index 5ecd50369c..fcee733437 100644 --- a/wire-gradle-plugin/src/test/projects/field-prunes/build.gradle +++ b/wire-gradle-plugin/src/test/projects/field-prunes/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/field-root/build.gradle b/wire-gradle-plugin/src/test/projects/field-root/build.gradle index 50a9e70aa2..bb16108df0 100644 --- a/wire-gradle-plugin/src/test/projects/field-root/build.gradle +++ b/wire-gradle-plugin/src/test/projects/field-root/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/field-roots/build.gradle b/wire-gradle-plugin/src/test/projects/field-roots/build.gradle index 5c05eec0ba..b6832e4cd2 100644 --- a/wire-gradle-plugin/src/test/projects/field-roots/build.gradle +++ b/wire-gradle-plugin/src/test/projects/field-roots/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/field-rule-prune/build.gradle b/wire-gradle-plugin/src/test/projects/field-rule-prune/build.gradle index a7a360673a..1cfd878a41 100644 --- a/wire-gradle-plugin/src/test/projects/field-rule-prune/build.gradle +++ b/wire-gradle-plugin/src/test/projects/field-rule-prune/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/field-rule-root/build.gradle b/wire-gradle-plugin/src/test/projects/field-rule-root/build.gradle index a7a360673a..1cfd878a41 100644 --- a/wire-gradle-plugin/src/test/projects/field-rule-root/build.gradle +++ b/wire-gradle-plugin/src/test/projects/field-rule-root/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/java-project-java-protos/build.gradle b/wire-gradle-plugin/src/test/projects/java-project-java-protos/build.gradle index 278b589879..5afa72e258 100644 --- a/wire-gradle-plugin/src/test/projects/java-project-java-protos/build.gradle +++ b/wire-gradle-plugin/src/test/projects/java-project-java-protos/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -15,11 +15,11 @@ buildscript { apply plugin: 'application' apply plugin: 'com.squareup.wire' -mainClassName = 'com.squareup.dinosaurs.Sample' +application.mainClass = "com.squareup.dinosaurs.Sample" repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/java-project-kotlin-protos/build.gradle b/wire-gradle-plugin/src/test/projects/java-project-kotlin-protos/build.gradle index 972cbe6ae2..9865b792c1 100644 --- a/wire-gradle-plugin/src/test/projects/java-project-kotlin-protos/build.gradle +++ b/wire-gradle-plugin/src/test/projects/java-project-kotlin-protos/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,11 +19,11 @@ apply plugin: 'application' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'com.squareup.wire' -mainClassName = 'com.squareup.dinosaurs.Sample' +application.mainClass = "com.squareup.dinosaurs.Sample" repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/kotlin-enum-mode/build.gradle b/wire-gradle-plugin/src/test/projects/kotlin-enum-mode/build.gradle index aa5704db9b..098d913b4c 100644 --- a/wire-gradle-plugin/src/test/projects/kotlin-enum-mode/build.gradle +++ b/wire-gradle-plugin/src/test/projects/kotlin-enum-mode/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/build.gradle b/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/build.gradle index 94e5bdecf8..45e634fdeb 100644 --- a/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/build.gradle +++ b/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -20,7 +20,7 @@ apply plugin: 'com.squareup.wire' repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/settings.gradle b/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/settings.gradle index e7454e4b35..7af53a5e7a 100644 --- a/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/settings.gradle +++ b/wire-gradle-plugin/src/test/projects/kotlin-multiplatform/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { - url = uri("file://${rootDir.absolutePath}/../../../../../build/localMaven") + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } google() mavenCentral() diff --git a/wire-gradle-plugin/src/test/projects/kotlin-project-java-protos/build.gradle b/wire-gradle-plugin/src/test/projects/kotlin-project-java-protos/build.gradle index 33dd16de0e..1f15b093ce 100644 --- a/wire-gradle-plugin/src/test/projects/kotlin-project-java-protos/build.gradle +++ b/wire-gradle-plugin/src/test/projects/kotlin-project-java-protos/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,11 +19,11 @@ apply plugin: 'application' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'com.squareup.wire' -mainClassName = 'com.squareup.dinosaurs.Sample' +application.mainClass = "com.squareup.dinosaurs.Sample" repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/kotlin-project-kotlin-protos/build.gradle b/wire-gradle-plugin/src/test/projects/kotlin-project-kotlin-protos/build.gradle index 3a9b075bb1..1514677335 100644 --- a/wire-gradle-plugin/src/test/projects/kotlin-project-kotlin-protos/build.gradle +++ b/wire-gradle-plugin/src/test/projects/kotlin-project-kotlin-protos/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,11 +19,12 @@ apply plugin: 'application' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'com.squareup.wire' -mainClassName = 'com.squareup.dinosaurs.Sample' +application.mainClass = "com.squareup.dinosaurs.Sample" + repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/build.gradle.kts b/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/build.gradle.kts index 24157aa422..93e801ba1d 100644 --- a/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/build.gradle.kts +++ b/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { repositories { maven { - setUrl("file://${rootDir.absolutePath}/../../../../../build/localMaven") + setUrl(File(rootDir, "../../../../../build/localMaven").toURI().toString()) } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/settings.gradle b/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/settings.gradle index e7454e4b35..7af53a5e7a 100644 --- a/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/settings.gradle +++ b/wire-gradle-plugin/src/test/projects/kotlinsourcesjar/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { - url = uri("file://${rootDir.absolutePath}/../../../../../build/localMaven") + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } google() mavenCentral() diff --git a/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/dep-project/build.gradle.kts b/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/dep-project/build.gradle.kts index 10afccb0bb..eef383adea 100644 --- a/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/dep-project/build.gradle.kts +++ b/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/dep-project/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { repositories { maven { - setUrl("file://${rootDir.absolutePath}/../../../../../build/localMaven") + setUrl(File(rootDir, "../../../../../build/localMaven").toURI().toString()) } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/settings.gradle b/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/settings.gradle index 9643beb331..5bfa2125a0 100644 --- a/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/settings.gradle +++ b/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { - url = uri("file://${rootDir.absolutePath}/../../../../../build/localMaven") + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } google() mavenCentral() diff --git a/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/wire-project/build.gradle.kts b/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/wire-project/build.gradle.kts index a0869cb4d9..69d83f2a92 100644 --- a/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/wire-project/build.gradle.kts +++ b/wire-gradle-plugin/src/test/projects/lazy-configuration-resolution/wire-project/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { repositories { maven { - setUrl("file://${rootDir.absolutePath}/../../../../../build/localMaven") + setUrl(File(rootDir, "../../../../../build/localMaven").toURI().toString()) } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/listener-no-such-class/build.gradle b/wire-gradle-plugin/src/test/projects/listener-no-such-class/build.gradle index e5a5848886..a826992680 100644 --- a/wire-gradle-plugin/src/test/projects/listener-no-such-class/build.gradle +++ b/wire-gradle-plugin/src/test/projects/listener-no-such-class/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/listener/build.gradle b/wire-gradle-plugin/src/test/projects/listener/build.gradle index fcad08b236..c40de618ad 100644 --- a/wire-gradle-plugin/src/test/projects/listener/build.gradle +++ b/wire-gradle-plugin/src/test/projects/listener/build.gradle @@ -16,7 +16,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/missing-kotlin-plugin/build.gradle b/wire-gradle-plugin/src/test/projects/missing-kotlin-plugin/build.gradle index 1e49180878..103470fd90 100644 --- a/wire-gradle-plugin/src/test/projects/missing-kotlin-plugin/build.gradle +++ b/wire-gradle-plugin/src/test/projects/missing-kotlin-plugin/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/missing-plugin/build.gradle b/wire-gradle-plugin/src/test/projects/missing-plugin/build.gradle index 25f9bf4880..d011ec0ad9 100644 --- a/wire-gradle-plugin/src/test/projects/missing-plugin/build.gradle +++ b/wire-gradle-plugin/src/test/projects/missing-plugin/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/move-message/build.gradle b/wire-gradle-plugin/src/test/projects/move-message/build.gradle index 84c92a389d..126bcc0242 100644 --- a/wire-gradle-plugin/src/test/projects/move-message/build.gradle +++ b/wire-gradle-plugin/src/test/projects/move-message/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/only-version/build.gradle b/wire-gradle-plugin/src/test/projects/only-version/build.gradle index 4f949de694..0f558a8517 100644 --- a/wire-gradle-plugin/src/test/projects/only-version/build.gradle +++ b/wire-gradle-plugin/src/test/projects/only-version/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/opaque-message/build.gradle b/wire-gradle-plugin/src/test/projects/opaque-message/build.gradle index f550a25fa8..bb1ff59393 100644 --- a/wire-gradle-plugin/src/test/projects/opaque-message/build.gradle +++ b/wire-gradle-plugin/src/test/projects/opaque-message/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/package-cycles-permitted/build.gradle b/wire-gradle-plugin/src/test/projects/package-cycles-permitted/build.gradle index 390516ede2..9018005976 100644 --- a/wire-gradle-plugin/src/test/projects/package-cycles-permitted/build.gradle +++ b/wire-gradle-plugin/src/test/projects/package-cycles-permitted/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,7 +19,7 @@ apply plugin: 'com.squareup.wire' repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/package-cycles/build.gradle b/wire-gradle-plugin/src/test/projects/package-cycles/build.gradle index 8b862fa76e..db66b083c6 100644 --- a/wire-gradle-plugin/src/test/projects/package-cycles/build.gradle +++ b/wire-gradle-plugin/src/test/projects/package-cycles/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,7 +19,7 @@ apply plugin: 'com.squareup.wire' repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/build.gradle index 583bfe2913..21b8210b64 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -20,7 +20,7 @@ apply plugin: 'org.jetbrains.kotlin.jvm' allprojects { repositories { maven { - url "file://${project.rootProject.projectDir}/../../../../../build/localMaven" + url new File(project.rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/dinosaurs/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/dinosaurs/build.gradle index e93fd05512..6744881ecc 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/dinosaurs/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/dinosaurs/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/geology/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/geology/build.gradle index 3f7c698216..bc304db2ca 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/geology/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/geology/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/location/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/location/build.gradle index 3f7c698216..bc304db2ca 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/location/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies-typesafe-accessor/location/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies/build.gradle index 583bfe2913..21b8210b64 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -20,7 +20,7 @@ apply plugin: 'org.jetbrains.kotlin.jvm' allprojects { repositories { maven { - url "file://${project.rootProject.projectDir}/../../../../../build/localMaven" + url new File(project.rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies/dinosaurs/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies/dinosaurs/build.gradle index 06062c1f3d..6ba3a31360 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies/dinosaurs/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies/dinosaurs/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies/geology/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies/geology/build.gradle index 3f7c698216..bc304db2ca 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies/geology/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies/geology/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/project-dependencies/location/build.gradle b/wire-gradle-plugin/src/test/projects/project-dependencies/location/build.gradle index 3f7c698216..bc304db2ca 100644 --- a/wire-gradle-plugin/src/test/projects/project-dependencies/location/build.gradle +++ b/wire-gradle-plugin/src/test/projects/project-dependencies/location/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/proto-library/build.gradle b/wire-gradle-plugin/src/test/projects/proto-library/build.gradle index 712ecf99c5..9f72440c54 100644 --- a/wire-gradle-plugin/src/test/projects/proto-library/build.gradle +++ b/wire-gradle-plugin/src/test/projects/proto-library/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/protopath-maven/build.gradle b/wire-gradle-plugin/src/test/projects/protopath-maven/build.gradle index 2df9a54d8b..6036947128 100644 --- a/wire-gradle-plugin/src/test/projects/protopath-maven/build.gradle +++ b/wire-gradle-plugin/src/test/projects/protopath-maven/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/reject-unused/build.gradle b/wire-gradle-plugin/src/test/projects/reject-unused/build.gradle index 0877825544..817119dbca 100644 --- a/wire-gradle-plugin/src/test/projects/reject-unused/build.gradle +++ b/wire-gradle-plugin/src/test/projects/reject-unused/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/require-target/build.gradle b/wire-gradle-plugin/src/test/projects/require-target/build.gradle index 60d056bf1c..73e57ff697 100644 --- a/wire-gradle-plugin/src/test/projects/require-target/build.gradle +++ b/wire-gradle-plugin/src/test/projects/require-target/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/since-until/build.gradle b/wire-gradle-plugin/src/test/projects/since-until/build.gradle index 95481691c1..6881b3dbc4 100644 --- a/wire-gradle-plugin/src/test/projects/since-until/build.gradle +++ b/wire-gradle-plugin/src/test/projects/since-until/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourceaar-local-protopath/build.gradle b/wire-gradle-plugin/src/test/projects/sourceaar-local-protopath/build.gradle index 8a0bcf9556..57b05639f5 100644 --- a/wire-gradle-plugin/src/test/projects/sourceaar-local-protopath/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourceaar-local-protopath/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcedir-exclude/build.gradle b/wire-gradle-plugin/src/test/projects/sourcedir-exclude/build.gradle index dd45598c5e..5291fe6ea8 100644 --- a/wire-gradle-plugin/src/test/projects/sourcedir-exclude/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcedir-exclude/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,11 +19,11 @@ apply plugin: 'application' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'com.squareup.wire' -mainClassName = 'com.squareup.dinosaurs.Sample' +application.mainClass = "com.squareup.dinosaurs.Sample" repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/sourcedir-include/build.gradle b/wire-gradle-plugin/src/test/projects/sourcedir-include/build.gradle index 7a8c60504e..79e59bacbd 100644 --- a/wire-gradle-plugin/src/test/projects/sourcedir-include/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcedir-include/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -19,11 +19,11 @@ apply plugin: 'application' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'com.squareup.wire' -mainClassName = 'com.squareup.dinosaurs.Sample' +application.mainClass = "com.squareup.dinosaurs.Sample" repositories { maven { - url "file://${projectDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() } diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-local-many-files/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-local-many-files/build.gradle index 376ae08827..61d7c6344b 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-local-many-files/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-local-many-files/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-local-nonproto-file/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-local-nonproto-file/build.gradle index 1b2ac925f3..31d2663f28 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-local-nonproto-file/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-local-nonproto-file/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-local-single-file/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-local-single-file/build.gradle index b2d94aae9f..76648eb61d 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-local-single-file/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-local-single-file/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-mixed-conflicts/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-mixed-conflicts/build.gradle index 1ffcd7b8e3..b8f9f75792 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-mixed-conflicts/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-mixed-conflicts/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-remote-many-files/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-remote-many-files/build.gradle index fc8a2d8459..cd4b3c6c56 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-remote-many-files/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-remote-many-files/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-remote-protopath/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-remote-protopath/build.gradle index 7f9762bf45..9a6dc78540 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-remote-protopath/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-remote-protopath/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-remote-version-catalog/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-remote-version-catalog/build.gradle index 5f65897eb0..bc40840ee7 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-remote-version-catalog/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-remote-version-catalog/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcejar-remote-wildcards/build.gradle b/wire-gradle-plugin/src/test/projects/sourcejar-remote-wildcards/build.gradle index 34e1f5af98..b0d5d49912 100644 --- a/wire-gradle-plugin/src/test/projects/sourcejar-remote-wildcards/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcejar-remote-wildcards/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-and-protopath-intersect/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-and-protopath-intersect/build.gradle index 80f842cbba..056286c39e 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-and-protopath-intersect/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-and-protopath-intersect/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-build-dir/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-build-dir/build.gradle index dcace80a75..07413369ad 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-build-dir/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-build-dir/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-default/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-default/build.gradle index 95b4b27634..5cce6d3c57 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-default/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-default/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-dir/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-dir/build.gradle index 70aca2baff..45ef71330f 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-dir/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-dir/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-file/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-file/build.gradle index d27ca6aa29..5cd44f557e 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-file/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-file/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-maven-single-file/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-maven-single-file/build.gradle index dd4987b17f..d99538dfe1 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-maven-single-file/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-maven-single-file/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-maven/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-maven/build.gradle index 005a361a1e..6924dd8318 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-maven/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-maven/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-no-sources/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-no-sources/build.gradle index 95b4b27634..5cce6d3c57 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-no-sources/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-no-sources/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-dir/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-dir/build.gradle index 70aca2baff..45ef71330f 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-dir/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-dir/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir-with-protopath/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir-with-protopath/build.gradle index e5af79329d..5b993dde75 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir-with-protopath/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir-with-protopath/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir/build.gradle index 162c025ac2..81d3edfd38 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-nonexistent-srcdir/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcepath-uri/build.gradle b/wire-gradle-plugin/src/test/projects/sourcepath-uri/build.gradle index 7965549585..78f913d049 100644 --- a/wire-gradle-plugin/src/test/projects/sourcepath-uri/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcepath-uri/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcetree-many-srcdirs/build.gradle b/wire-gradle-plugin/src/test/projects/sourcetree-many-srcdirs/build.gradle index 01f9de297c..436ba498fe 100644 --- a/wire-gradle-plugin/src/test/projects/sourcetree-many-srcdirs/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcetree-many-srcdirs/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-many-files/build.gradle b/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-many-files/build.gradle index 019711282f..84d2a096e3 100644 --- a/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-many-files/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-many-files/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-one-file/build.gradle b/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-one-file/build.gradle index 019711282f..84d2a096e3 100644 --- a/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-one-file/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcetree-one-srcdir-one-file/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/sourcezip-local-protopath/build.gradle b/wire-gradle-plugin/src/test/projects/sourcezip-local-protopath/build.gradle index e865d897d1..5960cb34f0 100644 --- a/wire-gradle-plugin/src/test/projects/sourcezip-local-protopath/build.gradle +++ b/wire-gradle-plugin/src/test/projects/sourcezip-local-protopath/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { maven { - url "file://${rootDir.absolutePath}/../../../../../build/localMaven" + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } mavenCentral() google() @@ -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() } } diff --git a/wire-gradle-plugin/src/test/projects/task-dependency/build.gradle.kts b/wire-gradle-plugin/src/test/projects/task-dependency/build.gradle.kts index 0fe3f99ac2..99973a31ec 100644 --- a/wire-gradle-plugin/src/test/projects/task-dependency/build.gradle.kts +++ b/wire-gradle-plugin/src/test/projects/task-dependency/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { repositories { maven { - setUrl("file://${rootDir.absolutePath}/../../../../../build/localMaven") + setUrl(File(rootDir, "../../../../../build/localMaven").toURI().toString()) } mavenCentral() google() diff --git a/wire-gradle-plugin/src/test/projects/task-dependency/settings.gradle b/wire-gradle-plugin/src/test/projects/task-dependency/settings.gradle index e7454e4b35..7af53a5e7a 100644 --- a/wire-gradle-plugin/src/test/projects/task-dependency/settings.gradle +++ b/wire-gradle-plugin/src/test/projects/task-dependency/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { - url = uri("file://${rootDir.absolutePath}/../../../../../build/localMaven") + url new File(rootDir, "../../../../../build/localMaven").toURI().toString() } google() mavenCentral() diff --git a/wire-reflector/build.gradle.kts b/wire-reflector/build.gradle.kts index 2dd42eea6f..3bca43b967 100644 --- a/wire-reflector/build.gradle.kts +++ b/wire-reflector/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } val main by sourceSets.getting { - java.srcDir("$buildDir/wire") + java.srcDir(layout.buildDirectory.dir("wire")) } dependencies { @@ -35,7 +35,7 @@ val generateReflectionProtos by tasks.registering(JavaExec::class) { classpath = generateReflectionProtosClasspath args( "--proto_path=$projectDir/src/main/resources", - "--kotlin_out=$buildDir/wire", + "--kotlin_out=${layout.buildDirectory.get()}/wire", "grpc/reflection/v1alpha/reflection.proto" ) }