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

pull/723/head
Nikolay Igotti 4 years ago
parent
34c0d67a1d
commit
0dc9bf0104
12 changed files with 14 additions and 14 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/widgetsgallery/build.gradle.kts
  9. 2
      gradle-plugins/gradle.properties
  10. 2
      templates/desktop-template/build.gradle.kts
  11. 2
      templates/multiplatform-template/build.gradle.kts
  12. 6
      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-rc2 compose.version=0.4.0
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-rc2" val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0"
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-rc2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.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.5.10")) classpath(kotlin("gradle-plugin", version = "1.5.10"))

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.10" kotlin("jvm") version "1.5.10"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.4.0-rc2" id("org.jetbrains.compose") version "0.4.0"
} }
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-rc2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.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.5.10")) classpath(kotlin("gradle-plugin", version = "1.5.10"))

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

@ -5,7 +5,7 @@ plugins {
java java
kotlin("jvm") version "1.5.10" kotlin("jvm") version "1.5.10"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.4.0-rc2" id("org.jetbrains.compose") version "0.4.0"
} }
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-rc2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.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.5.10")) classpath(kotlin("gradle-plugin", version = "1.5.10"))

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-rc2") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.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.5.10")) classpath(kotlin("gradle-plugin", version = "1.5.10"))

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-rc2 compose.version=0.4.0
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.10" kotlin("jvm") version "1.5.10"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-rc2") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0")
} }
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-rc2" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0"
repositories { repositories {
// TODO: remove after new build is published // TODO: remove after new build is published

6
tools/replace.sh
Unescape View File

@ -1,12 +1,12 @@
#!/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-rc1 COMPOSE_OLDVER=0.4.0-rc2
COMPOSE_NEWVER=0.4.0-rc2 COMPOSE_NEWVER=0.4.0
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.5.0 KOTLIN_OLDVER=1.5.10
KOTLIN_NEWVER=1.5.10 KOTLIN_NEWVER=1.5.10
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__ $ROOT git grep -C 1 __KOTLIN_COMPOSE_VERSION__ $ROOT

Write Preview
Loading…
Cancel
Save