Merge pull request #287 from thisisthepy/feat/compose-plugin-ext3

Build: bump org.thisisthepy.compose plugin to 1.11.1-ext.3

Author: b-re-w

.github/workflows/stubs.yml

@@ -2,7 +2,7 @@ name: Kotlin-name stubs
 
 # Issue #32: pythonx-compose consumes the binder's Kotlin-name `.pyi` stubs for the real Compose jars
 # but cannot run this repository's Gradle build. This job runs the stub task over the Compose version the
-# build resolves (`compose-plugin` in gradle/libs.versions.toml) and publishes the result.
+# build resolves (`compose-libraries` in gradle/libs.versions.toml) and publishes the result.
 #
 #   - every push to develop and every pull request: the stubs are generated, type-checked against
 #     .github/scripts/stubs/consumer.py with mypy (issue #31), and uploaded as the workflow artifact `kotlin-stubs`;
@@ -54,7 +54,7 @@ jobs:
       - name: Assemble the artifact
         run: |
           set -euo pipefail
-          compose_version="$(sed -nE 's/^compose-plugin = "([^"]+)".*/\1/p' gradle/libs.versions.toml)"
+          compose_version="$(sed -nE 's/^compose-libraries = "([^"]+)".*/\1/p' gradle/libs.versions.toml)"
           test -n "$compose_version"
           out=build/kotlin-stubs
           rm -rf "$out"

gradle.properties

@@ -21,7 +21,7 @@ kotlin.native.binary.sourceInfoType=libbacktrace
 #Compose
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.uikit.enabled=true
-# org.thisisthepy.compose:compose-gradle-plugin:1.11.1-ext.2's Maven Central POM marks
+# org.thisisthepy.compose:compose-gradle-plugin:1.11.1-ext.3's Maven Central POM marks
 # hot-reload-gradle-plugin as optional (shadow configuration), so Gradle does not place it on the
 # plugin classpath unless disabled or declared separately.
 org.jetbrains.compose.hot.reload.disable=true

gradle/libs.versions.toml

@@ -10,7 +10,8 @@ androidx-core-ktx = "1.13.1"
 androidx-espresso-core = "3.6.1"
 androidx-material = "1.12.0"
 androidx-test-junit = "1.2.1"
-compose-plugin = "1.11.1-ext.2"
+compose-plugin = "1.11.1-ext.3"
+compose-libraries = "1.11.1-ext.2"
 # JetBrains stopped publishing material-icons with Compose after 1.7.3 (Maven Central: newest is 1.7.3);
 # it is the version Compose Multiplatform 1.11.x points to, resolved against 1.11.1's ui/ui-graphics.
 compose-material-icons = "1.7.3"
@@ -33,8 +34,8 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-androidx-lifecycle-viewmodel = { group = "org.thisisthepy.compose.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "compose-plugin" }
-androidx-lifecycle-runtime-compose = { group = "org.thisisthepy.compose.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "compose-plugin" }
+androidx-lifecycle-viewmodel = { group = "org.thisisthepy.compose.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "compose-libraries" }
+androidx-lifecycle-runtime-compose = { group = "org.thisisthepy.compose.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "compose-libraries" }
 kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 kotlinx-browser = { group = "org.jetbrains.kotlinx", name = "kotlinx-browser", version.ref = "kotlinx-browser" }
 

python-multiplatform-gradle-plugin/fixtures/artifact/build.gradle.kts

@@ -60,9 +60,9 @@ kotlin {
                 // `Composer` anywhere. Composables are a different problem
                 // (`docs/archive/pythonx-adapter-design.md` §5) and are not touched here.
                 //
-                // Version pinned to the catalog's `compose-plugin`, which is what the rest of this
+                // Version pinned to the catalog's `compose-libraries`, which is what the rest of this
                 // build resolves, so no second Compose version enters the cache.
-                val composeVersion = libs.versions.compose.plugin.get()
+                val composeVersion = libs.versions.compose.libraries.get()
                 implementation("org.thisisthepy.compose.ui:ui-desktop:$composeVersion")
                 implementation("org.thisisthepy.compose.ui:ui-unit-desktop:$composeVersion")
                 implementation("org.thisisthepy.compose.foundation:foundation-layout-desktop:$composeVersion")