Skip to content

Commit fcd5db0

Browse files
authored
Fix gradle deprecation warnings (#8534)
1 parent ac980ef commit fcd5db0

18 files changed

Lines changed: 37 additions & 37 deletions

all/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ tasks {
7979
options.release.set(11)
8080
}
8181

82-
val testJavaVersion: String? by project
82+
val testJavaVersion = project.findProperty("testJavaVersion") as String?
8383
test {
8484
enabled = testJavaVersion != "8"
8585
dependsOn(writeArtifactsAndJars)
@@ -89,7 +89,7 @@ tasks {
8989

9090
// https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage.html
9191

92-
val sourcesPath by configurations.creating {
92+
val sourcesPath = configurations.create("sourcesPath") {
9393
isCanBeResolved = true
9494
isCanBeConsumed = false
9595
extendsFrom(configurations.implementation.get())
@@ -100,7 +100,7 @@ val sourcesPath by configurations.creating {
100100
}
101101
}
102102

103-
val coverageDataPath by configurations.creating {
103+
val coverageDataPath = configurations.create("coverageDataPath") {
104104
isCanBeResolved = true
105105
isCanBeConsumed = false
106106
extendsFrom(configurations.implementation.get())

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rootProject.subprojects.forEach { subproject ->
1717
}
1818
val otelBom = extensions.create<OtelBomExtension>("otelBom")
1919

20-
val generateBuildSubstitutions by tasks.registering {
20+
val generateBuildSubstitutions = tasks.register("generateBuildSubstitutions") {
2121
group = "publishing"
2222
description = "Generate a code snippet that can be copy-pasted for use in composite builds."
2323
}
@@ -38,7 +38,7 @@ afterEvaluate {
3838
.filter(otelBom.projectFilter.get()::test)
3939
.filter { it.plugins.hasPlugin("maven-publish") }
4040

41-
generateBuildSubstitutions {
41+
generateBuildSubstitutions.configure {
4242
val outputFile = File(layout.buildDirectory.asFile.get(), "substitutions.gradle.kts")
4343
outputs.file(outputFile)
4444
val substitutionSnippet = bomProjects.joinToString(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
errorprone(project(":custom-checks"))
1414
}
1515

16-
val disableErrorProne = properties["disableErrorProne"]?.toString()?.toBoolean() ?: false
16+
val disableErrorProne = findProperty("disableErrorProne")?.toString()?.toBoolean() ?: false
1717

1818
tasks {
1919
withType<JavaCompile>().configureEach {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tasks.named("jacocoTestReport") {
1616
}
1717

1818
configurations {
19-
val implementation by getting
19+
val implementation = getByName("implementation")
2020

2121
create("transitiveSourceElements") {
2222
isCanBeResolved = false

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@ fun getCurrentClassPath(): List<File> {
106106
if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
107107
afterEvaluate {
108108
tasks {
109-
val jApiCmp by registering(JapicmpTask::class) {
109+
val jApiCmp = register<JapicmpTask>("jApiCmp") {
110110
// Depends on jar task for all published modules. See notes below.
111111
getAllPublishedModules().forEach {
112112
dependsOn(it.tasks.getByName("jar"))
113113
}
114114

115115
// the japicmp "new" version is either the user-specified one, or the locally built jar.
116-
val apiNewVersion: String? by project
116+
val apiNewVersion = project.findProperty("apiNewVersion") as String?
117117
// the japicmp "old" version is either the user-specified one, or the latest release.
118-
val apiBaseVersion: String? by project
118+
val apiBaseVersion = project.findProperty("apiBaseVersion") as String?
119119
val baselineVersion = apiBaseVersion ?: latestReleasedVersion
120120

121121
// Setup new and old classpath, new and old archives.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,12 @@ configurations.configureEach {
265265
}
266266
}
267267

268-
val dependencyManagement by configurations.creating {
268+
val dependencyManagement = configurations.create("dependencyManagement") {
269269
isCanBeConsumed = false
270270
isCanBeResolved = false
271271
}
272272

273-
val mockitoAgent by configurations.creating {
273+
val mockitoAgent = configurations.create("mockitoAgent") {
274274
extendsFrom(dependencyManagement)
275275
}
276276

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@ jmh {
2323
// Could not expand ZIP 'byte-buddy-agent-1.9.7.jar'.
2424
includeTests.set(false)
2525
profilers.add("gc")
26-
val jmhIncludeSingleClass: String? by project
26+
val jmhIncludeSingleClass = project.findProperty("jmhIncludeSingleClass") as String?
2727
if (jmhIncludeSingleClass != null) {
28-
includes.add(jmhIncludeSingleClass as String)
28+
includes.add(jmhIncludeSingleClass)
2929
}
3030

31-
val jmhFork: String? by project
31+
val jmhFork = project.findProperty("jmhFork") as String?
3232
if (jmhFork != null) {
33-
fork.set(jmhFork!!.toInt())
33+
fork.set(jmhFork.toInt())
3434
}
3535

36-
val jmhIterations: String? by project
36+
val jmhIterations = project.findProperty("jmhIterations") as String?
3737
if (jmhIterations != null) {
38-
iterations.set(jmhIterations!!.toInt())
38+
iterations.set(jmhIterations.toInt())
3939
}
4040

41-
val jmhTime: String? by project
41+
val jmhTime = project.findProperty("jmhTime") as String?
4242
if (jmhTime != null) {
4343
timeOnIteration.set(jmhTime)
4444
}
4545

46-
val jmhWarmupIterations: String? by project
46+
val jmhWarmupIterations = project.findProperty("jmhWarmupIterations") as String?
4747
if (jmhWarmupIterations != null) {
48-
warmupIterations.set(jmhWarmupIterations!!.toInt())
48+
warmupIterations.set(jmhWarmupIterations.toInt())
4949
}
5050

51-
val jmhWarmup: String? by project
51+
val jmhWarmup = project.findProperty("jmhWarmup") as String?
5252
if (jmhWarmup != null) {
5353
warmup.set(jmhWarmup)
5454
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
protobuf {
10-
val versions: Map<String, String> by project
10+
val versions = project.property("versions") as Map<*, *>
1111
protoc {
1212
// The artifact spec for the Protobuf Compiler
1313
artifact = "com.google.protobuf:protoc:${versions["com.google.protobuf"]}"

custom-checks/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tasks {
4444
}
4545

4646
// only test on java 21+
47-
val testJavaVersion: String? by project
47+
val testJavaVersion = project.findProperty("testJavaVersion") as String?
4848
if (testJavaVersion != null && Integer.valueOf(testJavaVersion) < 21) {
4949
test {
5050
enabled = false

exporters/common/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if (javaVersion >= JavaVersion.VERSION_1_9) {
5656
}
5757
}
5858

59-
val versions: Map<String, String> by project
59+
val versions = project.property("versions") as Map<*, *>
6060
dependencies {
6161
api(project(":api:all"))
6262
compileOnly(project(":sdk-extensions:autoconfigure-spi"))
@@ -87,7 +87,7 @@ dependencies {
8787
testRuntimeOnly("io.grpc:grpc-netty-shaded")
8888
}
8989

90-
val testJavaVersion: String? by project
90+
val testJavaVersion = project.findProperty("testJavaVersion") as String?
9191

9292
testing {
9393
suites {

0 commit comments

Comments
 (0)