Browse Source

Move to 0.3.2.

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

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

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

4
components/build.gradle.kts

@ -1,6 +1,6 @@
buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__
val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.3.1"
val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.3.2"
repositories {
google()
@ -11,7 +11,7 @@ buildscript {
dependencies {
classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))
classpath(kotlin("gradle-plugin", version = "1.4.31"))
}
}

4
examples/codeviewer/build.gradle.kts

@ -9,10 +9,10 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))
classpath(kotlin("gradle-plugin", version = "1.4.31"))
}
}

4
examples/falling_balls/build.gradle.kts

@ -4,9 +4,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.30"
kotlin("jvm") version "1.4.31"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.1"
id("org.jetbrains.compose") version "0.3.2"
}
group = "me.user"

4
examples/imageviewer/build.gradle.kts

@ -11,10 +11,10 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))
classpath(kotlin("gradle-plugin", version = "1.4.31"))
}
}

6
examples/intelliJPlugin/build.gradle.kts

@ -3,9 +3,9 @@ import org.jetbrains.compose.compose
plugins {
id("org.jetbrains.intellij") version "0.6.5"
java
kotlin("jvm") version "1.4.30"
kotlin("jvm") version "1.4.31"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.1"
id("org.jetbrains.compose") version "0.3.2"
}
group = "org.example"
@ -26,7 +26,7 @@ dependencies {
// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
version = "2020.3.1"
version = "2020.3.2"
}
tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml") {
changeNotes("""

4
examples/issues/build.gradle.kts

@ -9,10 +9,10 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))
classpath(kotlin("gradle-plugin", version = "1.4.31"))
}
}

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

@ -3,7 +3,7 @@ object Deps {
object JetBrains {
object Kotlin {
// __KOTLIN_COMPOSE_VERSION__
private const val VERSION = "1.4.30"
private const val VERSION = "1.4.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"
@ -12,7 +12,7 @@ object Deps {
object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__
private const val VERSION = "0.3.1"
private const val VERSION = "0.3.2"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
}
}

4
examples/widgetsgallery/build.gradle.kts

@ -9,10 +9,10 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))
classpath(kotlin("gradle-plugin", version = "1.4.31"))
}
}

2
gradle-plugins/build.gradle.kts

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

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

@ -2,7 +2,7 @@ package org.jetbrains.compose.test
object TestProperties {
// __KOTLIN_COMPOSE_VERSION__
val kotlinVersion: String = "1.4.30"
val kotlinVersion: String = "1.4.31"
val composeVersion: String
get() = System.getProperty("compose.plugin.version")!!

2
gradle-plugins/gradle.properties

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

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

@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.30"
kotlin("jvm") version "1.4.31"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.1")
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.2")
}
repositories {

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

@ -1,6 +1,6 @@
buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.1"
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.2"
repositories {
// TODO: remove after new build is published
@ -14,7 +14,7 @@ buildscript {
classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))
classpath(kotlin("gradle-plugin", version = "1.4.31"))
}
}

8
tools/replace.sh

@ -1,9 +1,11 @@
#!/bin/bash
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..
COMPOSE_OLDVER=0.3.0
COMPOSE_NEWVER=0.3.1
COMPOSE_OLDVER=0.3.1
COMPOSE_NEWVER=0.3.2
find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$COMPOSE_OLDVER/$COMPOSE_NEWVER/g" {} \;
APPCOMPAT_OLDVER=1.1.0
APPCOMPAT_NEWVER=1.3.0-beta01
find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$APPCOMPAT_OLDVER/$APPCOMPAT_NEWVER/g" {} \;
KOTLIN_OLDVER=1.4.30
KOTLIN_NEWVER=1.4.31
find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$KOTLIN_OLDVER/$KOTLIN_NEWVER/g" {} \;

Loading…
Cancel
Save