Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ tasks {
options.release.set(11)
}

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

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

val sourcesPath by configurations.creating {
val sourcesPath = configurations.create("sourcesPath") {
isCanBeResolved = true
isCanBeConsumed = false
extendsFrom(configurations.implementation.get())
Expand All @@ -100,7 +100,7 @@ val sourcesPath by configurations.creating {
}
}

val coverageDataPath by configurations.creating {
val coverageDataPath = configurations.create("coverageDataPath") {
isCanBeResolved = true
isCanBeConsumed = false
extendsFrom(configurations.implementation.get())
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rootProject.subprojects.forEach { subproject ->
}
val otelBom = extensions.create<OtelBomExtension>("otelBom")

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

generateBuildSubstitutions {
generateBuildSubstitutions.configure {
val outputFile = File(layout.buildDirectory.asFile.get(), "substitutions.gradle.kts")
outputs.file(outputFile)
val substitutionSnippet = bomProjects.joinToString(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
errorprone(project(":custom-checks"))
}

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

tasks {
withType<JavaCompile>().configureEach {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tasks.named("jacocoTestReport") {
}

configurations {
val implementation by getting
val implementation = getByName("implementation")

create("transitiveSourceElements") {
isCanBeResolved = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,16 @@ fun getCurrentClassPath(): List<File> {
if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
afterEvaluate {
tasks {
val jApiCmp by registering(JapicmpTask::class) {
val jApiCmp = register<JapicmpTask>("jApiCmp") {
// Depends on jar task for all published modules. See notes below.
getAllPublishedModules().forEach {
dependsOn(it.tasks.getByName("jar"))
}

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

// Setup new and old classpath, new and old archives.
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,12 @@ configurations.configureEach {
}
}

val dependencyManagement by configurations.creating {
val dependencyManagement = configurations.create("dependencyManagement") {
isCanBeConsumed = false
isCanBeResolved = false
}

val mockitoAgent by configurations.creating {
val mockitoAgent = configurations.create("mockitoAgent") {
extendsFrom(dependencyManagement)
}

Expand Down
20 changes: 10 additions & 10 deletions buildSrc/src/main/kotlin/otel.jmh-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ jmh {
// Could not expand ZIP 'byte-buddy-agent-1.9.7.jar'.
includeTests.set(false)
profilers.add("gc")
val jmhIncludeSingleClass: String? by project
val jmhIncludeSingleClass = project.findProperty("jmhIncludeSingleClass") as String?
if (jmhIncludeSingleClass != null) {
includes.add(jmhIncludeSingleClass as String)
includes.add(jmhIncludeSingleClass)
}

val jmhFork: String? by project
val jmhFork = project.findProperty("jmhFork") as String?
if (jmhFork != null) {
fork.set(jmhFork!!.toInt())
fork.set(jmhFork.toInt())
}

val jmhIterations: String? by project
val jmhIterations = project.findProperty("jmhIterations") as String?
if (jmhIterations != null) {
iterations.set(jmhIterations!!.toInt())
iterations.set(jmhIterations.toInt())
}

val jmhTime: String? by project
val jmhTime = project.findProperty("jmhTime") as String?
if (jmhTime != null) {
timeOnIteration.set(jmhTime)
}

val jmhWarmupIterations: String? by project
val jmhWarmupIterations = project.findProperty("jmhWarmupIterations") as String?
if (jmhWarmupIterations != null) {
warmupIterations.set(jmhWarmupIterations!!.toInt())
warmupIterations.set(jmhWarmupIterations.toInt())
}

val jmhWarmup: String? by project
val jmhWarmup = project.findProperty("jmhWarmup") as String?
if (jmhWarmup != null) {
warmup.set(jmhWarmup)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

protobuf {
val versions: Map<String, String> by project
val versions = project.property("versions") as Map<*, *>
protoc {
// The artifact spec for the Protobuf Compiler
artifact = "com.google.protobuf:protoc:${versions["com.google.protobuf"]}"
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tasks {
}

// only test on java 21+
val testJavaVersion: String? by project
val testJavaVersion = project.findProperty("testJavaVersion") as String?
if (testJavaVersion != null && Integer.valueOf(testJavaVersion) < 21) {
test {
enabled = false
Expand Down
4 changes: 2 additions & 2 deletions exporters/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if (javaVersion >= JavaVersion.VERSION_1_9) {
}
}

val versions: Map<String, String> by project
val versions = project.property("versions") as Map<*, *>
dependencies {
api(project(":api:all"))
compileOnly(project(":sdk-extensions:autoconfigure-spi"))
Expand Down Expand Up @@ -87,7 +87,7 @@ dependencies {
testRuntimeOnly("io.grpc:grpc-netty-shaded")
}

val testJavaVersion: String? by project
val testJavaVersion = project.findProperty("testJavaVersion") as String?

testing {
suites {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
jmhRuntimeOnly("io.grpc:grpc-netty")
}

val testJavaVersion: String? by project
val testJavaVersion = project.findProperty("testJavaVersion") as String?

testing {
suites {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "OpenTelemetry Protocol Exporter"
otelJava.moduleName.set("io.opentelemetry.exporter.internal.otlp")
otelJava.osgiOptionalPackages.set(listOf("io.opentelemetry.api.incubator"))

val versions: Map<String, String> by project
val versions = project.property("versions") as Map<*, *>
dependencies {
protoSource("io.opentelemetry.proto:opentelemetry-proto:${versions["io.opentelemetry.proto"]}")

Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/profiles/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
description = "OpenTelemetry - Profiles Exporter"
otelJava.moduleName.set("io.opentelemetry.exporter.otlp.profiles")

val versions: Map<String, String> by project
val versions = project.property("versions") as Map<*, *>

dependencies {
api(project(":sdk:common"))
Expand Down
2 changes: 1 addition & 1 deletion exporters/prometheus/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ testing {
}

sourceSets {
val module by creating
val module = create("module")
main {
output.dir(mapOf("builtBy" to "compileModuleJava"), module.java.destinationDirectory)
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/osgi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ fun registerOsgiSuite(
bndrun = resolveTask.flatMap { it.outputBndrun }
bundles = files(sourceSet.runtimeClasspath, bundleTask.get().archiveFile)
if (minJavaVersion != null) {
val testJavaVersion: String? by project
val testJavaVersion = project.findProperty("testJavaVersion") as String?
enabled = testJavaVersion == null || testJavaVersion!!.toInt() >= minJavaVersion
}
// BND reports success when zero tests ran (e.g. if bundles failed to start). Fail explicitly.
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/tracecontext/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
}

tasks {
val shadowJar by existing(Jar::class) {
val shadowJar = named<Jar>("shadowJar") {
archiveFileName.set("tracecontext-tests.jar")

manifest {
Expand Down
2 changes: 1 addition & 1 deletion javadoc-crawler/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ otelJava.osgiEnabled.set(false)
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)

tasks {
val crawl by registering(JavaExec::class) {
val crawl = register<JavaExec>("crawl") {
dependsOn(classes)

mainClass.set("io.opentelemetry.javadocs.JavaDocsCrawler")
Expand Down
8 changes: 4 additions & 4 deletions sdk-extensions/declarative-config/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ val configurationRef = "refs/tags/v$configurationTag" // Replace with commit SHA
val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
val buildDirectory = layout.buildDirectory.asFile.get()

val downloadConfigurationSchema by tasks.registering(Download::class) {
val downloadConfigurationSchema = tasks.register<Download>("downloadConfigurationSchema") {
src(configurationRepoZip)
// The version is encoded in the filename so that a configurationTag change results in a new
// path that doesn't yet exist, triggering a fresh download. On subsequent builds with the same
Expand All @@ -78,7 +78,7 @@ val downloadConfigurationSchema by tasks.registering(Download::class) {
overwrite(false)
}

val unzipConfigurationSchema by tasks.registering(Sync::class) {
val unzipConfigurationSchema = tasks.register<Sync>("unzipConfigurationSchema") {
// Sync (not Copy) removes stale files from the destination when the source changes, ensuring
// files deleted or renamed between schema versions don't linger in the build dir.
dependsOn(downloadConfigurationSchema)
Expand Down Expand Up @@ -140,7 +140,7 @@ jsonSchema2Pojo {
val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo")
generateJsonSchema2Pojo.dependsOn(unzipConfigurationSchema)

val syncPojoModelsToSrc by tasks.registering(Copy::class) {
val syncPojoModelsToSrc = tasks.register<Copy>("syncPojoModelsToSrc") {
dependsOn(generateJsonSchema2Pojo)
finalizedBy("spotlessApply")
val modelDir = File(projectDir, "src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model")
Expand Down Expand Up @@ -168,7 +168,7 @@ val syncPojoModelsToSrc by tasks.registering(Copy::class) {
// autoconfigure and without the risk of divergence from manual syncing.
val generatedResourceConfigDir =
layout.buildDirectory.dir("generated/sources/resource-configuration/java/main")
val copyResourceConfiguration by tasks.registering(Copy::class) {
val copyResourceConfiguration = tasks.register<Copy>("copyResourceConfiguration") {
from(
project(":sdk-extensions:autoconfigure").file(
"src/main/java/io/opentelemetry/sdk/autoconfigure/EnvironmentResource.java"
Expand Down
Loading