Update to Gradle 8.5 (#4034)

Needed to make Java 21 integration tests pass

Author: rli

buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts

@@ -1,3 +1,7 @@
+import software.aws.toolkits.gradle.ciOnly
+import software.aws.toolkits.gradle.findFolders
+import software.aws.toolkits.gradle.intellij.IdeVersions
+
 // Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
@@ -15,13 +19,20 @@ sourceSets {
 
         compileClasspath += main.get().output + test.get().output
         runtimeClasspath += main.get().output + test.get().output
+
+        // different convention for intellij projects
+        plugins.withType<ToolkitIntellijSubpluginPlugin> {
+            val ideProfile = IdeVersions.ideProfile(project)
+            java.srcDirs(findFolders(project, "it", ideProfile))
+            resources.srcDirs(findFolders(project, "it-resources", ideProfile))
+        }
     }
 }
 
 configurations.getByName("integrationTestCompileClasspath") {
     extendsFrom(configurations.getByName(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME))
-    isCanBeResolved = true
 }
+
 configurations.getByName("integrationTestRuntimeClasspath") {
     extendsFrom(configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME))
     isCanBeResolved = true
@@ -39,15 +50,36 @@ idea {
     }
 }
 
-tasks.register<Test>("integrationTest") {
+val integTestTask = tasks.register<Test>("integrationTest") {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
     description = "Runs the integration tests."
     testClassesDirs = integrationTests.output.classesDirs
     classpath = integrationTests.runtimeClasspath
 
+    ciOnly {
+        environment.remove("AWS_ACCESS_KEY_ID")
+        environment.remove("AWS_SECRET_ACCESS_KEY")
+        environment.remove("AWS_SESSION_TOKEN")
+    }
+
     mustRunAfter(tasks.test)
 }
 
 tasks.check {
     dependsOn(integrationTests.compileJavaTaskName, integrationTests.getCompileTaskName("kotlin"))
 }
+
+afterEvaluate {
+    plugins.withType<ToolkitIntellijSubpluginPlugin> {
+        // weird implicit dependency issue, maybe with how the task graph works?
+        // or because tests are on the ide classpath for some reason?
+        tasks.named("classpathIndexCleanup") {
+            mustRunAfter(tasks.named("compileIntegrationTestKotlin"))
+        }
+
+        // intellij plugin overrides with instrumented classes that we don't want or need
+        integTestTask.configure {
+            testClassesDirs = integrationTests.output.classesDirs
+        }
+    }
+}

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -40,13 +40,6 @@ sourceSets {
         java.srcDirs(findFolders(project, "tst", ideProfile))
         resources.srcDirs(findFolders(project, "tst-resources", ideProfile))
     }
-
-    plugins.withType<ToolkitIntegrationTestingPlugin> {
-        maybeCreate("integrationTest").apply {
-            java.srcDirs(findFolders(project, "it", ideProfile))
-            resources.srcDirs(findFolders(project, "it-resources", ideProfile))
-        }
-    }
 }
 
 configurations {
@@ -241,12 +234,6 @@ tasks.withType<RunIdeForUiTestTask>().all {
     }
 }
 
-// weird implicit dependency issue, maybe with how the task graph works?
-// or because tests are on the ide classpath for some reason?
-tasks.named("classpathIndexCleanup") {
-    mustRunAfter(tasks.named("compileIntegrationTestKotlin"))
-}
-
 configurations.instrumentedJar.configure {
     // when the "instrumentedJar" configuration is selected, gradle is unable to resolve configurations needed by jacoco
     // to calculate coverage, so we declare these as seconary artifacts on the primary "instrumentedJar" implicit variant

buildspec/linuxIntegrationTests.yml

@@ -45,7 +45,8 @@ phases:
         >$AWS_CONFIG_FILE echo "[default]
         role_arn=$ASSUME_ROLE_ARN
         credential_source=EcsContainer"
-
+      - ls -alh $AWS_CONFIG_FILE
+      - cat $AWS_CONFIG_FILE
       - chmod +x gradlew
       - DISPLAY=:22 ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME integrationTest coverageReport -x :jetbrains-rider:integrationTest --info --console plain
       - |

detekt-rules/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     testImplementation(libs.junit4)
     testImplementation(libs.assertj)
 
+    // only used to make test work
     testRuntimeOnly(libs.slf4j.api)
     testRuntimeOnly(libs.junit5.jupiterVintage)
 }

gradle.properties

@@ -19,3 +19,6 @@ kotlin.code.style=official
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m
+
+# prefer non-enterprise variant of test-retry
+systemProp.gradle.enterprise.testretry.enabled=false

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.c
 awsSdk = "2.20.111"
 commonmark = "0.17.1"
 detekt = "1.23.5"
-intellijGradle = "1.13.2"
+intellijGradle = "1.17.0"
 intellijRemoteRobot = "0.11.21"
 jackson = "2.15.1"
 jacoco = "0.8.11"
@@ -24,9 +24,10 @@ node-gradle = "7.0.1"
 telemetryGenerator = "1.0.182"
 testLogger = "3.1.0"
 testRetry = "1.5.2"
-slf4j = "1.7.36"
+# test-only; platform provides slf4j transitively at runtime. <233, 1.7.36; >=233, 2.0.9
+slf4j = "2.0.9"
 sshd = "2.11.0"
-wiremock = "2.35.0"
+wiremock = "3.3.1"
 undercouch-download = "5.2.1"
 zjsonpatch = "0.4.11"
 
@@ -96,10 +97,11 @@ mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "
 mockk = { module = "io.mockk:mockk", version.ref="mockk" }
 telemetryGenerator = { module = "software.aws.toolkits:telemetry-generator", version.ref = "telemetryGenerator" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
 sshd-core = { module = "org.apache.sshd:sshd-core", version.ref = "sshd" }
 sshd-scp = { module = "org.apache.sshd:sshd-scp", version.ref = "sshd" }
 sshd-sftp = { module = "org.apache.sshd:sshd-sftp", version.ref = "sshd" }
-wiremock = { module = "com.github.tomakehurst:wiremock-jre8", version.ref = "wiremock" }
+wiremock = { module = "org.wiremock:wiremock", version.ref = "wiremock" }
 zjsonpatch = { module = "com.flipkart.zjsonpatch:zjsonpatch", version.ref = "zjsonpatch" }
 
 [bundles]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jetbrains-core/build.gradle.kts

@@ -16,8 +16,8 @@ val ideProfile = IdeVersions.ideProfile(project)
 plugins {
     id("toolkit-kotlin-conventions")
     id("toolkit-testing")
-    id("toolkit-integration-testing")
     id("toolkit-intellij-subplugin")
+    id("toolkit-integration-testing")
 }
 
 buildscript {
@@ -73,6 +73,10 @@ val gatewayArtifacts by configurations.creating {
 }
 
 val gatewayJar = tasks.create<Jar>("gatewayJar") {
+    // META-INF/plugin.xml is a duplicate?
+    // unclear why the exclude() statement didn't work
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
     dependsOn(tasks.instrumentedJar)
 
     archiveBaseName.set("aws-toolkit-jetbrains-IC-GW")
@@ -104,7 +108,7 @@ tasks.prepareSandbox {
 }
 
 tasks.testJar {
-    // classpath.index is a duplicated
+    // classpath.index is a duplicate
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
@@ -147,7 +151,16 @@ dependencies {
     testImplementation(libs.mockk)
     testImplementation(libs.kotlin.coroutinesTest)
     testImplementation(libs.kotlin.coroutinesDebug)
-    testImplementation(libs.wiremock)
+    testImplementation(libs.wiremock) {
+        // conflicts with transitive inclusion from docker plugin
+        exclude(group = "org.apache.httpcomponents.client5")
+    }
+
+    // slf4j is v1.7.36 for <233
+    // in <233, the classpass binding functionality picks up the wrong impl of StaticLoggerBinder (from the maven plugin instead of IDE platform) and causes a NoClassDefFoundError
+    // instead of trying to fix the classpath, since it's built by gradle-intellij-plugin, shove slf4j >= 2.0.9 onto the test classpath, which uses a ServiceLoader and call it done
+    testImplementation(libs.slf4j.api)
+    testRuntimeOnly(libs.slf4j.jdk14)
 }
 
 // fix implicit dependency on generated source

jetbrains-core/it/software/aws/toolkits/jetbrains/core/AwsSdkClientProxyTest.kt

@@ -24,6 +24,7 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
+import software.amazon.awssdk.profiles.ProfileFileLocation
 import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.s3.S3Client
 
@@ -52,6 +53,9 @@ class AwsSdkClientProxyTest {
 
     @Before
     fun setUp() {
+        println("file: ${ProfileFileLocation.configurationFilePath()}")
+        println("loca: ${ProfileFileLocation.configurationFileLocation()}")
+        println("envv: ${System.getenv("AWS_CONFIG_FILE")}")
         awsSdkClient = AwsSdkClient()
         Disposer.register(disposableRule.disposable, awsSdkClient)
 

jetbrains-core/tst-resources/toolkit-test-log.properties

@@ -1 +1,2 @@
 software.aws.toolkits.level=FINE
+software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain.level=FINEST