diff --git a/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Versions.kt b/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Versions.kt index 9d24c0d..1bf3908 100644 --- a/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Versions.kt +++ b/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Versions.kt @@ -80,7 +80,7 @@ data class Android( val hilt: String = "2.59.2", val hiltAandroidx: String = "1.3.0", val metro: String = "1.0.0", - val metroPlugin: String = "0.10.2", + val metroPlugin: String = "1.0.0", val composeBom: String = "2026.04.01", val robolectric: String = "4.16.1", val espresso: String = "3.7.0", diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/AndroidKotlinMultiplatformLibraryE2EValidationTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/AndroidKotlinMultiplatformLibraryE2EValidationTest.kt index 973d479..98923cd 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/AndroidKotlinMultiplatformLibraryE2EValidationTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/AndroidKotlinMultiplatformLibraryE2EValidationTest.kt @@ -15,6 +15,7 @@ import io.github.cdsap.projectgenerator.model.Versions import io.github.cdsap.projectgenerator.writer.GradleWrapper import org.gradle.testkit.runner.GradleRunner import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Assumptions.assumeFalse import org.junit.jupiter.api.io.TempDir import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.EnumSource @@ -28,6 +29,8 @@ class AndroidKotlinMultiplatformLibraryE2EValidationTest { @ParameterizedTest @EnumSource(DependencyInjection::class) fun `android kotlin multiplatform library project assembles for all di modes`(di: DependencyInjection) { + val jdk = "17" + assumeFalse(di == DependencyInjection.METRO && jdk == "17", "Metro is not supported on JDK 17") val projectName = "android_kmp_library_e2e_${di.name.lowercase()}" ProjectGenerator( modules = 6, @@ -36,7 +39,7 @@ class AndroidKotlinMultiplatformLibraryE2EValidationTest { typeOfProjectRequested = TypeProjectRequested.ANDROID, classesPerModule = ClassesPerModule(ClassesPerModuleType.FIXED, 10), versions = Versions( - project = Project(jdk = "17"), + project = Project(jdk = jdk), di = di, android = Android(kotlinMultiplatformLibrary = true) ), @@ -56,6 +59,8 @@ class AndroidKotlinMultiplatformLibraryE2EValidationTest { @ParameterizedTest @EnumSource(DependencyInjection::class) fun `android kotlin multiplatform library with room project assembles for all di modes`(di: DependencyInjection) { + val jdk = "17" + assumeFalse(di == DependencyInjection.METRO && jdk == "17", "Metro is not supported on JDK 17") val projectName = "android_kmp_library_room_e2e_${di.name.lowercase()}" ProjectGenerator( modules = 6, @@ -64,7 +69,7 @@ class AndroidKotlinMultiplatformLibraryE2EValidationTest { typeOfProjectRequested = TypeProjectRequested.ANDROID, classesPerModule = ClassesPerModule(ClassesPerModuleType.FIXED, 10), versions = Versions( - project = Project(jdk = "17"), + project = Project(jdk = jdk), di = di, android = Android( kotlinMultiplatformLibrary = true, diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/RoomDiVariantsAssembleE2EValidationTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/RoomDiVariantsAssembleE2EValidationTest.kt index 9a9b157..1296955 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/RoomDiVariantsAssembleE2EValidationTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/RoomDiVariantsAssembleE2EValidationTest.kt @@ -15,6 +15,7 @@ import io.github.cdsap.projectgenerator.model.Versions import io.github.cdsap.projectgenerator.writer.GradleWrapper import org.gradle.testkit.runner.GradleRunner import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Assumptions.assumeFalse import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.EnumSource import org.junit.jupiter.api.io.TempDir @@ -28,6 +29,8 @@ class RoomDiVariantsAssembleE2EValidationTest { @ParameterizedTest @EnumSource(DependencyInjection::class) fun `room builds debug and release with assemble for all di modes`(di: DependencyInjection) { + val jdk = "17" + assumeFalse(di == DependencyInjection.METRO && jdk == "17", "Metro is not supported on JDK 17") val projectName = "room_assemble_${di.name.lowercase()}" ProjectGenerator( modules = 8, @@ -36,7 +39,7 @@ class RoomDiVariantsAssembleE2EValidationTest { typeOfProjectRequested = TypeProjectRequested.ANDROID, classesPerModule = ClassesPerModule(ClassesPerModuleType.FIXED, 12), versions = Versions( - project = Project(jdk = "17"), + project = Project(jdk = jdk), di = di, android = Android(roomDatabase = true) ),