Skip to content

Commit 21c1b02

Browse files
jaydelucatrask
andauthored
Update to gradle v9 (#7590)
Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 9631f54 commit 21c1b02

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

animal-sniffer-signature/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ val generatedSignature = configurations.create("generatedSignature") {
2222
isCanBeConsumed = true
2323
isCanBeResolved = false
2424
}
25-
configurations.add(signatureJar)
26-
configurations.add(signatureJarClasspath)
27-
configurations.add(generatedSignature)
2825

2926
dependencies {
3027
signature("com.toasttab.android:gummy-bears-api-23:0.12.0@signature")

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858
implementation("com.squareup:javapoet:1.13.0")
5959
implementation("com.squareup.wire:wire-compiler")
6060
implementation("com.squareup.wire:wire-gradle-plugin")
61-
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
61+
implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
6262
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
6363
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
6464
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,13 @@ plugins.withId("otel.publish-conventions") {
178178
register("generateVersionResource") {
179179
val moduleName = otelJava.moduleName
180180
val propertiesDir = moduleName.map { File(layout.buildDirectory.asFile.get(), "generated/properties/${it.replace('.', '/')}") }
181+
val versionProperty = project.version.toString()
181182

182-
inputs.property("project.version", project.version.toString())
183+
inputs.property("project.version", versionProperty)
183184
outputs.dir(propertiesDir)
184185

185186
doLast {
186-
File(propertiesDir.get(), "version.properties").writeText("sdk.version=${project.version}")
187+
File(propertiesDir.get(), "version.properties").writeText("sdk.version=${versionProperty}")
187188
}
188189
}
189190
}

custom-checks/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ tasks.withType<Javadoc>().configureEach {
7676
configurations {
7777
named("errorprone") {
7878
dependencies.removeIf {
79-
it is ProjectDependency && it.dependencyProject == project
79+
it is ProjectDependency && it.name == project.name
8080
}
8181
}
8282
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

sdk-extensions/jaeger-remote-sampler/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,9 @@ tasks {
7979
compilerArgs.add("-Xlint:-serial")
8080
}
8181
}
82+
83+
checkstyleMain {
84+
// overrides the default which includes generated proto sources
85+
source = fileTree("src/main/java")
86+
}
8287
}

0 commit comments

Comments
 (0)