Skip to content

Commit dbd0a21

Browse files
igordmnigordmn
authored
Modify replace.sh for replacing Compose version (JetBrains#1511)
Remove: ``` __LATEST_COMPOSE_RELEASE_VERSION__ __KOTLIN_COMPOSE_VERSION__ System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ``` They pollute templates/examples. Now, all paths where we need to change the version are hardcoded in the script. Usage: ``` ./replace.sh 1.0.0-rc6 ``` This script is planned to run on CI In the future I will add support for changing Kotlin version
1 parent 046f225 commit dbd0a21

File tree

74 files changed

+371
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+371
-245
lines changed

‎benchmarks/build.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ import kotlinx.benchmark.gradle.*
33
import org.jetbrains.kotlin.allopen.gradle.*
44

55
plugins {
6-
// __KOTLIN_COMPOSE_VERSION__
76
kotlin("jvm") version "1.4.20"
8-
// __LATEST_COMPOSE_RELEASE_VERSION__
97
id("org.jetbrains.compose") version "0.2.0-build132"
10-
// __KOTLIN_COMPOSE_VERSION__
118
kotlin("plugin.allopen") version "1.4.20"
129
id("kotlinx.benchmark") version "0.3.0"
1310
}

‎ci/compose-uber-jar/gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
# __LATEST_COMPOSE_RELEASE_VERSION__
21
compose.version=1.0.0
32
kotlin.code.style=official

‎components/build.gradle.kts

-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
buildscript {
2-
val composeVersion = property("compose.version")
3-
4-
repositories {
5-
google()
6-
mavenCentral()
7-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
8-
}
9-
10-
dependencies {
11-
classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
12-
// __KOTLIN_COMPOSE_VERSION__
13-
classpath(kotlin("gradle-plugin", version = "1.5.31"))
14-
}
15-
}
16-
171
subprojects {
182
version = findProperty("deploy.version") ?: property("compose.version")!!
193

‎components/gradle.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
22
android.useAndroidX=true
33
android.enableJetifier=true
44
kotlin.code.style=official
5-
6-
# __LATEST_COMPOSE_RELEASE_VERSION__
7-
compose.version=1.0.0
5+
kotlin.version=1.5.31
6+
compose.version=1.0.0

‎components/settings.gradle.kts

+14
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
5+
google()
6+
}
7+
8+
plugins {
9+
kotlin("jvm").version(extra["kotlin.version"] as String)
10+
kotlin("multiplatform").version(extra["kotlin.version"] as String)
11+
id("org.jetbrains.compose").version(extra["compose.version"] as String)
12+
}
13+
}
14+
115
include(":SplitPane:library")
216
include(":SplitPane:demo")

‎examples/codeviewer/build.gradle.kts

-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
buildscript {
2-
repositories {
3-
mavenLocal()
4-
google()
5-
mavenCentral()
6-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
7-
}
8-
9-
dependencies {
10-
// __LATEST_COMPOSE_RELEASE_VERSION__
11-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
12-
classpath("com.android.tools.build:gradle:4.2.2")
13-
// __KOTLIN_COMPOSE_VERSION__
14-
classpath(kotlin("gradle-plugin", version = "1.5.31"))
15-
}
16-
}
17-
181
allprojects {
192
repositories {
203
google()

‎examples/codeviewer/gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
21-
kotlin.code.style=official
21+
kotlin.code.style=official
22+
kotlin.version=1.5.31
23+
agp.version=4.2.2
24+
compose.version=1.0.0

‎examples/codeviewer/settings.gradle.kts

+21
Original file line numberDiff line numberDiff line change
@@ -1 +1,22 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
5+
google()
6+
}
7+
8+
plugins {
9+
val kotlinVersion = extra["kotlin.version"] as String
10+
val agpVersion = extra["agp.version"] as String
11+
val composeVersion = extra["compose.version"] as String
12+
13+
kotlin("jvm").version(kotlinVersion)
14+
kotlin("multiplatform").version(kotlinVersion)
15+
kotlin("android").version(kotlinVersion)
16+
id("com.android.application").version(agpVersion)
17+
id("com.android.library").version(agpVersion)
18+
id("org.jetbrains.compose").version(composeVersion)
19+
}
20+
}
21+
122
include(":common", ":android", ":desktop")

‎examples/falling-balls-web/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import org.jetbrains.compose.compose
33
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
44

55
plugins {
6-
kotlin("multiplatform") version "1.5.31"
7-
id("org.jetbrains.compose") version "1.0.0"
6+
kotlin("multiplatform")
7+
id("org.jetbrains.compose")
88
}
99

1010
version = "1.0-SNAPSHOT"

‎examples/falling-balls-web/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
kotlin.version=1.5.31
2+
compose.version=1.0.0

‎examples/falling-balls-web/settings.gradle.kts

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ pluginManagement {
22
repositories {
33
gradlePluginPortal()
44
mavenCentral()
5-
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
6-
google()
5+
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
76
}
87

8+
plugins {
9+
kotlin("multiplatform").version(extra["kotlin.version"] as String)
10+
id("org.jetbrains.compose").version(extra["compose.version"] as String)
11+
}
912
}
13+
1014
rootProject.name = "falling_balls_with_web"
1115

‎examples/falling-balls-web/src/jvmMain/kotlin/App.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package org.jetbrains.compose.common.demo
22

3-
import androidx.compose.desktop.Window
4-
import androidx.compose.ui.unit.IntSize
5-
import org.jetbrains.compose.demo.falling.views.fallingBalls
6-
import org.jetbrains.compose.demo.falling.Game
73
import androidx.compose.runtime.remember
4+
import androidx.compose.ui.window.singleWindowApplication
5+
import org.jetbrains.compose.demo.falling.Game
6+
import org.jetbrains.compose.demo.falling.views.fallingBalls
87

98
class JvmGame : Game() {
109
override fun now() = System.nanoTime()
1110
}
1211

1312
fun main() {
14-
Window(title = "Demo", size = IntSize(600, 400)) {
13+
singleWindowApplication(title = "Demo") {
1514
fallingBalls(
1615
remember {
1716
JvmGame().apply {

‎examples/falling-balls-web/src/jvmMain/kotlin/modifiers/position.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package org.jetbrains.compose.common.demo
22

33
import androidx.compose.runtime.Composable
44
import org.jetbrains.compose.common.ui.Modifier
5-
import org.jetbrains.compose.common.foundation.layout.offset
65
import org.jetbrains.compose.common.ui.unit.Dp
76
import org.jetbrains.compose.common.internal.castOrCreate
87
import org.jetbrains.compose.common.ui.unit.implementation
98
import androidx.compose.foundation.layout.offset
9+
import org.jetbrains.compose.common.ui.ExperimentalComposeWebWidgetsApi
1010

1111
@Composable
1212
@OptIn(ExperimentalComposeWebWidgetsApi::class)

‎examples/falling-balls/build.gradle.kts

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
33
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
44

55
plugins {
6-
// __KOTLIN_COMPOSE_VERSION__
7-
kotlin("jvm") version "1.5.31"
8-
// __LATEST_COMPOSE_RELEASE_VERSION__
9-
id("org.jetbrains.compose") version "1.0.0"
6+
kotlin("jvm")
7+
id("org.jetbrains.compose")
108
}
119

1210
group = "me.user"

‎examples/falling-balls/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
kotlin.code.style=official
2+
kotlin.version=1.5.31
3+
compose.version=1.0.0

‎examples/falling-balls/settings.gradle.kts

+7
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1+
pluginManagement {
2+
plugins {
3+
kotlin("jvm").version(extra["kotlin.version"] as String)
4+
id("org.jetbrains.compose").version(extra["compose.version"] as String)
5+
}
6+
}
7+
18
rootProject.name = "falling_balls"

‎examples/imageviewer/build.gradle.kts

-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
6-
}
7-
8-
dependencies {
9-
// __LATEST_COMPOSE_RELEASE_VERSION__
10-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
11-
classpath("com.android.tools.build:gradle:4.1.0")
12-
classpath(kotlin("gradle-plugin", version = "1.5.31"))
13-
}
14-
}
15-
161
allprojects {
172
repositories {
183
google()

‎examples/imageviewer/gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
21-
kotlin.code.style=official
21+
kotlin.code.style=official
22+
kotlin.version=1.5.31
23+
agp.version=4.2.2
24+
compose.version=1.0.0

‎examples/imageviewer/settings.gradle.kts

+21
Original file line numberDiff line numberDiff line change
@@ -1 +1,22 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
5+
google()
6+
}
7+
8+
plugins {
9+
val kotlinVersion = extra["kotlin.version"] as String
10+
val agpVersion = extra["agp.version"] as String
11+
val composeVersion = extra["compose.version"] as String
12+
13+
kotlin("jvm").version(kotlinVersion)
14+
kotlin("multiplatform").version(kotlinVersion)
15+
kotlin("android").version(kotlinVersion)
16+
id("com.android.application").version(agpVersion)
17+
id("com.android.library").version(agpVersion)
18+
id("org.jetbrains.compose").version(composeVersion)
19+
}
20+
}
21+
122
include(":common", ":android", ":desktop")

‎examples/intellij-plugin/build.gradle.kts

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import org.jetbrains.compose.compose
33
plugins {
44
id("org.jetbrains.intellij") version "1.1.4"
55
java
6-
kotlin("jvm") version "1.5.31"
7-
// __LATEST_COMPOSE_RELEASE_VERSION__
8-
id("org.jetbrains.compose") version "1.0.0"
6+
kotlin("jvm")
7+
id("org.jetbrains.compose")
98
id("idea")
109
}
1110

‎examples/intellij-plugin/gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
kotlin.code.style=official
1+
kotlin.code.style=official
2+
kotlin.version=1.5.31
3+
compose.version=1.0.0

‎examples/intellij-plugin/settings.gradle.kts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
rootProject.name = "ComposeDemoPlugin"
22

33
pluginManagement {
4-
repositories {
5-
gradlePluginPortal()
6-
mavenCentral()
7-
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
4+
plugins {
5+
kotlin("jvm").version(extra["kotlin.version"] as String)
6+
id("org.jetbrains.compose").version(extra["compose.version"] as String)
87
}
9-
}
8+
}

‎examples/issues/build.gradle.kts

-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
buildscript {
2-
repositories {
3-
mavenLocal()
4-
google()
5-
mavenCentral()
6-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
7-
}
8-
9-
dependencies {
10-
// __LATEST_COMPOSE_RELEASE_VERSION__
11-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
12-
classpath("com.android.tools.build:gradle:4.1.3")
13-
// __KOTLIN_COMPOSE_VERSION__
14-
classpath(kotlin("gradle-plugin", version = "1.5.31"))
15-
}
16-
}
17-
181
allprojects {
192
repositories {
203
mavenLocal()

‎examples/issues/gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ kotlin.code.style=official
1818
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1919
android.useAndroidX=true
2020
# Automatically convert third-party libraries to use AndroidX
21-
android.enableJetifier=true
21+
android.enableJetifier=true
22+
kotlin.version=1.5.31
23+
agp.version=4.2.2
24+
compose.version=1.0.0

‎examples/issues/settings.gradle.kts

+21
Original file line numberDiff line numberDiff line change
@@ -1 +1,22 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
5+
google()
6+
}
7+
8+
plugins {
9+
val kotlinVersion = extra["kotlin.version"] as String
10+
val agpVersion = extra["agp.version"] as String
11+
val composeVersion = extra["compose.version"] as String
12+
13+
kotlin("jvm").version(kotlinVersion)
14+
kotlin("multiplatform").version(kotlinVersion)
15+
kotlin("android").version(kotlinVersion)
16+
id("com.android.application").version(agpVersion)
17+
id("com.android.library").version(agpVersion)
18+
id("org.jetbrains.compose").version(composeVersion)
19+
}
20+
}
21+
122
include(":common", ":android", ":desktop")

‎examples/notepad/build.gradle.kts

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import org.jetbrains.compose.compose
22
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
33

44
plugins {
5-
// __KOTLIN_COMPOSE_VERSION__
6-
kotlin("jvm") version "1.5.31"
7-
// __LATEST_COMPOSE_RELEASE_VERSION__
8-
id("org.jetbrains.compose") version ("1.0.0")
5+
kotlin("jvm")
6+
id("org.jetbrains.compose")
97
}
108

119
repositories {

‎examples/notepad/gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
2-
kotlin.code.style=official
2+
kotlin.code.style=official
3+
kotlin.version=1.5.31
4+
compose.version=1.0.0

‎examples/notepad/settings.gradle.kts

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ pluginManagement {
33
gradlePluginPortal()
44
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
55
}
6-
}
6+
7+
plugins {
8+
kotlin("jvm").version(extra["kotlin.version"] as String)
9+
id("org.jetbrains.compose").version(extra["compose.version"] as String)
10+
}
11+
}

‎examples/todoapp-lite/build.gradle.kts

-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
6-
}
7-
8-
dependencies {
9-
// __LATEST_COMPOSE_RELEASE_VERSION__
10-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
11-
classpath("com.android.tools.build:gradle:4.1.0")
12-
classpath(kotlin("gradle-plugin", version = "1.5.31"))
13-
}
14-
}
15-
161
allprojects {
172
repositories {
183
google()

0 commit comments

Comments
 (0)