Skip to content

Commit 2f749a9

Browse files
authored
Convert some build file to kotlin dsl (#8743)
* chore(gradle): Convert :telemetry build file to kotlin * chore(gradle): Convert :utils:socket-utils build file to kotlin * chore(gradle): Convert :utils:container-utils build file to kotlin * chore(gradle): Convert more :utils project to kotlin dsl * chore(gradle): Convert :remote-config project to kotlin dsl * chore(build): tweak compile configuration
1 parent a53a47b commit 2f749a9

File tree

18 files changed

+226
-176
lines changed

18 files changed

+226
-176
lines changed

remote-config/remote-config-api/build.gradle

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apply(from = "$rootDir/gradle/java.gradle")
2+
3+
val excludedClassesBranchCoverage by extra(
4+
listOf(
5+
"datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop"
6+
)
7+
)

remote-config/remote-config-core/build.gradle

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
`java-library`
3+
}
4+
5+
apply(from = "$rootDir/gradle/java.gradle")
6+
7+
val minimumBranchCoverage by extra(0.6)
8+
val minimumInstructionCoverage by extra(0.8)
9+
val excludedClassesCoverage by extra(
10+
listOf(
11+
// not used yet
12+
"datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.AgentInfo",
13+
// only half the adapter interface used
14+
"datadog.remoteconfig.tuf.InstantJsonAdapter",
15+
// idem
16+
"datadog.remoteconfig.tuf.RawJsonAdapter",
17+
"datadog.remoteconfig.ExceptionHelper",
18+
)
19+
)
20+
val excludedClassesBranchCoverage by extra(
21+
listOf(
22+
"datadog.remoteconfig.tuf.FeaturesConfig",
23+
"datadog.remoteconfig.PollerRequestFactory",
24+
)
25+
)
26+
val excludedClassesInstructionCoverage by extra(
27+
listOf(
28+
"datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop",
29+
)
30+
)
31+
32+
dependencies {
33+
api(project(":remote-config:remote-config-api"))
34+
35+
implementation(libs.slf4j)
36+
implementation(libs.okhttp)
37+
implementation(libs.moshi)
38+
implementation(libs.bundles.cafe.crypto)
39+
40+
implementation(project(":internal-api"))
41+
42+
testImplementation(project(":utils:test-utils"))
43+
}

telemetry/build.gradle

Lines changed: 0 additions & 56 deletions
This file was deleted.

telemetry/build.gradle.kts

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
plugins {
2+
id("me.champeau.jmh")
3+
id("java-library")
4+
}
5+
6+
apply(from = "$rootDir/gradle/java.gradle")
7+
8+
val minimumBranchCoverage by extra(0.6)
9+
val minimumInstructionCoverage by extra(0.8)
10+
val excludedClassesCoverage by extra(
11+
listOf(
12+
"datadog.telemetry.TelemetryRunnable.ThreadSleeperImpl",
13+
"datadog.telemetry.HostInfo",
14+
"datadog.telemetry.HostInfo.Os",
15+
"datadog.telemetry.dependency.LocationsCollectingTransformer",
16+
"datadog.telemetry.dependency.JbossVirtualFileHelper",
17+
"datadog.telemetry.RequestBuilder.NumberJsonAdapter",
18+
"datadog.telemetry.RequestBuilderSupplier",
19+
"datadog.telemetry.TelemetrySystem",
20+
"datadog.telemetry.api.*",
21+
"datadog.telemetry.metric.CiVisibilityMetricPeriodicAction"
22+
)
23+
)
24+
val excludedClassesBranchCoverage by extra(
25+
listOf(
26+
"datadog.telemetry.PolymorphicAdapterFactory.1",
27+
"datadog.telemetry.HostInfo",
28+
"datadog.telemetry.HostInfo.Os"
29+
)
30+
)
31+
val excludedClassesInstructionCoverage by extra(emptyList<String>())
32+
33+
dependencies {
34+
implementation(libs.slf4j)
35+
36+
implementation(project(":internal-api"))
37+
38+
compileOnly(project(":dd-java-agent:agent-tooling"))
39+
testImplementation(project(":dd-java-agent:agent-tooling"))
40+
testImplementation(project(":dd-java-agent:agent-logging"))
41+
42+
compileOnly(project(":communication"))
43+
testImplementation(project(":communication"))
44+
45+
compileOnly(project(":utils:container-utils"))
46+
testImplementation(project(":utils:container-utils"))
47+
48+
api(libs.okhttp)
49+
api(libs.moshi)
50+
51+
testImplementation(project(":utils:test-utils"))
52+
testImplementation(group = "org.hamcrest", name = "hamcrest", version = "2.2")
53+
testImplementation(group = "org.jboss", name = "jboss-vfs", version = "3.2.16.Final")
54+
}
55+
56+
jmh {
57+
jmhVersion = "1.28"
58+
duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
59+
}

utils/container-utils/build.gradle

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
plugins {
2+
`java-library`
3+
}
4+
5+
apply(from = "$rootDir/gradle/java.gradle")
6+
7+
dependencies {
8+
implementation(libs.slf4j)
9+
10+
testImplementation(project(":utils:test-utils"))
11+
}

utils/socket-utils/build.gradle

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
2+
import groovy.lang.Closure
3+
import org.gradle.kotlin.dsl.extra
4+
5+
plugins {
6+
`java-library`
7+
idea
8+
}
9+
10+
val minJavaVersionForTests by extra(JavaVersion.VERSION_17)
11+
12+
apply(from = "$rootDir/gradle/java.gradle")
13+
14+
dependencies {
15+
implementation(libs.slf4j)
16+
implementation(project(":internal-api"))
17+
implementation(libs.jnr.unixsocket)
18+
testImplementation(files(sourceSets["main_java17"].output))
19+
}
20+
21+
tasks.named<CheckForbiddenApis>("forbiddenApisMain_java17") {
22+
failOnMissingClasses = false
23+
}
24+
25+
fun AbstractCompile.setJavaVersion(javaVersionInteger: Int) {
26+
(project.extra.get("setJavaVersion") as Closure<*>).call(this, javaVersionInteger)
27+
}
28+
29+
listOf("compileMain_java17Java", "compileTestJava").forEach {
30+
tasks.named<JavaCompile>(it).configure {
31+
setJavaVersion(17)
32+
sourceCompatibility = JavaVersion.VERSION_1_8.toString()
33+
targetCompatibility = JavaVersion.VERSION_1_8.toString()
34+
}
35+
}
36+
37+
idea {
38+
module {
39+
jdkName = "17"
40+
}
41+
}

0 commit comments

Comments
 (0)