Replace Compose version

2 years ago · 23c1b39e92
33 changed files with 197 additions and 148 deletions
--- a/examples/codeviewer/build.gradle.kts
+++ b/examples/codeviewer/build.gradle.kts
@ -1,20 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
-        classpath("com.android.tools.build:gradle:4.2.2")
-         // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.31"))
-    }
-}
-
 allprojects {
    repositories {
        google()
--- a/examples/codeviewer/settings.gradle.kts
+++ b/examples/codeviewer/settings.gradle.kts
@ -1 +1,22 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        google()
+    }
+
+    plugins {
+        val kotlinVersion = extra["kotlin.version"] as String
+        val agpVersion = extra["agp.version"] as String
+        val composeVersion = extra["compose.version"] as String
+
+        kotlin("jvm").version(kotlinVersion)
+        kotlin("multiplatform").version(kotlinVersion)
+        kotlin("android").version(kotlinVersion)
+        id("com.android.application").version(agpVersion)
+        id("com.android.library").version(agpVersion)
+        id("org.jetbrains.compose").version(composeVersion)
+    }
+}
+
 include(":common", ":android", ":desktop")
--- a/examples/falling-balls-web/build.gradle.kts
+++ b/examples/falling-balls-web/build.gradle.kts
@ -3,8 +3,8 @@ import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat

 plugins {
-    kotlin("multiplatform") version "1.5.31"
-    id("org.jetbrains.compose") version "1.0.0"
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
 }

 version = "1.0-SNAPSHOT"
--- a/examples/falling-balls-web/settings.gradle.kts
+++ b/examples/falling-balls-web/settings.gradle.kts
@ -2,10 +2,14 @@ pluginManagement {
    repositories {
        gradlePluginPortal()
        mavenCentral()
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
-        google()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
    }

+    plugins {
+        kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
+    }
 }
+
 rootProject.name = "falling_balls_with_web"

--- a/examples/falling-balls/build.gradle.kts
+++ b/examples/falling-balls/build.gradle.kts
@ -3,10 +3,8 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
-    // __KOTLIN_COMPOSE_VERSION__
-    kotlin("jvm") version "1.5.31"
-    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version "1.0.0"
+    kotlin("jvm")
+    id("org.jetbrains.compose")
 }

 group = "me.user"
--- a/examples/falling-balls/settings.gradle.kts
+++ b/examples/falling-balls/settings.gradle.kts
@ -1 +1,8 @@
+pluginManagement {
+    plugins {
+        kotlin("jvm").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
+    }
+}
+
 rootProject.name = "falling_balls"
--- a/examples/imageviewer/build.gradle.kts
+++ b/examples/imageviewer/build.gradle.kts
@ -1,18 +1,3 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
-        classpath("com.android.tools.build:gradle:4.1.0")
-        classpath(kotlin("gradle-plugin", version = "1.5.31"))
-    }
-}
-
 allprojects {
    repositories {
        google()
--- a/examples/imageviewer/settings.gradle.kts
+++ b/examples/imageviewer/settings.gradle.kts
@ -1 +1,22 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        google()
+    }
+
+    plugins {
+        val kotlinVersion = extra["kotlin.version"] as String
+        val agpVersion = extra["agp.version"] as String
+        val composeVersion = extra["compose.version"] as String
+
+        kotlin("jvm").version(kotlinVersion)
+        kotlin("multiplatform").version(kotlinVersion)
+        kotlin("android").version(kotlinVersion)
+        id("com.android.application").version(agpVersion)
+        id("com.android.library").version(agpVersion)
+        id("org.jetbrains.compose").version(composeVersion)
+    }
+}
+
 include(":common", ":android", ":desktop")
--- a/examples/intellij-plugin/build.gradle.kts
+++ b/examples/intellij-plugin/build.gradle.kts
@ -3,9 +3,8 @@ import org.jetbrains.compose.compose
 plugins {
    id("org.jetbrains.intellij") version "1.1.4"
    java
-    kotlin("jvm") version "1.5.31"
-    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version "1.0.0"
+    kotlin("jvm")
+    id("org.jetbrains.compose")
    id("idea")
 }

--- a/examples/intellij-plugin/settings.gradle.kts
+++ b/examples/intellij-plugin/settings.gradle.kts
@ -1,9 +1,8 @@
 rootProject.name = "ComposeDemoPlugin"

 pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        mavenCentral()
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
+    plugins {
+        kotlin("jvm").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
    }
-}
+}
--- a/examples/issues/build.gradle.kts
+++ b/examples/issues/build.gradle.kts
@ -1,20 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
-        classpath("com.android.tools.build:gradle:4.1.3")
-        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.31"))
-    }
-}
-
 allprojects {
    repositories {
        mavenLocal()
--- a/examples/issues/settings.gradle.kts
+++ b/examples/issues/settings.gradle.kts
@ -1 +1,22 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        google()
+    }
+
+    plugins {
+        val kotlinVersion = extra["kotlin.version"] as String
+        val agpVersion = extra["agp.version"] as String
+        val composeVersion = extra["compose.version"] as String
+
+        kotlin("jvm").version(kotlinVersion)
+        kotlin("multiplatform").version(kotlinVersion)
+        kotlin("android").version(kotlinVersion)
+        id("com.android.application").version(agpVersion)
+        id("com.android.library").version(agpVersion)
+        id("org.jetbrains.compose").version(composeVersion)
+    }
+}
+
 include(":common", ":android", ":desktop")
--- a/examples/notepad/build.gradle.kts
+++ b/examples/notepad/build.gradle.kts
@ -2,10 +2,8 @@ import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat

 plugins {
-    // __KOTLIN_COMPOSE_VERSION__
-    kotlin("jvm") version "1.5.31"
-    // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version ("1.0.0")
+    kotlin("jvm")
+    id("org.jetbrains.compose")
 }

 repositories {
--- a/examples/notepad/settings.gradle.kts
+++ b/examples/notepad/settings.gradle.kts
@ -3,4 +3,9 @@ pluginManagement {
        gradlePluginPortal()
        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
    }
-}
+
+    plugins {
+        kotlin("jvm").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
+    }
+}
--- a/examples/todoapp-lite/build.gradle.kts
+++ b/examples/todoapp-lite/build.gradle.kts
@ -1,18 +1,3 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
-        classpath("com.android.tools.build:gradle:4.1.0")
-        classpath(kotlin("gradle-plugin", version = "1.5.31"))
-    }
-}
-
 allprojects {
    repositories {
        google()
--- a/examples/todoapp-lite/settings.gradle.kts
+++ b/examples/todoapp-lite/settings.gradle.kts
@ -1 +1,22 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        google()
+    }
+
+    plugins {
+        val kotlinVersion = extra["kotlin.version"] as String
+        val agpVersion = extra["agp.version"] as String
+        val composeVersion = extra["compose.version"] as String
+
+        kotlin("jvm").version(kotlinVersion)
+        kotlin("multiplatform").version(kotlinVersion)
+        kotlin("android").version(kotlinVersion)
+        id("com.android.application").version(agpVersion)
+        id("com.android.library").version(agpVersion)
+        id("org.jetbrains.compose").version(composeVersion)
+    }
+}
+
 include(":common", ":android", ":desktop")
--- a/examples/todoapp/buildSrc/build.gradle.kts
+++ b/examples/todoapp/buildSrc/build.gradle.kts
@ -10,8 +10,8 @@ repositories {
 }

 dependencies {
-    implementation(Deps.JetBrains.Compose.gradlePlugin)
-    implementation(Deps.JetBrains.Kotlin.gradlePlugin)
+    implementation(Deps.JetBrains.Compose(project).gradlePlugin)
+    implementation(Deps.JetBrains.Kotlin(project).gradlePlugin)
    implementation(Deps.Android.Tools.Build.gradlePlugin)
    implementation(Deps.Squareup.SQLDelight.gradlePlugin)
 }
--- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
+++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
@ -1,20 +1,23 @@
-object Deps {

+// We store Kotlin and Compose versions in gradle.properties to 
+// be able to override them on CI.
+// You probably won't need this, so you can get rid of `project` in this file.
+import org.gradle.api.Project
+
+object Deps {
    object JetBrains {
-        object Kotlin {
-            // __KOTLIN_COMPOSE_VERSION__
-            private const val VERSION = "1.5.31"
-            const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VERSION"
-            const val testCommon = "org.jetbrains.kotlin:kotlin-test-common:$VERSION"
-            const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:$VERSION"
-            const val testJs = "org.jetbrains.kotlin:kotlin-test-js:$VERSION"
-            const val testAnnotationsCommon = "org.jetbrains.kotlin:kotlin-test-annotations-common:$VERSION"
+        class Kotlin(private val project: Project) {
+            private val VERSION = project.properties["kotlin.version"]
+            val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VERSION"
+            val testCommon = "org.jetbrains.kotlin:kotlin-test-common:$VERSION"
+            val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:$VERSION"
+            val testJs = "org.jetbrains.kotlin:kotlin-test-js:$VERSION"
+            val testAnnotationsCommon = "org.jetbrains.kotlin:kotlin-test-annotations-common:$VERSION"
        }

-        object Compose {
-            // __LATEST_COMPOSE_RELEASE_VERSION__
-            private const val VERSION = "1.0.0"
-            const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
+        class Compose(private val project: Project) {
+            private val VERSION = project.properties["compose.version"]
+            val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
        }
    }

--- a/examples/todoapp/buildSrc/gradle.properties
+++ b/examples/todoapp/buildSrc/gradle.properties
@ -0,0 +1,2 @@
+kotlin.version=1.5.31
+compose.version=1.0.0
--- a/examples/todoapp/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
+++ b/examples/todoapp/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
@ -15,24 +15,24 @@ kotlin {
    sourceSets {
        named("commonTest") {
            dependencies {
-                implementation(Deps.JetBrains.Kotlin.testCommon)
-                implementation(Deps.JetBrains.Kotlin.testAnnotationsCommon)
+                implementation(Deps.JetBrains.Kotlin(project).testCommon)
+                implementation(Deps.JetBrains.Kotlin(project).testAnnotationsCommon)
            }
        }

        named("androidTest") {
            dependencies {
-                implementation(Deps.JetBrains.Kotlin.testJunit)
+                implementation(Deps.JetBrains.Kotlin(project).testJunit)
            }
        }
        named("desktopTest") {
            dependencies {
-                implementation(Deps.JetBrains.Kotlin.testJunit)
+                implementation(Deps.JetBrains.Kotlin(project).testJunit)
            }
        }
        named("jsTest") {
            dependencies {
-                implementation(Deps.JetBrains.Kotlin.testJs)
+                implementation(Deps.JetBrains.Kotlin(project).testJs)
            }
        }
    }
--- a/examples/todoapp/gradle.properties
+++ b/examples/todoapp/gradle.properties
@ -22,6 +22,3 @@ kotlin.code.style=official
 org.gradle.parallel=true
 org.gradle.caching=true
 kotlin.native.disableCompilerDaemon=true
-
-kotlin.version=1.5.31
-compose.version=1.0.0
--- a/examples/web-compose-bird/build.gradle.kts
+++ b/examples/web-compose-bird/build.gradle.kts
@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension

 plugins {
-    kotlin("multiplatform") version "1.5.31"
-    id("org.jetbrains.compose") version "1.0.0"
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
 }
 group = "com.theapache64.composebird"
 version = "1.0.0-alpha01"
--- a/examples/web-compose-bird/settings.gradle.kts
+++ b/examples/web-compose-bird/settings.gradle.kts
@ -1,9 +1,15 @@
 pluginManagement {
    repositories {
        gradlePluginPortal()
+        mavenCentral()
        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        google()
+    }
+
+    plugins {
+        kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
    }
 }
+
 rootProject.name = "web-compose-bird"

--- a/examples/web-landing/build.gradle.kts
+++ b/examples/web-landing/build.gradle.kts
@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension

 plugins {
-    kotlin("multiplatform") version "1.5.31"
-    id("org.jetbrains.compose") version "1.0.0"
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
 }

 repositories {
--- a/examples/web-landing/settings.gradle.kts
+++ b/examples/web-landing/settings.gradle.kts
@ -2,10 +2,14 @@ pluginManagement {
    repositories {
        gradlePluginPortal()
        mavenCentral()
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
-        google()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
    }

+    plugins {
+        kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
+    }
 }
+
 rootProject.name = "compose-web-lp"

--- a/examples/web-with-react/build.gradle.kts
+++ b/examples/web-with-react/build.gradle.kts
@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 plugins {
-	kotlin("multiplatform") version "1.5.31"
-	id("org.jetbrains.compose") version "1.0.0"
+	kotlin("multiplatform")
+	id("org.jetbrains.compose")
 }

 repositories {
--- a/examples/web-with-react/settings.gradle.kts
+++ b/examples/web-with-react/settings.gradle.kts
@ -1,8 +1,13 @@
 pluginManagement {
    repositories {
        gradlePluginPortal()
+        mavenCentral()
        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        google()
+    }
+
+    plugins {
+        kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.compose").version(extra["compose.version"] as String)
    }
 }

--- a/examples/widgets-gallery/build.gradle.kts
+++ b/examples/widgets-gallery/build.gradle.kts
@ -1,20 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
-    dependencies {
-        // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
-        classpath("com.android.tools.build:gradle:4.2.0")
-        // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.31"))
-    }
-}
-
 allprojects {
    repositories {
        google()
--- a/examples/widgets-gallery/settings.gradle.kts
+++ b/examples/widgets-gallery/settings.gradle.kts
@ -1 +1,22 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        google()
+    }
+
+    plugins {
+        val kotlinVersion = extra["kotlin.version"] as String
+        val agpVersion = extra["agp.version"] as String
+        val composeVersion = extra["compose.version"] as String
+
+        kotlin("jvm").version(kotlinVersion)
+        kotlin("multiplatform").version(kotlinVersion)
+        kotlin("android").version(kotlinVersion)
+        id("com.android.application").version(agpVersion)
+        id("com.android.library").version(agpVersion)
+        id("org.jetbrains.compose").version(composeVersion)
+    }
+}
+
 include(":common", ":android", ":desktop")
--- a/experimental/build_from_cli/build_and_run_from_cli_example.sh
+++ b/experimental/build_from_cli/build_and_run_from_cli_example.sh
@ -20,9 +20,7 @@ function mavenDep {

 PLATFORM=macos-x64
 SKIKO_VERSION=0.2.33
-# __KOTLIN_COMPOSE_VERSION__
 KOTLIN_VERSION=1.5.0
-# __LATEST_COMPOSE_RELEASE_VERSION__
 COMPOSE_VERSION=0.4.0-build209
 COROUTINES_VERSION=1.3.6
 COLLECTIONS_VERSION=0.3
--- a/templates/desktop-template/settings.gradle.kts
+++ b/templates/desktop-template/settings.gradle.kts
@ -1,9 +1,4 @@
 pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-
    plugins {
        kotlin("jvm").version(extra["kotlin.version"] as String)
        id("org.jetbrains.compose").version(extra["compose.version"] as String)
--- a/templates/multiplatform-template/settings.gradle.kts
+++ b/templates/multiplatform-template/settings.gradle.kts
@ -6,12 +6,16 @@ pluginManagement {
    }

    plugins {
-        kotlin("jvm").version(extra["kotlin.version"] as String)
-        kotlin("multiplatform").version(extra["kotlin.version"] as String)
-        kotlin("android").version(extra["kotlin.version"] as String)
-        id("com.android.application").version(extra["agp.version"] as String)
-        id("com.android.library").version(extra["agp.version"] as String)
-        id("org.jetbrains.compose").version(extra["compose.version"] as String)
+        val kotlinVersion = extra["kotlin.version"] as String
+        val agpVersion = extra["agp.version"] as String
+        val composeVersion = extra["compose.version"] as String
+
+        kotlin("jvm").version(kotlinVersion)
+        kotlin("multiplatform").version(kotlinVersion)
+        kotlin("android").version(kotlinVersion)
+        id("com.android.application").version(agpVersion)
+        id("com.android.library").version(agpVersion)
+        id("org.jetbrains.compose").version(composeVersion)
    }
 }

--- a/templates/web-template/settings.gradle.kts
+++ b/templates/web-template/settings.gradle.kts
@ -1,6 +1,7 @@
 pluginManagement {
    repositories {
        gradlePluginPortal()
+        mavenCentral()
        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
    }