Browse Source

Move to 0.3.0.

pull/417/head 0.4.0-build168
Nikolay Igotti 4 years ago
parent
commit
10e99c20d9
  1. 2
      ci/compose-uber-jar/gradle.properties
  2. 2
      examples/codeviewer/build.gradle.kts
  3. 2
      examples/falling_balls/build.gradle.kts
  4. 2
      examples/imageviewer/build.gradle.kts
  5. 2
      examples/intelliJPlugin/build.gradle.kts
  6. 2
      examples/issues/build.gradle.kts
  7. 2
      examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
  8. 2
      examples/widgetsgallery/build.gradle.kts
  9. 2
      gradle-plugins/build.gradle.kts
  10. 4
      gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt
  11. 2
      gradle-plugins/gradle.properties
  12. 2
      templates/desktop-template/build.gradle.kts
  13. 6
      templates/desktop-template/build_and_run_from_cli_example.sh
  14. 2
      templates/multiplatform-template/build.gradle.kts
  15. 4
      tools/replace.sh

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

@ -1,3 +1,3 @@
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.3.0-rc1 compose.version=0.3.0
kotlin.code.style=official kotlin.code.style=official

2
examples/codeviewer/build.gradle.kts

@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30")) classpath(kotlin("gradle-plugin", version = "1.4.30"))

2
examples/falling_balls/build.gradle.kts

@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.30" kotlin("jvm") version "1.4.30"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.0-rc1" id("org.jetbrains.compose") version "0.3.0"
} }
group = "me.user" group = "me.user"

2
examples/imageviewer/build.gradle.kts

@ -11,7 +11,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30")) classpath(kotlin("gradle-plugin", version = "1.4.30"))

2
examples/intelliJPlugin/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
java java
kotlin("jvm") version "1.4.30" kotlin("jvm") version "1.4.30"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.0-rc1" id("org.jetbrains.compose") version "0.3.0"
} }
group = "org.example" group = "org.example"

2
examples/issues/build.gradle.kts

@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30")) classpath(kotlin("gradle-plugin", version = "1.4.30"))

2
examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt

@ -13,7 +13,7 @@ object Deps {
object Compose { object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
// TODO remove exclude(group = "org.jetbrains.compose.desktop") // TODO remove exclude(group = "org.jetbrains.compose.desktop")
private const val VERSION = "0.3.0-rc1" private const val VERSION = "0.3.0"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
} }
} }

2
examples/widgetsgallery/build.gradle.kts

@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30")) classpath(kotlin("gradle-plugin", version = "1.4.30"))

2
gradle-plugins/build.gradle.kts

@ -2,7 +2,7 @@ import com.gradle.publish.PluginBundleExtension
plugins { plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.20" apply false kotlin("jvm") version "1.4.30" apply false
id("com.gradle.plugin-publish") version "0.10.1" apply false id("com.gradle.plugin-publish") version "0.10.1" apply false
id("de.fuerstenau.buildconfig") version "1.1.8" apply false id("de.fuerstenau.buildconfig") version "1.1.8" apply false
} }

4
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt

@ -2,11 +2,11 @@ package org.jetbrains.compose.test
object TestProperties { object TestProperties {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
val kotlinVersion: String = "1.4.20" val kotlinVersion: String = "1.4.30"
val composeVersion: String val composeVersion: String
get() = System.getProperty("compose.plugin.version")!! get() = System.getProperty("compose.plugin.version")!!
val gradleVersionForTests: String val gradleVersionForTests: String
get() = System.getProperty("gradle.version.for.tests")!! get() = System.getProperty("gradle.version.for.tests")!!
} }

2
gradle-plugins/gradle.properties

@ -6,7 +6,7 @@ kotlin.code.style=official
# unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
# #
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.3.0-rc1 compose.version=0.3.0
# A version of Gradle plugin, that will be published, # A version of Gradle plugin, that will be published,
# unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.

2
templates/desktop-template/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.30" kotlin("jvm") version "1.4.30"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-rc1") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0")
} }
repositories { repositories {

6
templates/desktop-template/build_and_run_from_cli_example.sh

@ -19,11 +19,11 @@ function mavenDep {
} }
PLATFORM=macos-x64 PLATFORM=macos-x64
SKIKO_VERSION=0.1.18 SKIKO_VERSION=0.2.13
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
KOTLIN_VERSION=1.4.20 KOTLIN_VERSION=1.4.30
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_VERSION=0.2.0-build132 COMPOSE_VERSION=0.3.0
COROUTINES_VERSION=1.3.6 COROUTINES_VERSION=1.3.6
COLLECTIONS_VERSION=0.3 COLLECTIONS_VERSION=0.3
SPACE_REPO="https://public.jetbrains.space/p/compose/packages/maven/" SPACE_REPO="https://public.jetbrains.space/p/compose/packages/maven/"

2
templates/multiplatform-template/build.gradle.kts

@ -1,6 +1,6 @@
buildscript { buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-rc1" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0"
repositories { repositories {
// TODO: remove after new build is published // TODO: remove after new build is published

4
tools/replace.sh

@ -1,3 +1,3 @@
OLDVER=0.0.0-unmerged-build39 OLDVER=0.3.0-rc1
NEWVER=0.3.0-rc1 NEWVER=0.3.0
find -E ../ -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$OLDVER/$NEWVER/g" {} \; find -E ../ -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$OLDVER/$NEWVER/g" {} \;

Loading…
Cancel
Save