Merge branch 'annexflow-core-repackage' into annexflow-repackage

# Conflicts:
#	gradle.properties

README.md

@@ -72,8 +72,12 @@ You'll note that I have kept the package name the same as that in AndroidX. This
 val commonMain by getting {
     dependencies {
         implementation("tech.annexflow.compose:constraintlayout-compose-multiplatform:0.4.0")
-        /// Compose 1.7.0-alpha01
-        implementation("tech.annexflow.compose:constraintlayout-compose-multiplatform:0.5.0-alpha01")
+        /// Compose 1.7.0-alpha03
+        implementation("tech.annexflow.compose:constraintlayout-compose-multiplatform:0.5.0-alpha03")
+        /// Compose 1.7.0-alpha03 with different tech.annexflow.constraintlayout.core package
+        implementation("tech.annexflow.compose:constraintlayout-compose-multiplatform:0.5.0-alpha03-shaded-core")
+        /// Compose 1.7.0-alpha03 with different tech.annexflow.constraintlayout package
+        implementation("tech.annexflow.compose:constraintlayout-compose-multiplatform:0.5.0-alpha03-shaded")
     }
 }
 ```

compose/build.gradle.kts

@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 // Copyright 2023, Sergei Gagarin and the project contributors
 // SPDX-License-Identifier: Apache-2.0

gradle.properties

@@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\=
 
 #Kotlin
 kotlin.code.style=official
-kotlin.js.compiler=ir
 
 #Compose
 org.jetbrains.compose.experimental.uikit.enabled=true
@@ -27,7 +26,7 @@ SONATYPE_CONNECT_TIMEOUT_SECONDS=600
 SONATYPE_CLOSE_TIMEOUT_SECONDS=1800
 
 GROUP=tech.annexflow.compose
-VERSION_NAME=0.5.0-alpha03-shaded
+VERSION_NAME=0.5.0-shaded
 
 POM_URL=https://github.com/lavmee/constraintlayout-compose-multiplatform/
 POM_SCM_URL=https://github.com/lavmee/constraintlayout-compose-multiplatform/

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 
 androidx-appcompat = "1.7.0"
-androidx-activityCompose = "1.9.1"
-annotation = "1.8.0-alpha01"
-compose = "1.7.0-alpha03"
-kotlin = "2.0.0"
-agp = "8.3.2"
-maven-publish = "0.29.0"
+androidx-activityCompose = "1.9.3"
+annotation = "1.9.0"
+compose = "1.7.0"
+kotlin = "2.0.21"
+agp = "8.5.2"
+maven-publish = "0.30.0"
 spotless = "6.25.0"
 
 [libraries]

sample/shared/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     alias(libs.plugins.multiplatform)