Update to Gradle 9.1

Author: trask

buildSrc/build.gradle.kts

@@ -20,6 +20,7 @@ repositories {
   mavenCentral()
   mavenLocal()
   gradlePluginPortal()
+  maven("https://central.sonatype.com/repository/maven-snapshots/")
 }
 
 tasks.withType<Test>().configureEach {
@@ -32,18 +33,16 @@ dependencies {
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0")
   implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.3.0")
-  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.2")
 
   implementation("org.owasp:dependency-check-gradle:12.1.8")
 
-  implementation("io.opentelemetry.instrumentation:gradle-plugins:2.19.0-alpha")
+  implementation("io.opentelemetry.instrumentation:gradle-plugins:2.22.0-alpha-SNAPSHOT")
 
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.3.0")
 
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
 
-  // earlier versions aren't compatible with Gradle 8.1.1
-  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
 }

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

@@ -1,13 +1,35 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.file.DuplicatesStrategy
 
 plugins {
   id("com.gradleup.shadow")
 }
 
 tasks.withType<ShadowJar>().configureEach {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+  mergeServiceFiles()
+  mergeServiceFiles("META-INF/services/**")
   mergeServiceFiles {
-    include("inst/META-INF/services/*")
+    include("inst/META-INF/services/**")
   }
+  filesMatching("META-INF/services/**") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+  filesMatching("inst/META-INF/services/**") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+  exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
+  exclude(
+    "META-INF/LICENSE",
+    "META-INF/NOTICE",
+    "META-INF/LICENSE.txt",
+    "META-INF/NOTICE.txt",
+    "META-INF/INDEX.LIST",
+    "META-INF/io.netty.versions.properties",
+    "META-INF/AL2.0",
+    "META-INF/LGPL2.1"
+  )
+  exclude("META-INF/maven/**")
 
   exclude("**/module-info.class")
 

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

@@ -1,11 +1,35 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.microsoft.applicationinsights.gradle.AiSmokeTestExtension
+import org.gradle.api.file.DuplicatesStrategy
 
 plugins {
   id("ai.smoke-test")
-  id("org.springframework.boot")
+  id("com.gradleup.shadow")
 }
 
 val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)
 
-aiSmokeTest.testAppArtifactDir.set(tasks.bootJar.flatMap { it.destinationDirectory })
-aiSmokeTest.testAppArtifactFilename.set(tasks.bootJar.flatMap { it.archiveFileName })
+aiSmokeTest.mainClass.convention("com.microsoft.applicationinsights.smoketestapp.SpringBootApp")
+
+val shadowJar = tasks.named<ShadowJar>("shadowJar") {
+  archiveClassifier.set("")
+  archiveVersion.set("")
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+  mergeServiceFiles()
+  mergeServiceFiles("META-INF/spring.factories")
+  mergeServiceFiles("META-INF/spring.handlers")
+  mergeServiceFiles("META-INF/spring.schemas")
+  mergeServiceFiles("META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports")
+
+  manifest {
+    attributes["Main-Class"] = aiSmokeTest.mainClass.get()
+  }
+}
+
+tasks.named("assemble") {
+  dependsOn(shadowJar)
+}
+
+aiSmokeTest.testAppArtifactDir.set(shadowJar.flatMap { it.destinationDirectory })
+aiSmokeTest.testAppArtifactFilename.set(shadowJar.flatMap { it.archiveFileName })

buildSrc/src/main/kotlin/com/microsoft/applicationinsights/gradle/AiSmokeTestExtension.kt

@@ -10,4 +10,6 @@ abstract class AiSmokeTestExtension {
   abstract val testAppArtifactFilename: Property<String>
 
   abstract val dependencyContainers: ListProperty<String>
+
+  abstract val mainClass: Property<String>
 }

etw/etw-testapp/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("ai.java-conventions")
-  id("org.springframework.boot" version "2.5.12")
+  id("org.springframework.boot" version "2.7.18")
   id("war")
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -13,6 +13,7 @@ dependencyResolutionManagement {
   repositories {
     mavenCentral()
     mavenLocal()
+    maven("https://central.sonatype.com/repository/maven-snapshots/")
   }
 }
 

smoke-tests/apps/ReadOnly/build.gradle.kts

@@ -1,3 +1,5 @@
 plugins {
   id("ai.smoke-test-jar")
 }
+
+aiSmokeTest.mainClass.set("com.microsoft.applicationinsights.smoketestapp.App")

smoke-tests/apps/gRPC/build.gradle.kts

@@ -2,7 +2,7 @@ import com.google.protobuf.gradle.*
 
 plugins {
   id("ai.smoke-test-jar")
-  id("com.google.protobuf") version "0.8.19"
+  id("com.google.protobuf") version "0.9.5"
 }
 
 val grpcVersion = "1.26.0" // first version with support for arm64