From 504ce18e916fe3c68b11692e8615ad288be0d1b2 Mon Sep 17 00:00:00 2001 From: Pavel Shishkin Date: Fri, 26 Jul 2024 15:26:28 +0200 Subject: [PATCH] support k2 compose compiler plugin --- .../composable-test-cases/build.gradle.kts | 21 +--- .../buildSrc/build.gradle.kts | 10 -- .../src/main/kotlin/TargetsConfiguration.kt | 25 ++-- .../ComposeCompilerArtifactProvider.kt | 70 ----------- .../internal/InternalComposeSupportPlugin.kt | 50 -------- .../common/build.gradle.kts | 3 +- .../composable-test-cases/gradle.properties | 14 +-- .../gradle/libs.versions.toml | 6 +- .../composable-test-cases/settings.gradle.kts | 119 +++--------------- .../anonymousObjects/lib/build.gradle.kts | 1 + .../anonymousObjects/main/build.gradle.kts | 1 + .../constructors/lib/build.gradle.kts | 1 + .../constructors/main/build.gradle.kts | 1 + .../expectActual/lib/build.gradle.kts | 31 +---- .../expectActual/main/build.gradle.kts | 1 + .../composableInterface/lib/build.gradle.kts | 1 + .../composableInterface/main/build.gradle.kts | 1 + .../funInterface/lib/build.gradle.kts | 1 + .../funInterface/main/build.gradle.kts | 1 + .../testcases/lambdas/lib/build.gradle.kts | 1 + .../testcases/lambdas/main/build.gradle.kts | 1 + .../rememberAnonymousObj/lib/build.gradle.kts | 1 + .../main/build.gradle.kts | 1 + .../testcases/stability/lib/build.gradle.kts | 1 + .../testcases/stability/main/build.gradle.kts | 1 + .../testcases/template/lib/build.gradle.kts | 1 + .../testcases/template/main/build.gradle.kts | 1 + .../testcases/valueClass/lib/build.gradle.kts | 1 + .../valueClass/main/build.gradle.kts | 1 + 29 files changed, 56 insertions(+), 312 deletions(-) delete mode 100644 compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/ComposeCompilerArtifactProvider.kt delete mode 100644 compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/InternalComposeSupportPlugin.kt diff --git a/compose/integrations/composable-test-cases/build.gradle.kts b/compose/integrations/composable-test-cases/build.gradle.kts index c3f12c0674..cd2e43ac91 100644 --- a/compose/integrations/composable-test-cases/build.gradle.kts +++ b/compose/integrations/composable-test-cases/build.gradle.kts @@ -1,4 +1,3 @@ -import internal.InternalComposeSupportPlugin import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile @@ -14,26 +13,7 @@ allprojects { // mavenLocal() } - // Apply here for all subprojects instead of applying in each build.gradle.kts separately. - // It applies the compiler plugin - this.apply() - afterEvaluate { - val pluginOptionPrefix = "plugin:androidx.compose.compiler.plugins.kotlin:" - val project = this - val kotlinVersion = project.properties["kotlin.version"] as? String - - project.tasks.withType(KotlinCompile::class.java).configureEach { - kotlinOptions.apply { - freeCompilerArgs += - listOf( - "-P", - "${pluginOptionPrefix}suppressKotlinVersionCompatibilityCheck=$kotlinVersion" - ) - - } - } - tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += listOf( "-Xklib-enable-signature-clash-checks=false", @@ -49,6 +29,7 @@ allprojects { plugins { kotlin("multiplatform") apply false + alias(libs.plugins.composeCompiler).apply(false) } fun Project.disableYarnLockMismatchReport() { diff --git a/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts b/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts index 95f69da720..befa51343d 100644 --- a/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts +++ b/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.KotlinCompile - repositories { mavenCentral() gradlePluginPortal() @@ -19,11 +17,3 @@ java { dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin") } - - -tasks.withType>().configureEach { - kotlinOptions { - languageVersion = "1.9" - apiVersion = "1.9" - } -} \ No newline at end of file diff --git a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt b/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt index 4e1ed1fb21..2bfaf58678 100644 --- a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt +++ b/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt @@ -11,25 +11,15 @@ val Project.coroutinesVersion: String return extraProperties.properties["kotlinx.coroutines.version"] as String } -val Project.isInIdea: Boolean - get() { - return System.getProperty("idea.active")?.toBoolean() == true - } - -val Project.isFailingJsCase: Boolean - get() = this.name.contains("-failingJs-") - -val Project.isMingwX64Enabled: Boolean - get() = false //this.isInIdea - @OptIn(ExperimentalWasmDsl::class) fun KotlinMultiplatformExtension.configureTargets() { jvm("desktop") + applyDefaultHierarchyTemplate() configureJsTargets() wasmJs { d8 {} } - ios() + iosArm64() iosSimulatorArm64() iosX64() @@ -63,4 +53,13 @@ fun KotlinSourceSet.configureCommonTestDependencies() { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion") } } -} \ No newline at end of file +} + +val Project.composeVersion: String + get() = properties["compose.version"] as? String + ?: error("'compose.version' is not defined") + +val Project.composeRuntimeDependency: String + get() = properties["compose.runtime.artifactId"] as? String + ?: properties["compose.runtime.groupId"]?.let { "$it:runtime:$composeVersion" } + ?: "org.jetbrains.compose.runtime:runtime:${composeVersion}" diff --git a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/ComposeCompilerArtifactProvider.kt b/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/ComposeCompilerArtifactProvider.kt deleted file mode 100644 index 906fdf5620..0000000000 --- a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/ComposeCompilerArtifactProvider.kt +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2020-2022 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package internal - -import internal.ComposeCompilerArtifactProvider.DefaultCompiler.pluginArtifact -import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact - -// Partially copy-pasted from https://github.com/JetBrains/compose-multiplatform/tree/master/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose -internal class ComposeCompilerArtifactProvider( - private val customPluginString: () -> String -) { - val compilerArtifact: SubpluginArtifact by lazy { - val customPlugin = customPluginString() - val customCoordinates = customPlugin.split(":") - when (customCoordinates.size) { - 1 -> { - val customVersion = customCoordinates[0] - check(customVersion.isNotBlank()) { "'compose.kotlinCompilerPlugin' cannot be blank!" } - pluginArtifact(version = customVersion) - } - 3 -> pluginArtifact( - version = customCoordinates[2], - groupId = customCoordinates[0], - artifactId = customCoordinates[1], - ) - else -> error(""" - Illegal format of 'compose.kotlinCompilerPlugin' property. - Expected format: either '' or '::' - Actual value: '$customPlugin' - """.trimIndent()) - } - } - - val compilerHostedArtifact: SubpluginArtifact - get() = compilerArtifact.run { - val newArtifactId = - if (groupId == DefaultCompiler.GROUP_ID && artifactId == DefaultCompiler.ARTIFACT_ID) { - DefaultCompiler.HOSTED_ARTIFACT_ID - } else artifactId - - copy(artifactId = newArtifactId) - } - - internal object DefaultCompiler { - const val GROUP_ID = "org.jetbrains.compose.compiler" - const val ARTIFACT_ID = "compiler" - const val HOSTED_ARTIFACT_ID = "compiler-hosted" - - fun pluginArtifact( - version: String, - groupId: String = GROUP_ID, - artifactId: String = ARTIFACT_ID, - ): SubpluginArtifact = - SubpluginArtifact(groupId = groupId, artifactId = artifactId, version = version) - } -} - -internal fun SubpluginArtifact.copy( - groupId: String? = null, - artifactId: String? = null, - version: String? = null -): SubpluginArtifact = - SubpluginArtifact( - groupId = groupId ?: this.groupId, - artifactId = artifactId ?: this.artifactId, - version = version ?: this.version - ) \ No newline at end of file diff --git a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/InternalComposeSupportPlugin.kt b/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/InternalComposeSupportPlugin.kt deleted file mode 100644 index 3a089054c2..0000000000 --- a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/internal/InternalComposeSupportPlugin.kt +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package internal - -import org.gradle.api.Project -import org.gradle.api.provider.Provider -import org.jetbrains.kotlin.gradle.plugin.* - -// Partially copy-pasted from https://github.com/JetBrains/compose-multiplatform/tree/master/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose -class InternalComposeSupportPlugin : KotlinCompilerPluginSupportPlugin { - private lateinit var composeCompilerArtifactProvider: ComposeCompilerArtifactProvider - - override fun apply(target: Project) { - super.apply(target) - - val composeCompilerVersion = target.properties["compose.kotlinCompilerPluginVersion"] as? String - ?: error("'compose.kotlinCompilerPluginVersion' is not defined") - composeCompilerArtifactProvider = ComposeCompilerArtifactProvider { composeCompilerVersion } - } - - override fun getCompilerPluginId(): String = "androidx.compose.compiler.plugins.kotlin" - - override fun getPluginArtifact(): SubpluginArtifact = - composeCompilerArtifactProvider.compilerArtifact - - override fun getPluginArtifactForNative(): SubpluginArtifact = - composeCompilerArtifactProvider.compilerHostedArtifact - - override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = true - - override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider> { - val target = kotlinCompilation.target - return target.project.provider { emptyList() } - } - - private fun options(vararg options: Pair): List = - options.map { SubpluginOption(it.first, it.second) } -} - -val Project.composeVersion: String - get() = properties["compose.version"] as? String - ?: error("'compose.version' is not defined") - -val Project.composeRuntimeDependency: String - get() = properties["compose.runtime.artifactId"] as? String - ?: properties["compose.runtime.groupId"]?.let { it.toString() + ":runtime:$composeVersion" } - ?: "org.jetbrains.compose.runtime:runtime:${composeVersion}" \ No newline at end of file diff --git a/compose/integrations/composable-test-cases/common/build.gradle.kts b/compose/integrations/composable-test-cases/common/build.gradle.kts index 39930b6b51..ce31da7eac 100644 --- a/compose/integrations/composable-test-cases/common/build.gradle.kts +++ b/compose/integrations/composable-test-cases/common/build.gradle.kts @@ -1,7 +1,6 @@ -import internal.composeRuntimeDependency - plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } group = "com.example" diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties index cd327007ea..c8359fae9f 100644 --- a/compose/integrations/composable-test-cases/gradle.properties +++ b/compose/integrations/composable-test-cases/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m kotlin.code.style=official android.useAndroidX=true -kotlin.version=1.9.24 +kotlin.version=2.0.20-RC agp.version=7.3.0 # a version of compose libraries. In this project the only dependency is compose-runtime. @@ -10,15 +10,3 @@ compose.version=1.6.10-rc01 compose.runtime.groupId=org.jetbrains.compose.runtime kotlinx.coroutines.version=1.8.0 - -#empty by default - a default version will be used -#compose.kotlinCompilerPluginVersion=23.12.18 -compose.kotlinCompilerPluginVersion=1.5.13.3 - -# default|failingJs - see enum class CasesToRun -tests.casesToRun=default -# comma separated names of test cases known to fail (either compilation or while running) with k/js. -#tests.failing.kjs=rememberAnonymousObj - -# TODO: we should test with both K2 and K1 -#kotlin.experimental.tryK2=true \ No newline at end of file diff --git a/compose/integrations/composable-test-cases/gradle/libs.versions.toml b/compose/integrations/composable-test-cases/gradle/libs.versions.toml index 7dbc91539b..e40a059ff5 100644 --- a/compose/integrations/composable-test-cases/gradle/libs.versions.toml +++ b/compose/integrations/composable-test-cases/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlinx-datetime = "0.5.0" +kotlin="2.0.20-RC" -[libraries] -kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } \ No newline at end of file +[plugins] +composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/compose/integrations/composable-test-cases/settings.gradle.kts b/compose/integrations/composable-test-cases/settings.gradle.kts index 96f65488a7..e22ee533b7 100644 --- a/compose/integrations/composable-test-cases/settings.gradle.kts +++ b/compose/integrations/composable-test-cases/settings.gradle.kts @@ -9,8 +9,6 @@ pluginManagement { } } -rootProject.name = "composable-test-cases" - fun module(name: String, path: String) { include(name) val projectDir = rootDir.resolve(path).normalize().absoluteFile @@ -22,112 +20,31 @@ fun module(name: String, path: String) { gradle.startParameter.setContinueOnFailure(true) -enum class CasesToRun(val value: String) { - Default("default"), - FailingJs("failingJs"), - ; - - fun isDefault() = this == Default -} - -val casesToRun = CasesToRun.values().firstOrNull { - it.value == extra["tests.casesToRun"] -} ?: CasesToRun.Default - - -val listOfFailingJsCases = (extra.properties.getOrDefault("tests.failing.kjs", "") as String).split(",") -val failingJsSuffix = "failingJs" - -fun getFailingSuffix(testCaseName: String): String? { - if (casesToRun == CasesToRun.FailingJs && - listOfFailingJsCases.contains(testCaseName) - ) { - return failingJsSuffix - } - return null -} - -fun addRememberAnonymousObjTestCase(testFailingJs: Boolean = false) { - val libName = ":testcase-rememberAnonymousObj-lib".let { - if (testFailingJs) { - it.replace("-lib", "-$failingJsSuffix-lib") - } else { - it - } - } - val mainName = ":testcase-rememberAnonymousObj-main".let { - if (testFailingJs) { - it.replace("-main", "-$failingJsSuffix-main") - } else { - it - } - } - module(libName, "testcases/rememberAnonymousObj/lib") - module(mainName, "testcases/rememberAnonymousObj/main") -} - -/** - * @param name - the name of a test case - * @param failingTestCaseNameSuffix - the suffix to add for a failing test case. - * Each platform should have its own unique suffix. - */ -fun addATestCase(name: String, failingTestCaseNameSuffix: String? = null) { - val libName = ":testcase-$name-lib".let { - if (failingTestCaseNameSuffix != null) { - it.replace("-lib", "-$failingTestCaseNameSuffix-lib") - } else { - it - } - } - val mainName = ":testcase-$name-main".let { - if (failingTestCaseNameSuffix != null) { - it.replace("-main", "-$failingTestCaseNameSuffix-main") - } else { - it - } - } - - println("adding $libName, $mainName") - module(libName, "testcases/$name/lib") - module(mainName, "testcases/$name/main") -} - include(":common") -if (casesToRun.isDefault()) { - module(":testcase-template-lib", "testcases/template/lib") - module(":testcase-template-main", "testcases/template/main") - - module(":testcase-inheritance-composableInterface-lib", "testcases/inheritance/composableInterface/lib") - module(":testcase-inheritance-composableInterface-main", "testcases/inheritance/composableInterface/main") +module(":testcase-template-lib", "testcases/template/lib") +module(":testcase-template-main", "testcases/template/main") - module(":testcase-inheritance-funInterface-lib", "testcases/inheritance/funInterface/lib") - module(":testcase-inheritance-funInterface-main", "testcases/inheritance/funInterface/main") +module(":testcase-inheritance-composableInterface-lib", "testcases/inheritance/composableInterface/lib") +module(":testcase-inheritance-composableInterface-main", "testcases/inheritance/composableInterface/main") - module(":testcase-constructors-lib", "testcases/constructors/lib") - module(":testcase-constructors-main", "testcases/constructors/main") +module(":testcase-inheritance-funInterface-lib", "testcases/inheritance/funInterface/lib") +module(":testcase-inheritance-funInterface-main", "testcases/inheritance/funInterface/main") - module(":testcase-anonymousObjects-lib", "testcases/anonymousObjects/lib") - module(":testcase-anonymousObjects-main", "testcases/anonymousObjects/main") +module(":testcase-constructors-lib", "testcases/constructors/lib") +module(":testcase-constructors-main", "testcases/constructors/main") - module(":testcase-valueClass-lib", "testcases/valueClass/lib") - module(":testcase-valueClass-main", "testcases/valueClass/main") +module(":testcase-anonymousObjects-lib", "testcases/anonymousObjects/lib") +module(":testcase-anonymousObjects-main", "testcases/anonymousObjects/main") - module(":testcase-lambdas-lib", "testcases/lambdas/lib") - module(":testcase-lambdas-main", "testcases/lambdas/main") +module(":testcase-valueClass-lib", "testcases/valueClass/lib") +module(":testcase-valueClass-main", "testcases/valueClass/main") - module(":testcase-expectActual-lib", "testcases/expectActual/lib") - module(":testcase-expectActual-main", "testcases/expectActual/main") +module(":testcase-lambdas-lib", "testcases/lambdas/lib") +module(":testcase-lambdas-main", "testcases/lambdas/main") - module(":testcase-stability-lib", "testcases/stability/lib") - module(":testcase-stability-main", "testcases/stability/main") -} +module(":testcase-expectActual-lib", "testcases/expectActual/lib") +module(":testcase-expectActual-main", "testcases/expectActual/main") -/** - * Below we add modules for cases which are known to be failing at least on 1 platform. - * These cases should be fixed! - */ - -"rememberAnonymousObj".also { - addATestCase(name = it, failingTestCaseNameSuffix = getFailingSuffix(it)) -} +module(":testcase-stability-lib", "testcases/stability/lib") +module(":testcase-stability-main", "testcases/stability/main") diff --git a/compose/integrations/composable-test-cases/testcases/anonymousObjects/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/anonymousObjects/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/anonymousObjects/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/anonymousObjects/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/anonymousObjects/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/anonymousObjects/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/anonymousObjects/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/anonymousObjects/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/constructors/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/constructors/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/constructors/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/constructors/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/constructors/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/constructors/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/constructors/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/constructors/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts index cb16fe73d9..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { @@ -14,35 +15,5 @@ kotlin { val commonTest by getting { configureCommonTestDependencies() } - - val nativeMain by creating { - dependsOn(commonMain) - } - val iosMain by getting { - dependsOn(nativeMain) - } - val iosX64Main by getting { - dependsOn(iosMain) - } - val iosArm64Main by getting { - dependsOn(iosMain) - } - val iosSimulatorArm64Main by getting { - dependsOn(iosMain) - } - val linuxX64Main by getting { - dependsOn(nativeMain) - } - val macosX64Main by getting { - dependsOn(nativeMain) - } - val macosArm64Main by getting { - dependsOn(nativeMain) - } - if (project.isMingwX64Enabled) { - val mingwX64Main by getting { - dependsOn(nativeMain) - } - } } } diff --git a/compose/integrations/composable-test-cases/testcases/expectActual/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/expectActual/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/expectActual/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/expectActual/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/inheritance/composableInterface/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/inheritance/funInterface/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/lambdas/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/lambdas/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/lambdas/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/lambdas/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/lambdas/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/lambdas/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/lambdas/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/lambdas/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/rememberAnonymousObj/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/stability/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/stability/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/stability/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/stability/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/stability/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/stability/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/stability/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/stability/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/template/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/template/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/template/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/template/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/template/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/template/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/template/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/template/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/valueClass/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/valueClass/lib/build.gradle.kts index 9e92fd8d74..c3f7c16d23 100644 --- a/compose/integrations/composable-test-cases/testcases/valueClass/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/valueClass/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin { diff --git a/compose/integrations/composable-test-cases/testcases/valueClass/main/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/valueClass/main/build.gradle.kts index ae80949841..0aecbc86a5 100644 --- a/compose/integrations/composable-test-cases/testcases/valueClass/main/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/valueClass/main/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("multiplatform") + alias(libs.plugins.composeCompiler) } kotlin {