Fix `web` module after upgrading it to Kotlin 1.7.20

Also rename COMPOSE_CORE_VERSION and COMPOSE_WEB_VERSION to compose.version (as in the other places). It simplifies

Also add .idea to the global .gitignore

.gitignore

@@ -4,13 +4,7 @@ out
 *.iml
 .gradle
 /local.properties
-/.idea
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+.idea/
 .DS_Store
 build/
 /captures

tools/replace.sh

@@ -34,8 +34,6 @@ replaceCompose() {
 replaceComposeInFile() {
     echo "Replace in $1"
     replaceCompose '^compose.version=.*' 'compose.version='"$COMPOSE_VERSION"'' $1
-    replaceCompose '^COMPOSE_CORE_VERSION=.*' 'COMPOSE_CORE_VERSION='"$COMPOSE_VERSION"'' $1
-    replaceCompose '^COMPOSE_WEB_VERSION=.*' 'COMPOSE_WEB_VERSION='"$COMPOSE_VERSION"'' $1
     replaceCompose 'id("org.jetbrains.compose") version ".*"' 'id("org.jetbrains.compose") version "'"$COMPOSE_VERSION"'"' $1
     replaceCompose '"org.jetbrains.compose:compose-gradle-plugin:.*"' '"org.jetbrains.compose:compose-gradle-plugin:'"$COMPOSE_VERSION"'"' $1
 }

web/build.gradle.kts

@@ -2,13 +2,13 @@ import org.gradle.api.tasks.testing.AbstractTestTask
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.compose.gradle.kotlinKarmaConfig
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.targets
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets
 
 plugins {
     kotlin("multiplatform") apply false
 }
 
-val COMPOSE_WEB_VERSION: String by project
+val COMPOSE_WEB_VERSION: String = extra["compose.version"] as String
 val COMPOSE_REPO_USERNAME: String? by project
 val COMPOSE_REPO_KEY: String? by project
 val COMPOSE_WEB_BUILD_WITH_SAMPLES = project.property("compose.web.buildSamples")!!.toString().toBoolean()

web/buildSrc/gradle.properties

@@ -1,2 +1,2 @@
 # __KOTLIN_COMPOSE_VERSION__
-kotlin.version=1.6.10
+kotlin.version=1.7.20

web/compose-compiler-integration/README.md

@@ -2,7 +2,7 @@ RUN from project root directory:
 `./gradlew :compose-compiler-integration:checkComposeCases`
 
 To use specific version:
-`./gradlew :compose-compiler-integration:checkComposeCases -PCOMPOSE_CORE_VERSION=1.0.1-rc2 -PCOMPOSE_WEB_VERSION=1.0.1-rc2
+`./gradlew :compose-compiler-integration:checkComposeCases -Pcompose.version=1.2.0-beta03
 
 To fun only filtered cases (check for contained in file path):
 `./gradlew :compose-compiler-integration:checkComposeCases -PFILTER_CASES=CaseName`

web/compose-compiler-integration/build.gradle.kts

@@ -61,7 +61,7 @@ fun build(
 ) {
     val isWin = System.getProperty("os.name").startsWith("Win")
     val arguments = buildCmd.toMutableList().also {
-        it.add("-PCOMPOSE_CORE_VERSION=$composeVersion")
+        it.add("-Pcompose.version=$composeVersion")
         it.add("-Pkotlin.version=$kotlinVersion")
     }.toTypedArray()
 
@@ -176,7 +176,7 @@ fun runCasesInDirectory(
 tasks.register("checkComposeCases") {
     doLast {
         val filterCases = project.findProperty("FILTER_CASES")?.toString() ?: ""
-        val composeVersion = project.findProperty("COMPOSE_CORE_VERSION")?.toString() ?: "0.0.0-SNASPHOT"
+        val composeVersion = project.findProperty("compose.version")?.toString() ?: "0.0.0-SNASPHOT"
         val kotlinVersion = kotlin.coreLibrariesVersion
 
         val expectedFailingCasesDir = File("${projectDir.absolutePath}/testcases/failing")

web/compose-compiler-integration/main-template/settings.gradle.kts

@@ -12,8 +12,8 @@ pluginManagement {
         println("KotlinVersion=[$kotlinVersion]")
         eachPlugin {
             if (requested.id.id == "org.jetbrains.compose") {
-                val useVersion = if (extra.has("COMPOSE_CORE_VERSION")) {
-                    extra["COMPOSE_CORE_VERSION"].toString()
+                val useVersion = if (extra.has("compose.version")) {
+                    extra["compose.version"].toString()
                 } else {
                     "0.0.0-SNASPHOT"
                 }

web/gradle.properties

@@ -1,5 +1,4 @@
-COMPOSE_CORE_VERSION=1.1.0
-COMPOSE_WEB_VERSION=1.1.0
+compose.version=1.2.0-beta03
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false

web/settings.gradle.kts

@@ -1,5 +1,5 @@
 pluginManagement {
-    val COMPOSE_CORE_VERSION: String by settings
+    val COMPOSE_CORE_VERSION = extra["compose.version"] as String
     println("[build] compose core version: $COMPOSE_CORE_VERSION")
 
     // pluginManagement section won't see outer scope, hence the FQ names