fix: everything works except smoke-tests:services

Author: 0marperez

buildSrc/src/main/kotlin/aws/sdk/kotlin/shared/CodegenTest.kt

@@ -14,5 +14,5 @@ data class CodegenTest(
  */
 data class Model(
     val fileName: String,
-    val path: String = "src/commonTest/resources/",
+    val path: String = "src/test/resources/",
 )

tests/codegen/build.gradle.kts

@@ -2,18 +2,14 @@ import aws.sdk.kotlin.gradle.codegen.dsl.generateSmithyProjections
 
 plugins {
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
-    alias(libs.plugins.kotlin.multiplatform)
-}
-
-kotlin {
-    jvm()
+    alias(libs.plugins.kotlin.jvm)
 }
 
 val libraries = libs
 
 subprojects {
     apply(plugin = libraries.plugins.aws.kotlin.repo.tools.smithybuild.get().pluginId)
-    apply(plugin = libraries.plugins.kotlin.multiplatform.get().pluginId)
+    apply(plugin = libraries.plugins.kotlin.jvm.get().pluginId)
 
     val optinAnnotations = listOf(
         "aws.smithy.kotlin.runtime.InternalApi",
@@ -43,54 +39,42 @@ subprojects {
         codegen(libraries.smithy.model)
     }
 
-    kotlin {
-        jvm {
-            compilations.all {
-                kotlinOptions.jvmTarget = "1.8"
-            }
-        }
-        sourceSets {
-            commonMain {
-                dependencies {
-                    implementation(project(":codegen:aws-sdk-codegen"))
-                    implementation(libraries.smithy.kotlin.codegen)
+    val implementation by configurations
+    val api by configurations
+    val testImplementation by configurations
+    dependencies {
+        implementation(project(":codegen:aws-sdk-codegen"))
+        implementation(libraries.smithy.kotlin.codegen)
+
+        /* We have to manually add all the dependencies of the generated client(s).
+        Doing it this way (as opposed to doing what we do for protocol-tests) allows the tests to work without a
+        publish to maven-local step at the cost of maintaining this set of dependencies manually. */
+        implementation(libraries.kotlinx.coroutines.core)
+        implementation(libraries.bundles.smithy.kotlin.service.client)
+        implementation(libraries.smithy.kotlin.aws.event.stream)
+        implementation(project(":aws-runtime:aws-http"))
+        implementation(libraries.smithy.kotlin.aws.json.protocols)
+        implementation(libraries.smithy.kotlin.serde.json)
+        api(project(":aws-runtime:aws-config"))
+        api(project(":aws-runtime:aws-core"))
+        api(project(":aws-runtime:aws-endpoint"))
+
+        testImplementation(libraries.kotlin.test)
+        testImplementation(libraries.kotlinx.coroutines.test)
+        testImplementation(libraries.smithy.kotlin.smithy.test)
+        testImplementation(libraries.smithy.kotlin.aws.signing.default)
+        testImplementation(libraries.smithy.kotlin.telemetry.api)
+        testImplementation(libraries.smithy.kotlin.http.test)
+    }
 
-                    /* We have to manually add all the dependencies of the generated client(s).
-                    Doing it this way (as opposed to doing what we do for protocol-tests) allows the tests to work without a
-                    publish to maven-local step at the cost of maintaining this set of dependencies manually. */
-                    implementation(libraries.kotlinx.coroutines.core)
-                    implementation(libraries.bundles.smithy.kotlin.service.client)
-                    implementation(libraries.smithy.kotlin.aws.event.stream)
-                    implementation(project(":aws-runtime:aws-http"))
-                    implementation(libraries.smithy.kotlin.aws.json.protocols)
-                    implementation(libraries.smithy.kotlin.serde.json)
-                    api(project(":aws-runtime:aws-config"))
-                    api(project(":aws-runtime:aws-core"))
-                    api(project(":aws-runtime:aws-endpoint"))
-                }
-            }
-            commonTest {
-                dependencies {
-                    implementation(libraries.kotlin.test)
-                    implementation(libraries.kotlinx.coroutines.test)
-                    implementation(libraries.smithy.kotlin.smithy.test)
-                    implementation(libraries.smithy.kotlin.aws.signing.default)
-                    implementation(libraries.smithy.kotlin.telemetry.api)
-                    implementation(libraries.smithy.kotlin.http.test)
-                }
-            }
-            jvmTest {
-                tasks.withType<Test> {
-                    useJUnitPlatform()
-                    testLogging {
-                        events("passed", "skipped", "failed")
-                        showStandardStreams = true
-                        showStackTraces = true
-                        showExceptions = true
-                        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-                    }
-                }
-            }
+    tasks.withType<Test> {
+        useJUnitPlatform()
+        testLogging {
+            events("passed", "skipped", "failed")
+            showStandardStreams = true
+            showStackTraces = true
+            showExceptions = true
+            exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
         }
     }
 }

tests/codegen/checksums/build.gradle.kts

@@ -31,12 +31,8 @@ smithyBuild {
     }
 }
 
-kotlin {
-    sourceSets {
-        commonTest {
-            smithyBuild.projections.forEach {
-                kotlin.srcDir(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
-            }
-        }
+kotlin.sourceSets.getByName("test") {
+    smithyBuild.projections.forEach {
+        kotlin.srcDir(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
     }
 }

tests/codegen/checksums/src/commonTest/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt renamed to tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt

@@ -54,12 +54,8 @@ smithyBuild {
     }
 }
 
-kotlin {
-    sourceSets {
-        commonTest {
-            smithyBuild.projections.forEach {
-                kotlin.srcDir(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
-            }
-        }
+kotlin.sourceSets.getByName("test") {
+    smithyBuild.projections.forEach {
+        kotlin.srcDir(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
     }
 }