From fbd54450b0fb5c1188eb9d651586b38736af4833 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 21 Oct 2025 20:24:12 -0700 Subject: [PATCH 1/3] Remove deprecated usages of buildSrc --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4a315a4..7fd6ee7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,7 +68,7 @@ protobuf { } } -val protoArchive = file("$buildDir/archives/opentelemetry-proto-$protoVersion.zip") +val protoArchive = layout.buildDirectory.file("archives/opentelemetry-proto-$protoVersion.zip") tasks { test { @@ -84,7 +84,7 @@ tasks { val unzipProtoArchive by registering(Copy::class) { dependsOn(downloadProtoArchive) from(zipTree(protoArchive)) - into("$buildDir/protos") + into(layout.buildDirectory.dir("protos")) } named("processResources") { @@ -101,7 +101,7 @@ tasks { sourceSets { main { proto { - srcDir("$buildDir/protos/opentelemetry-proto-$protoVersion") + srcDir(layout.buildDirectory.dir("protos/opentelemetry-proto-$protoVersion")) } } } From e9e1f5c1d35d9e831a6ce7fe67c3179f7988585b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 21 Oct 2025 20:32:51 -0700 Subject: [PATCH 2/3] fix --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7fd6ee7..bbd672d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,7 +76,7 @@ tasks { } val downloadProtoArchive by registering(Download::class) { - onlyIf { !protoArchive.exists() } + onlyIf { !protoArchive.get().asFile.exists() } src("https://github.com/open-telemetry/opentelemetry-proto/archive/v$protoVersion.zip") dest(protoArchive) } From 6ad6cca27ce4587334bca5094a44fa186248dea6 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 21 Oct 2025 20:33:50 -0700 Subject: [PATCH 3/3] better --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index bbd672d..8cd621e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,9 +76,9 @@ tasks { } val downloadProtoArchive by registering(Download::class) { - onlyIf { !protoArchive.get().asFile.exists() } src("https://github.com/open-telemetry/opentelemetry-proto/archive/v$protoVersion.zip") dest(protoArchive) + overwrite(false) } val unzipProtoArchive by registering(Copy::class) {