Revert "misc: upgrade to Gradle 9.0.0 (#1665)"

This reverts commit 61a6919.

Author: lauzadis

.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json

@@ -14,18 +14,6 @@ buildscript {
         // Add our custom gradle build logic to buildscript classpath
         classpath(libs.aws.kotlin.repo.tools.build.support)
     }
-
-    configurations.classpath {
-        resolutionStrategy {
-            /*
-            Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath:
-            java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3)
-
-            FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix
-             */
-            force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14")
-        }
-    }
 }
 
 plugins {

build.gradle.kts

@@ -73,38 +73,63 @@ dependencies {
     codegen(libs.smithy.aws.protocol.tests)
 }
 
+abstract class ProtocolTestTask @Inject constructor(private val project: Project) : DefaultTask() {
+    /**
+     * The projection
+     */
+    @get:Input
+    abstract val projectionName: Property<String>
+
+    /**
+     * The projection root directory
+     */
+    @get:Input
+    abstract val projectionRootDirectory: Property<String>
+
+    @TaskAction
+    fun runTests() {
+        val projectionRootDir = project.file(projectionRootDirectory.get())
+        println("[$projectionName] buildDir: $projectionRootDir")
+        if (!projectionRootDir.exists()) {
+            throw GradleException("$projectionRootDir does not exist")
+        }
+        val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew"
+        val gradlew = project.rootProject.file(wrapper).absolutePath
+
+        // NOTE - this still requires us to publish to maven local.
+        project.exec {
+            workingDir = projectionRootDir
+            executable = gradlew
+            args = listOf("test")
+        }
+    }
+}
+
 smithyBuild.projections.forEach {
     val protocolName = it.name
 
-    val dirProvider = smithyBuild
-        .smithyKotlinProjectionPath(protocolName)
-        .map { file(it.toString()) }
+    tasks.register<ProtocolTestTask>("testProtocol-$protocolName") {
+        dependsOn(tasks.generateSmithyProjections)
+        group = "Verification"
+        projectionName.set(it.name)
+        projectionRootDirectory.set(smithyBuild.smithyKotlinProjectionPath(it.name).map { it.toString() })
+    }
 
+    // FIXME This is a hack to work around how protocol tests aren't in the actual service model and thus codegen
+    // separately from service customizations.
     val copyStaticFiles = tasks.register<Copy>("copyStaticFiles-$protocolName") {
         group = "codegen"
         from(rootProject.projectDir.resolve("services/$protocolName/common/src"))
-        into(smithyBuild.smithyKotlinProjectionSrcDir(protocolName))
+        into(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
     }
 
-    tasks.register<Exec>("testProtocol-$protocolName") {
-        group = "Verification"
-        dependsOn(tasks.generateSmithyProjections, copyStaticFiles)
-
-        doFirst {
-            val dir = dirProvider.get()
-            require(dir.exists()) { "$dir does not exist" }
-
-            val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew"
-            val gradlew = rootProject.layout.projectDirectory.file(wrapper).asFile.absolutePath
-
-            workingDir = dir
-            executable = gradlew
-            args = listOf("test")
-        }
+    tasks.generateSmithyProjections.configure {
+        finalizedBy(copyStaticFiles)
     }
 }
 
 tasks.register("testAllProtocols") {
     group = "Verification"
-    dependsOn(tasks.matching { it.name.startsWith("testProtocol-") })
+    val allTests = tasks.withType<ProtocolTestTask>()
+    dependsOn(allTests)
 }

codegen/protocol-tests/build.gradle.kts

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

gradle/wrapper/gradle-wrapper.properties

@@ -113,7 +113,7 @@ if (project.NATIVE_ENABLED) {
         }
     }
 
-    listOf("jvmSourcesJar", "metadataSourcesJar", "jvmProcessResources").forEach {
+    listOf("jvmSourcesJar", "metadataSourcesJar").forEach {
         tasks.named(it) {
             dependsOn(moveGenSrc)
         }

hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts

@@ -30,7 +30,11 @@ dependencies {
     api(project(":aws-runtime:aws-core"))
     implementation(libs.ksp.api)
     implementation(libs.smithy.kotlin.runtime.core)
-    testImplementation(kotlin("test"))
+
+    testImplementation(libs.junit.jupiter)
+    testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.kotest.assertions.core.jvm)
+    testImplementation(libs.kotlin.test.junit5)
 }
 
 val sourcesJar by tasks.creating(Jar::class) {

hll/hll-codegen/build.gradle.kts

@@ -4,8 +4,8 @@
  */
 package aws.sdk.kotlin.hll.codegen.core
 
-import kotlin.test.Test
-import kotlin.test.assertEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import kotlin.test.assertFailsWith
 
 class TemplateEngineTest {

hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt

@@ -6,9 +6,9 @@ package aws.sdk.kotlin.hll.codegen.core
 
 import aws.sdk.kotlin.hll.codegen.model.TypeRef
 import aws.sdk.kotlin.hll.codegen.model.TypeVar
-import kotlin.test.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import kotlin.test.assertContains
-import kotlin.test.assertEquals
 
 class TemplateProcessorTest {
     @Test

hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt

@@ -4,8 +4,8 @@
  */
 package aws.sdk.kotlin.hll.codegen.util
 
-import kotlin.test.Test
-import kotlin.test.assertEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class StringsTest {
     @Test

hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt

@@ -87,6 +87,7 @@ if ("dynamodb".isBootstrappedService) {
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-codegen")
     include(":hll:dynamodb-mapper:dynamodb-mapper-annotations")
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-generator-plugin")
+    include(":hll:dynamodb-mapper:tests:dynamodb-mapper-schema-generator-plugin-test")
 } else {
     logger.warn(":services:dynamodb is not bootstrapped, skipping :hll:dynamodb-mapper and subprojects")
 }