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

Use 0.4.0-rc2 in examples (#720)

pull/722/head
Nikolay Igotti 4 years ago committed by GitHub
parent
c3403681e2
commit
e817408595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 25 additions and 25 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/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt
  5. 2
      examples/codeviewer/common/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt
  6. 2
      examples/codeviewer/gradle/wrapper/gradle-wrapper.properties
  7. 2
      examples/falling_balls/build.gradle.kts
  8. 2
      examples/falling_balls/gradle/wrapper/gradle-wrapper.properties
  9. 2
      examples/imageviewer/build.gradle.kts
  10. 2
      examples/imageviewer/gradle/wrapper/gradle-wrapper.properties
  11. 4
      examples/intelliJPlugin/build.gradle.kts
  12. 2
      examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties
  13. 2
      examples/issues/build.gradle.kts
  14. 2
      examples/issues/gradle/wrapper/gradle-wrapper.properties
  15. 2
      examples/web-getting-started/build.gradle.kts
  16. 2
      examples/web_landing/build.gradle.kts
  17. 2
      examples/widgetsgallery/build.gradle.kts
  18. 2
      examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties
  19. 2
      gradle-plugins/gradle.properties
  20. 4
      tools/replace.sh
  21. 2
      tutorials/checker/gradle/wrapper/gradle-wrapper.properties

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-rc1 compose.version=0.4.0-rc2
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-rc1" val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-rc2"
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-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
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/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt
Unescape View File

@ -43,7 +43,7 @@ class FileTree(root: File, private val editors: Editors) {
get() = if (file.file.isDirectory) { get() = if (file.file.isDirectory) {
ItemType.Folder(isExpanded = file.children.isNotEmpty(), canExpand = file.canExpand) ItemType.Folder(isExpanded = file.children.isNotEmpty(), canExpand = file.canExpand)
} else { } else {
ItemType.File(ext = file.file.name.substringAfterLast(".").toLowerCase()) ItemType.File(ext = file.file.name.substringAfterLast(".").lowercase())
} }
fun open() = when (type) { fun open() = when (type) {

2
examples/codeviewer/common/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt
Unescape View File

@ -94,7 +94,7 @@ private fun java.io.File.readLinePositions(
if (isBeginOfLine) { if (isBeginOfLine) {
starts.add(position.toInt()) starts.add(position.toInt())
} }
isBeginOfLine = byte.toChar() == '\n' isBeginOfLine = Char(byte.toInt()) == '\n'
position++ position++
} }
channel.close() channel.close()

2
examples/codeviewer/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

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-rc1" id("org.jetbrains.compose") version "0.4.0-rc2"
} }
group = "me.user" group = "me.user"

2
examples/falling_balls/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

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-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
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/imageviewer/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
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-rc1" id("org.jetbrains.compose") version "0.4.0-rc2"
} }
group = "org.example" group = "org.example"
@ -25,7 +25,7 @@ dependencies {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version = "2020.3.2" version = "2021.1"
} }
tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml") { tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml") {
changeNotes(""" changeNotes("""

2
examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

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-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
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/issues/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
examples/web-getting-started/build.gradle.kts
Unescape View File

@ -1,5 +1,5 @@
plugins { plugins {
kotlin("multiplatform") version "1.5.0" kotlin("multiplatform") version "1.5.10"
id("org.jetbrains.compose") version "0.0.0-web-dev-13" id("org.jetbrains.compose") version "0.0.0-web-dev-13"
} }

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

@ -1,5 +1,5 @@
plugins { plugins {
id("org.jetbrains.kotlin.multiplatform") version "1.5.0" id("org.jetbrains.kotlin.multiplatform") version "1.5.10"
id("org.jetbrains.compose") version "0.0.0-web-dev-13" id("org.jetbrains.compose") version "0.0.0-web-dev-13"
} }

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-rc1") classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
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/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

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-rc1 compose.version=0.4.0-rc2
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,

4
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-build209 COMPOSE_OLDVER=0.4.0-rc1
COMPOSE_NEWVER=0.4.0-rc1 COMPOSE_NEWVER=0.4.0-rc2
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

2
tutorials/checker/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Write Preview
Loading…
Cancel
Save