github
/
compose-jb
mirror of https://gitee.com/github-sync-mirror/compose-jb.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Move to Kotlin 1.4.32 and 0.4.0-build180

pull/583/head
Nikolay Igotti 4 years ago
parent
1f15bbb373
commit
76e3f45f8b
16 changed files with 28 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ci/compose-uber-jar/gradle.properties
  2. 4
      components/build.gradle.kts
  3. 2
      examples/codeviewer/build.gradle.kts
  4. 4
      examples/falling_balls/build.gradle.kts
  5. 4
      examples/imageviewer/build.gradle.kts
  6. 4
      examples/intelliJPlugin/build.gradle.kts
  7. 4
      examples/issues/build.gradle.kts
  8. 6
      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/TestKotlinVersion.kt
  12. 2
      gradle-plugins/gradle.properties
  13. 4
      idea-plugin/build.gradle.kts
  14. 2
      templates/desktop-template/build.gradle.kts
  15. 2
      templates/multiplatform-template/build.gradle.kts
  16. 8
      tools/replace.sh

2
ci/compose-uber-jar/gradle.properties
Unescape View File

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

4
components/build.gradle.kts
Unescape View File

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

2
examples/codeviewer/build.gradle.kts
Unescape View File

@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build179") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180")
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.32")) classpath(kotlin("gradle-plugin", version = "1.4.32"))

4
examples/falling_balls/build.gradle.kts
Unescape View File

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

4
examples/imageviewer/build.gradle.kts
Unescape View File

@ -11,10 +11,10 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180")
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.31")) classpath(kotlin("gradle-plugin", version = "1.4.32"))
} }
} }

4
examples/intelliJPlugin/build.gradle.kts
Unescape View File

@ -3,9 +3,9 @@ import org.jetbrains.compose.compose
plugins { plugins {
id("org.jetbrains.intellij") version "0.6.5" id("org.jetbrains.intellij") version "0.6.5"
java java
kotlin("jvm") version "1.4.31" kotlin("jvm") version "1.4.32"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.2" id("org.jetbrains.compose") version "0.4.0-build180"
} }
group = "org.example" group = "org.example"

4
examples/issues/build.gradle.kts
Unescape View File

@ -9,10 +9,10 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180")
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.31")) classpath(kotlin("gradle-plugin", version = "1.4.32"))
} }
} }

6
examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
Unescape View File

@ -3,7 +3,7 @@ object Deps {
object JetBrains { object JetBrains {
object Kotlin { object Kotlin {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
private const val VERSION = "1.4.31" private const val VERSION = "1.4.32"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VERSION" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VERSION"
const val testCommon = "org.jetbrains.kotlin:kotlin-test-common:$VERSION" const val testCommon = "org.jetbrains.kotlin:kotlin-test-common:$VERSION"
const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:$VERSION" const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:$VERSION"
@ -12,7 +12,7 @@ object Deps {
object Compose { object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
private const val VERSION = "0.3.2" private const val VERSION = "0.4.0-build180"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
} }
} }
@ -49,7 +49,7 @@ object Deps {
} }
object Decompose { object Decompose {
private const val VERSION = "0.2.0" private const val VERSION = "0.2.1"
const val decompose = "com.arkivanov.decompose:decompose:$VERSION" const val decompose = "com.arkivanov.decompose:decompose:$VERSION"
const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION" const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION"
const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION" const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION"

4
examples/widgetsgallery/build.gradle.kts
Unescape View File

@ -9,10 +9,10 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180")
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.31")) classpath(kotlin("gradle-plugin", version = "1.4.32"))
} }
} }

2
gradle-plugins/build.gradle.kts
Unescape View File

@ -2,7 +2,7 @@ import com.gradle.publish.PluginBundleExtension
plugins { plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.31" apply false kotlin("jvm") version "1.4.32" 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
} }

2
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
Unescape View File

@ -8,6 +8,6 @@ package org.jetbrains.compose.test
@Suppress("EnumEntryName") @Suppress("EnumEntryName")
enum class TestKotlinVersion(val versionString: String) { enum class TestKotlinVersion(val versionString: String) {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
Default("1.4.31"), Default("1.4.32"),
V1_5_20_dev_3226("1.5.20-dev-3226") V1_5_20_dev_3226("1.5.20-dev-3226")
} }

2
gradle-plugins/gradle.properties
Unescape View File

@ -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.2 compose.version=0.4.0-build180
# 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.

4
idea-plugin/build.gradle.kts
Unescape View File

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
plugins { plugins {
id("java") id("java")
id("org.jetbrains.kotlin.jvm") version "1.4.31" id("org.jetbrains.kotlin.jvm") version "1.4.32"
id("org.jetbrains.intellij") version "0.7.2" id("org.jetbrains.intellij") version "0.7.2"
id("org.jetbrains.changelog") version "1.1.2" id("org.jetbrains.changelog") version "1.1.2"
} }
@ -27,7 +27,7 @@ intellij {
setPlugins( setPlugins(
"java", "java",
"com.intellij.gradle", "com.intellij.gradle",
"org.jetbrains.kotlin:203-1.4.31-release-IJ7148.5" "org.jetbrains.kotlin:203-1.4.32-release-IJ7148.5"
) )
} }

2
templates/desktop-template/build.gradle.kts
Unescape View File

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

2
templates/multiplatform-template/build.gradle.kts
Unescape View File

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

8
tools/replace.sh
Unescape View File

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

Write Preview
Loading…
Cancel
Save