Move to 1.1.0 (#1882)
Co-authored-by: Roman Sedaikin <roman.sedaikin@jetbrains.com> Co-authored-by: Igor Demin <igordmn@gmail.com>
@@ -1,2 +1,2 @@
|
||||
compose.version=1.0.1-rc2
|
||||
compose.version=1.1.0
|
||||
kotlin.code.style=official
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
kotlin.code.style=official
|
||||
kotlin.version=1.6.10
|
||||
compose.version=1.0.1
|
||||
compose.version=1.1.0
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
kotlin.code.style=official
|
||||
kotlin.version=1.6.10
|
||||
compose.version=1.0.1
|
||||
compose.version=1.1.0
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -1,3 +1,3 @@
|
||||
kotlin.code.style=official
|
||||
kotlin.version=1.6.10
|
||||
compose.version=1.0.1
|
||||
compose.version=1.1.0
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
kotlin.code.style=official
|
||||
kotlin.version=1.6.10
|
||||
compose.version=1.0.1
|
||||
compose.version=1.1.0
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
kotlin.code.style=official
|
||||
kotlin.version=1.6.10
|
||||
compose.version=1.0.1
|
||||
compose.version=1.1.0
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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,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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||