Browse Source

Move to 1.1.0 (#1882)

Co-authored-by: Roman Sedaikin <roman.sedaikin@jetbrains.com>
Co-authored-by: Igor Demin <igordmn@gmail.com>
pull/1922/head
Nikolay Igotti 2 years ago committed by GitHub
parent
commit
4af260d36a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ci/compose-uber-jar/gradle.properties
  2. 2
      components/gradle.properties
  3. 2
      examples/codeviewer/gradle.properties
  4. 2
      examples/falling-balls/gradle.properties
  5. 22
      examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt
  6. 0
      examples/imageviewer/common/src/androidMain/res/drawable/back.png
  7. 0
      examples/imageviewer/common/src/androidMain/res/drawable/blur_off.png
  8. 0
      examples/imageviewer/common/src/androidMain/res/drawable/blur_on.png
  9. 0
      examples/imageviewer/common/src/androidMain/res/drawable/dots.png
  10. 0
      examples/imageviewer/common/src/androidMain/res/drawable/empty.png
  11. 0
      examples/imageviewer/common/src/androidMain/res/drawable/filter_unknown.png
  12. 0
      examples/imageviewer/common/src/androidMain/res/drawable/grayscale_off.png
  13. 0
      examples/imageviewer/common/src/androidMain/res/drawable/grayscale_on.png
  14. 0
      examples/imageviewer/common/src/androidMain/res/drawable/pixel_off.png
  15. 0
      examples/imageviewer/common/src/androidMain/res/drawable/pixel_on.png
  16. 0
      examples/imageviewer/common/src/androidMain/res/drawable/refresh.png
  17. 2
      examples/imageviewer/gradle.properties
  18. 2
      examples/intellij-plugin-with-experimental-shared-base/gradle.properties
  19. 2
      examples/intellij-plugin/gradle.properties
  20. 2
      examples/issues/gradle.properties
  21. 2
      examples/notepad/gradle.properties
  22. 2
      examples/todoapp-lite/gradle.properties
  23. 2
      examples/todoapp/buildSrc/gradle.properties
  24. 2
      examples/todoapp/gradle.properties
  25. 2
      examples/visual-effects/gradle.properties
  26. 2
      examples/web-compose-bird/gradle.properties
  27. 2
      examples/web-landing/gradle.properties
  28. 2
      examples/web-with-react/gradle.properties
  29. 2
      examples/widgets-gallery/gradle.properties
  30. 2
      gradle-plugins/gradle.properties
  31. 2
      templates/desktop-template/gradle.properties
  32. 2
      templates/multiplatform-template/gradle.properties
  33. 2
      templates/web-template/gradle.properties
  34. 4
      tutorials/Getting_Started/README.md
  35. 2
      tutorials/Web/Getting_Started/README.md
  36. 4
      web/gradle.properties

2
ci/compose-uber-jar/gradle.properties

@ -1,2 +1,2 @@
compose.version=1.0.1-rc2
compose.version=1.1.0
kotlin.code.style=official

2
components/gradle.properties

@ -5,4 +5,4 @@ kotlin.code.style=official
# __KOTLIN_COMPOSE_VERSION__
kotlin.version=1.6.10
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.0.1
compose.version=1.1.0

2
examples/codeviewer/gradle.properties

@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official
kotlin.version=1.6.10
agp.version=7.0.4
compose.version=1.0.1
compose.version=1.1.0

2
examples/falling-balls/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

22
examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt

@ -5,34 +5,34 @@ import androidx.compose.ui.res.painterResource
import example.imageviewer.common.R
@Composable
fun icEmpty() = painterResource(R.raw.empty)
fun icEmpty() = painterResource(R.drawable.empty)
@Composable
fun icBack() = painterResource(R.raw.back)
fun icBack() = painterResource(R.drawable.back)
@Composable
fun icRefresh() = painterResource(R.raw.refresh)
fun icRefresh() = painterResource(R.drawable.refresh)
@Composable
fun icDots() = painterResource(R.raw.dots)
fun icDots() = painterResource(R.drawable.dots)
@Composable
fun icFilterGrayscaleOn() = painterResource(R.raw.grayscale_on)
fun icFilterGrayscaleOn() = painterResource(R.drawable.grayscale_on)
@Composable
fun icFilterGrayscaleOff() = painterResource(R.raw.grayscale_off)
fun icFilterGrayscaleOff() = painterResource(R.drawable.grayscale_off)
@Composable
fun icFilterPixelOn() = painterResource(R.raw.pixel_on)
fun icFilterPixelOn() = painterResource(R.drawable.pixel_on)
@Composable
fun icFilterPixelOff() = painterResource(R.raw.pixel_off)
fun icFilterPixelOff() = painterResource(R.drawable.pixel_off)
@Composable
fun icFilterBlurOn() = painterResource(R.raw.blur_on)
fun icFilterBlurOn() = painterResource(R.drawable.blur_on)
@Composable
fun icFilterBlurOff() = painterResource(R.raw.blur_off)
fun icFilterBlurOff() = painterResource(R.drawable.blur_off)
@Composable
fun icFilterUnknown() = painterResource(R.raw.filter_unknown)
fun icFilterUnknown() = painterResource(R.drawable.filter_unknown)

0
examples/imageviewer/common/src/androidMain/res/raw/back.png → examples/imageviewer/common/src/androidMain/res/drawable/back.png

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/blur_off.png → examples/imageviewer/common/src/androidMain/res/drawable/blur_off.png

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/blur_on.png → examples/imageviewer/common/src/androidMain/res/drawable/blur_on.png

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/dots.png → examples/imageviewer/common/src/androidMain/res/drawable/dots.png

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/empty.png → examples/imageviewer/common/src/androidMain/res/drawable/empty.png

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/filter_unknown.png → examples/imageviewer/common/src/androidMain/res/drawable/filter_unknown.png

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/grayscale_off.png → examples/imageviewer/common/src/androidMain/res/drawable/grayscale_off.png

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/grayscale_on.png → examples/imageviewer/common/src/androidMain/res/drawable/grayscale_on.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/pixel_off.png → examples/imageviewer/common/src/androidMain/res/drawable/pixel_off.png

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/pixel_on.png → examples/imageviewer/common/src/androidMain/res/drawable/pixel_on.png

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

0
examples/imageviewer/common/src/androidMain/res/raw/refresh.png → examples/imageviewer/common/src/androidMain/res/drawable/refresh.png

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

2
examples/imageviewer/gradle.properties

@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official
kotlin.version=1.6.10
agp.version=7.0.4
compose.version=1.0.1
compose.version=1.1.0

2
examples/intellij-plugin-with-experimental-shared-base/gradle.properties

@ -1,5 +1,5 @@
kotlin.stdlib.default.dependency=false
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/intellij-plugin/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/issues/gradle.properties

@ -21,4 +21,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.version=1.6.10
agp.version=7.0.4
compose.version=1.0.1
compose.version=1.1.0

2
examples/notepad/gradle.properties

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/todoapp-lite/gradle.properties

@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official
kotlin.version=1.6.10
agp.version=7.0.4
compose.version=1.0.1
compose.version=1.1.0

2
examples/todoapp/buildSrc/gradle.properties

@ -1,3 +1,3 @@
# TODO can we get rid of duplication with root gradle.properties?
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/todoapp/gradle.properties

@ -24,4 +24,4 @@ org.gradle.caching=true
kotlin.native.disableCompilerDaemon=true
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/visual-effects/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/web-compose-bird/gradle.properties

@ -1,4 +1,4 @@
kotlin.code.style=official
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/web-landing/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/web-with-react/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
examples/widgets-gallery/gradle.properties

@ -20,5 +20,5 @@ android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0
agp.version=7.0.4

2
gradle-plugins/gradle.properties

@ -6,7 +6,7 @@ kotlin.code.style=official
# unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
#
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.0.0-master-dev570
compose.version=1.1.0
# A version of Gradle plugin, that will be published,
# unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.

2
templates/desktop-template/gradle.properties

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

2
templates/multiplatform-template/gradle.properties

@ -4,4 +4,4 @@ android.enableJetifier=true
kotlin.code.style=official
kotlin.version=1.6.10
agp.version=7.0.4
compose.version=1.0.1
compose.version=1.1.0

2
templates/web-template/gradle.properties

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.0.1
compose.version=1.1.0

4
tutorials/Getting_Started/README.md

@ -44,7 +44,7 @@ The Compose plugin version used in the wizard above may be not the last. Update
```
plugins {
kotlin("jvm") version "1.6.10"
id("org.jetbrains.compose") version "1.0.1-rc2"
id("org.jetbrains.compose") version "1.1.0-rc01"
}
```
@ -80,7 +80,7 @@ import org.jetbrains.compose.compose
plugins {
kotlin("jvm") version "1.6.10"
id("org.jetbrains.compose") version "1.0.1-rc2"
id("org.jetbrains.compose") version "1.1.0-rc01"
}
repositories {

2
tutorials/Web/Getting_Started/README.md

@ -39,7 +39,7 @@ pluginManagement {
// Add compose gradle plugin
plugins {
kotlin("multiplatform") version "1.6.10"
id("org.jetbrains.compose") version "1.0.1-rc2"
id("org.jetbrains.compose") version "1.1.0"
}
// Add maven repositories

4
web/gradle.properties

@ -1,5 +1,5 @@
COMPOSE_CORE_VERSION=1.1.0-alpha03
COMPOSE_WEB_VERSION=1.1.0-alpha03
COMPOSE_CORE_VERSION=1.1.0
COMPOSE_WEB_VERSION=1.1.0
compose.web.buildSamples=false
compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false

Loading…
Cancel
Save