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 Compose 0.4.0-build208 and Kotlin 1.5.0

pull/685/head 0.4.0-build209
Nikolay Igotti 4 years ago
parent
2c1964ed46
commit
7bdb87f20b
18 changed files with 34 additions and 32 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. 4
      examples/codeviewer/build.gradle.kts
  4. 4
      examples/falling_balls/build.gradle.kts
  5. 2
      examples/falling_balls_with_web/build.gradle.kts
  6. 4
      examples/imageviewer/build.gradle.kts
  7. 4
      examples/intelliJPlugin/build.gradle.kts
  8. 4
      examples/issues/build.gradle.kts
  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. 2
      idea-plugin/build.gradle.kts
  14. 2
      idea-plugin/examples/desktop-project/build.gradle.kts
  15. 4
      templates/desktop-template/build.gradle.kts
  16. 6
      templates/desktop-template/build_and_run_from_cli_example.sh
  17. 4
      templates/multiplatform-template/build.gradle.kts
  18. 10
      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.4.0-build182 compose.version=0.4.0-build208
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.4.0-build182" val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-build208"
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.32")) classpath(kotlin("gradle-plugin", version = "1.5.0"))
} }
} }

4
examples/codeviewer/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.4.0-build182") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build208")
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.5.0"))
} }
} }

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.32" kotlin("jvm") version "1.5.0"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.4.0-build182" id("org.jetbrains.compose") version "0.4.0-build208"
} }
group = "me.user" group = "me.user"

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

@ -2,7 +2,7 @@
import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins { plugins {
id("org.jetbrains.kotlin.multiplatform") version "1.4.32" id("org.jetbrains.kotlin.multiplatform") version "1.5.0"
id("org.jetbrains.compose") version "0.0.0-web-dev-12" id("org.jetbrains.compose") version "0.0.0-web-dev-12"
} }

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.4.0-build182") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build208")
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.5.0"))
} }
} }

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.32" kotlin("jvm") version "1.5.0"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.4.0-build182" id("org.jetbrains.compose") version "0.4.0-build208"
} }
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.4.0-build182") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build208")
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.5.0"))
} }
} }

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.4.0-build182") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build208")
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.5.0"))
} }
} }

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.32" apply false kotlin("jvm") version "1.5.0" 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.32"), Default("1.5.0"),
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.4.0-build182 compose.version=0.4.0-build208
compose.with.web=false compose.with.web=false
# A version of Gradle plugin, that will be published, # A version of Gradle plugin, that will be published,

2
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.32" id("org.jetbrains.kotlin.jvm") version "1.5.0"
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"
} }

2
idea-plugin/examples/desktop-project/build.gradle.kts
Unescape View File

@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
plugins { plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.32" kotlin("jvm") version "1.5.0"
id("org.jetbrains.compose") version "0.4.0-idea-preview-build57" id("org.jetbrains.compose") version "0.4.0-idea-preview-build57"
} }

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

@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins { plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.32" kotlin("jvm") version "1.5.0"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build182") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build208")
} }
repositories { repositories {

6
templates/desktop-template/build_and_run_from_cli_example.sh
Unescape View File

@ -19,11 +19,11 @@ function mavenDep {
} }
PLATFORM=macos-x64 PLATFORM=macos-x64
SKIKO_VERSION=0.2.13 SKIKO_VERSION=0.2.33
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
KOTLIN_VERSION=1.4.30 KOTLIN_VERSION=1.5.0
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_VERSION=0.3.0 COMPOSE_VERSION=0.4.0-build208
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/"

4
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-build182" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build208"
repositories { repositories {
// TODO: remove after new build is published // TODO: remove after new build is published
@ -14,7 +14,7 @@ buildscript {
classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion") classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
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.5.0"))
} }
} }

10
tools/replace.sh
Unescape View File

@ -1,11 +1,13 @@
#!/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.2 COMPOSE_OLDVER=0.4.0-build182
COMPOSE_NEWVER=0.4.0-build182 COMPOSE_NEWVER=0.4.0-build208
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.31 KOTLIN_OLDVER=1.4.32
KOTLIN_NEWVER=1.4.32 KOTLIN_NEWVER=1.5.0
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" {} \;
git grep -C 1 __KOTLIN_COMPOSE_VERSION__
git grep -C 1 __LATEST_COMPOSE_RELEASE_VERSION__

Write Preview
Loading…
Cancel
Save