Compose 1.2.2

JetBrains · Dec 14, 2022 · 1bfe42e · 1bfe42e
1 parent e5a41fc
commit 1bfe42e
Show file tree

Hide file tree

Showing 25 changed files with 64 additions and 25 deletions.
diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties
@@ -1,2 +1,2 @@
-compose.version=1.2.2-rc01
+compose.version=1.2.2
 kotlin.code.style=official
diff --git a/components/gradle.properties b/components/gradle.properties
@@ -5,4 +5,4 @@ kotlin.code.style=official
 # __KOTLIN_COMPOSE_VERSION__
 kotlin.version=1.7.20
 # __LATEST_COMPOSE_RELEASE_VERSION__
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties
@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties
@@ -21,4 +21,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties
@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties
@@ -28,4 +28,4 @@ kotlin.native.disableCompilerDaemon=true
 # in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340")
 #TODO also change version in buildSrc/gradle.properties
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/web-compose-in-js/gradle.properties b/examples/web-compose-in-js/gradle.properties
@@ -3,4 +3,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.js.webpack.major.version=4
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties
@@ -20,5 +20,5 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
 agp.version=7.1.3
diff --git a/experimental/examples/codeviewer/shared/shared.podspec b/experimental/examples/codeviewer/shared/shared.podspec
@@ -0,0 +1,39 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'shared'
+    spec.version                  = '1.0-SNAPSHOT'
+    spec.homepage                 = 'https://github.com/JetBrains/compose-jb'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Shared code for the sample'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+    spec.ios.deployment_target = '14.1'
+
+
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => ':shared',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+
+    spec.script_phases = [
+        {
+            :name => 'Build shared',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+    spec.resources = ['src/commonMain/resources/**', 'src/iosMain/resources/**']
+end
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt
@@ -6,7 +6,7 @@ private const val KOTLIN_COMPATABILITY_LINK =
 internal object ComposeCompilerCompatability {
     private val kotlinToCompiler = sortedMapOf(
         "1.7.10" to "1.3.0",
-        "1.7.20" to "1.3.2.2-beta01",
+        "1.7.20" to "1.3.2.2",
     )
 
     fun compilerVersionFor(kotlinVersion: String): String {

diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 # Default version of Compose Libraries used by Gradle plugin
-compose.version=1.2.2-rc01
+compose.version=1.2.2
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
 compose.tests.compiler.version=1.3.2.1
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.

diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties
@@ -4,4 +4,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 kotlin.version=1.7.20
 agp.version=7.1.3
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
 kotlin.version=1.7.20
-compose.version=1.2.2-rc01
+compose.version=1.2.2
diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md
@@ -45,7 +45,7 @@ For the latest versions, see the [latest versions](https://github.com/JetBrains/
 ```
 plugins {
     kotlin("jvm") version "1.7.20"
-    id("org.jetbrains.compose") version "1.2.2-rc01"
+    id("org.jetbrains.compose") version "1.2.2"
 }
 ```
 
@@ -79,7 +79,7 @@ Then create `build.gradle.kts` with the following content:
 ``` kotlin
 plugins {
     kotlin("jvm") version "1.7.20"
-    id("org.jetbrains.compose") version "1.2.2-rc01"
+    id("org.jetbrains.compose") version "1.2.2"
 }
 
 repositories {

diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md
@@ -39,7 +39,7 @@ pluginManagement {
 // Add compose gradle plugin
 plugins {
     kotlin("multiplatform") version "1.7.20"
-    id("org.jetbrains.compose") version "1.2.2-rc01"
+    id("org.jetbrains.compose") version "1.2.2"
 }
 
 // Add maven repositories

diff --git a/web/gradle.properties b/web/gradle.properties
@@ -1,4 +1,4 @@
-compose.version=1.2.2-rc01
+compose.version=1.2.2
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false