deprecations

Author: trask

agent/agent-for-testing/build.gradle.kts

@@ -50,7 +50,7 @@ tasks {
     dependsOn(relocateJavaagentLibs)
     isolateClasses(relocateJavaagentLibs.get().outputs.files)
 
-    into("$buildDir/isolated/javaagentLibs")
+    into(layout.buildDirectory.dir("isolated/javaagentLibs"))
   }
 
   // 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation

agent/agent/build.gradle.kts

@@ -95,7 +95,7 @@ tasks {
     dependsOn(relocateJavaagentLibs)
     isolateClasses(relocateJavaagentLibs.get().outputs.files)
 
-    into("$buildDir/isolated/javaagentLibs")
+    into(layout.buildDirectory.dir("isolated/javaagentLibs"))
   }
 
   // 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation

buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts

@@ -62,7 +62,7 @@ tasks.withType<Test>().configureEach {
   // The sources are packaged into the testing jar so we need to make sure to exclude from the test
   // classpath, which automatically inherits them, to ensure our shaded versions are used.
   classpath = classpath.filter {
-    if (file("$buildDir/resources/main") == it || file("$buildDir/classes/java/main") == it) {
+    if (file("${layout.buildDirectory.asFile.get()}/resources/main") == it || file("${layout.buildDirectory.asFile.get()}/classes/java/main") == it) {
       return@filter false
     }
     return@filter true

buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   `java-library`
 }
 
-val sdkVersionDir = "${buildDir}/generated/resources/sdk-version"
+val sdkVersionDir = layout.buildDirectory.dir("generated/resources/sdk-version")
 
 abstract class GenerateVersionResourceTask : DefaultTask() {
   @get:Input
@@ -22,7 +22,7 @@ abstract class GenerateVersionResourceTask : DefaultTask() {
 tasks {
   register<GenerateVersionResourceTask>("generateVersionResource") {
     projectVersion.set(project.version.toString())
-    outputDirectory.set(File(sdkVersionDir))
+    outputDirectory.set(sdkVersionDir)
   }
 }
 

buildSrc/src/main/kotlin/ai.smoke-test-jar.gradle.kts

@@ -7,5 +7,5 @@ plugins {
 
 val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)
 
-aiSmokeTest.testAppArtifactDir.set(tasks.getByName<Jar>("bootJar").destinationDirectory.get())
-aiSmokeTest.testAppArtifactFilename.set(tasks.getByName<Jar>("bootJar").archiveFileName.get())
+aiSmokeTest.testAppArtifactDir.set(tasks.named<Jar>("bootJar").flatMap { it.destinationDirectory })
+aiSmokeTest.testAppArtifactFilename.set(tasks.named<Jar>("bootJar").flatMap { it.archiveFileName })

buildSrc/src/main/kotlin/ai.smoke-test-war.gradle.kts

@@ -13,7 +13,7 @@ tasks.war {
 
 val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)
 
-aiSmokeTest.testAppArtifactDir.set(tasks.getByName<War>("war").destinationDirectory.get())
+aiSmokeTest.testAppArtifactDir.set(tasks.named<War>("war").flatMap { it.destinationDirectory })
 aiSmokeTest.testAppArtifactFilename.set(project.name + ".war")
 
 dependencies {

buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts

@@ -87,7 +87,7 @@ configurations.all {
 }
 
 tasks {
-  task<Test>("smokeTest") {
+  register<Test>("smokeTest") {
     useJUnitPlatform()
 
     // this is just to force building the agent first

buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts

@@ -35,7 +35,7 @@ spotless {
       "docs/**/*.md",
       "*.sh",
       "src/**/*.properties")
-    indentWithSpaces()
+    leadingTabsToSpaces()
     trimTrailingWhitespace()
     endWithNewline()
   }

etw/java/build.gradle

@@ -22,7 +22,9 @@ sourceSets {
   }
 }
 
-archivesBaseName = "applicationinsights-java-etw-provider"
+base {
+  archivesName = "applicationinsights-java-etw-provider"
+}
 
 logger.info "project ${project.path} prop: ai.etw.native.build=${System.properties['ai.etw.native.build']}"
 

gradle.properties

@@ -13,10 +13,5 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 
 # org.gradle.warning.mode=fail
 
-# To allow caching more tasks in buildSrc project
-# This property is not mentioned in Gradle documentation
-# See https://github.com/gradle/gradle/issues/15214 for background info
-systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
-
 # Workaround https://youtrack.jetbrains.com/issue/KT-34862
 kotlin.incremental=false