diff --git a/disk-buffering/build.gradle.kts b/disk-buffering/build.gradle.kts index 66dc10467..edc8e862c 100644 --- a/disk-buffering/build.gradle.kts +++ b/disk-buffering/build.gradle.kts @@ -18,6 +18,8 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } +val protos by configurations.creating + dependencies { api("io.opentelemetry:opentelemetry-sdk") compileOnly("com.google.auto.value:auto-value-annotations") @@ -25,6 +27,8 @@ dependencies { signature("com.toasttab.android:gummy-bears-api-21:0.6.1:coreLib@signature") testImplementation("org.mockito:mockito-inline") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") + + protos("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha@jar") } animalsniffer { @@ -49,11 +53,17 @@ jmh { timeUnit.set("ms") } +val setupProtos by tasks.registering(Sync::class) { + inputs.files(protos) + from(zipTree(protos.singleFile)) + into(layout.buildDirectory.dir("protos")) +} + wire { java {} sourcePath { - srcJar("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha") + srcDir(setupProtos) } root( diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b953..9bbc975c7 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 d71047787..36e4933e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b0..faf93008b 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line.