diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce5c35966..5309f2ba2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ smithy-version = "1.51.0" # testing junit-version = "5.10.5" kotest-version = "5.9.1" -kotlin-compile-testing-version = "1.6.0" +kotlin-compile-testing-version = "0.7.0" kotlinx-benchmark-version = "0.4.12" kotlinx-serialization-version = "1.7.3" docker-java-version = "3.4.0" @@ -80,7 +80,7 @@ smithy-smoke-test-traits = { module = "software.amazon.smithy:smithy-smoke-test- junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" } junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" } -kotlin-compile-testing = {module = "com.github.tschuchortdev:kotlin-compile-testing", version.ref = "kotlin-compile-testing-version" } +kotlin-compile-testing = {module = "dev.zacsweers.kctfork:core", version.ref = "kotlin-compile-testing-version" } kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest-version" } kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest-version" } kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark-version" } diff --git a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/ApiEvolutionTest.kt b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/ApiEvolutionTest.kt index 720a27001..0960f0300 100644 --- a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/ApiEvolutionTest.kt +++ b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/ApiEvolutionTest.kt @@ -6,7 +6,6 @@ package software.amazon.smithy.kotlin.codegen import software.amazon.smithy.kotlin.codegen.util.asSmithy import software.amazon.smithy.kotlin.codegen.util.testModelChangeAgainstSource -import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertTrue @@ -21,7 +20,6 @@ import kotlin.test.assertTrue * Example: "Wrote generated SDK to /tmp/sdk-codegen-1606867139716" */ class ApiEvolutionTest { - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `client calling operation with no input to operation with empty input compiles`() { val modelV1 = """ @@ -81,7 +79,6 @@ class ApiEvolutionTest { } } - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `client calling operation with empty input to operation with input containing members compiles`() { val modelV1 = """ @@ -147,7 +144,6 @@ class ApiEvolutionTest { } } - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `client calling operation with no output to operation with empty output compiles`() { val modelV1 = """ @@ -207,7 +203,6 @@ class ApiEvolutionTest { } } - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `client calling operation with empty output to operation with output containing members compiles`() { val modelV1 = """ diff --git a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt index 4ba864345..8cad9fc62 100644 --- a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt +++ b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt @@ -25,7 +25,6 @@ class SmithySdkTest { // Max number of warnings the compiler can issue as a result of compiling SDK with kitchen sink model. private val warningThreshold = 3 - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `white label sdk compiles without errors`() { val model = javaClass.getResource("/kitchen-sink-model.smithy")!!.asSmithy() @@ -56,7 +55,6 @@ class SmithySdkTest { assertTrue(result <= warningThreshold, "Compiler warnings ($result) breached threshold of $warningThreshold\n$formatted") } - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `white label sdk compiles with language keywords as model member names`() { val fooMembers = hardReservedWords @@ -100,7 +98,6 @@ class SmithySdkTest { assertEquals(KotlinCompilation.ExitCode.OK, compilationResult.exitCode, compileOutputStream.toString()) } - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `it has non conflicting document deserializer for exceptions`() { // test that an exception is re-used not as an error but as part of some other payload (ticket: 176989575) @@ -139,7 +136,6 @@ class SmithySdkTest { assertEquals(KotlinCompilation.ExitCode.OK, compilationResult.exitCode, compileOutputStream.toString()) } - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `it compiles models with nested unions`() { val model = """ @@ -181,7 +177,6 @@ class SmithySdkTest { } // https://github.com/smithy-lang/smithy-kotlin/issues/1125 - @Ignore // Disabled until kotlin-compile-testing supports Kotlin 2.1.0 @Test fun `it compiles models with string enums`() { val model = """