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 0.4.0-build209

pull/685/head
Nikolay Igotti 4 years ago
parent
3dcc3db2ec
commit
38f4cfa33e
14 changed files with 17 additions and 17 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. 2
      components/build.gradle.kts
  3. 2
      examples/codeviewer/build.gradle.kts
  4. 2
      examples/falling_balls/build.gradle.kts
  5. 2
      examples/imageviewer/build.gradle.kts
  6. 2
      examples/intelliJPlugin/build.gradle.kts
  7. 2
      examples/issues/build.gradle.kts
  8. 2
      examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
  9. 2
      examples/widgetsgallery/build.gradle.kts
  10. 2
      gradle-plugins/gradle.properties
  11. 2
      templates/desktop-template/build.gradle.kts
  12. 2
      templates/desktop-template/build_and_run_from_cli_example.sh
  13. 2
      templates/multiplatform-template/build.gradle.kts
  14. 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.4.0-build208 compose.version=0.4.0-build209
kotlin.code.style=official kotlin.code.style=official

2
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-build208" val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-build209"
repositories { repositories {
google() google()

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-build208") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
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.5.0")) classpath(kotlin("gradle-plugin", version = "1.5.0"))

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

@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.0" kotlin("jvm") version "1.5.0"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.4.0-build208" id("org.jetbrains.compose") version "0.4.0-build209"
} }
group = "me.user" group = "me.user"

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

@ -11,7 +11,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build208") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
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.5.0")) classpath(kotlin("gradle-plugin", version = "1.5.0"))

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

@ -5,7 +5,7 @@ plugins {
java java
kotlin("jvm") version "1.5.0" kotlin("jvm") version "1.5.0"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.4.0-build208" id("org.jetbrains.compose") version "0.4.0-build209"
} }
group = "org.example" group = "org.example"

2
examples/issues/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-build208") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
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.5.0")) classpath(kotlin("gradle-plugin", version = "1.5.0"))

2
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.32" private const val VERSION = "1.5.0"
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"

2
examples/widgetsgallery/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-build208") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build209")
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.5.0")) classpath(kotlin("gradle-plugin", version = "1.5.0"))

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-build208 compose.version=0.4.0-build209
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
templates/desktop-template/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.0" 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-build208") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build209")
} }
repositories { repositories {

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

@ -23,7 +23,7 @@ SKIKO_VERSION=0.2.33
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
KOTLIN_VERSION=1.5.0 KOTLIN_VERSION=1.5.0
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_VERSION=0.4.0-build208 COMPOSE_VERSION=0.4.0-build209
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
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-build208" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build209"
repositories { repositories {
// TODO: remove after new build is published // TODO: remove after new build is published

8
tools/replace.sh
Unescape View File

@ -1,7 +1,7 @@
#!/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.4.0-build182 COMPOSE_OLDVER=0.4.0-build208
COMPOSE_NEWVER=0.4.0-build208 COMPOSE_NEWVER=0.4.0-build209
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
@ -9,5 +9,5 @@ find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$APPCOMPAT
KOTLIN_OLDVER=1.4.32 KOTLIN_OLDVER=1.4.32
KOTLIN_NEWVER=1.5.0 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 __KOTLIN_COMPOSE_VERSION__ $ROOT
git grep -C 1 __LATEST_COMPOSE_RELEASE_VERSION__ git grep -C 1 __LATEST_COMPOSE_RELEASE_VERSION__ $ROOT

Write Preview
Loading…
Cancel
Save