From 7c3fd3a56fa6763663f928f172a05246fe9461ca Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Thu, 12 Jan 2023 14:27:09 +0100 Subject: [PATCH] Manual versions update --- examples/codeviewer/android/build.gradle.kts | 4 ++-- examples/imageviewer/android/build.gradle.kts | 4 ++-- examples/issues/android/build.gradle.kts | 4 ++-- examples/todoapp-lite/android/build.gradle.kts | 4 ++-- examples/widgets-gallery/android/build.gradle.kts | 4 ++-- experimental/examples/chat-mpp/gradle.properties | 4 ++-- experimental/examples/codeviewer/gradle.properties | 4 ++-- .../examples/falling-balls-mpp/gradle.properties | 4 ++-- experimental/examples/imageviewer/gradle.properties | 4 ++-- experimental/examples/minesweeper/gradle.properties | 4 ++-- .../examples/todoapp-lite/gradle.properties | 4 ++-- .../examples/visual-effects/gradle.properties | 4 ++-- .../examples/widgets-gallery/gradle.properties | 4 ++-- web/buildSrc/gradle.properties | 3 ++- web/kotlin-js-store/yarn.lock | 13 +++++++++---- 15 files changed, 37 insertions(+), 31 deletions(-) diff --git a/examples/codeviewer/android/build.gradle.kts b/examples/codeviewer/android/build.gradle.kts index 13073d45fb..f5acc2a464 100644 --- a/examples/codeviewer/android/build.gradle.kts +++ b/examples/codeviewer/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 26 - targetSdk = 32 + targetSdk = 33 versionCode = 1 versionName = "1.0" } diff --git a/examples/imageviewer/android/build.gradle.kts b/examples/imageviewer/android/build.gradle.kts index d5807ca5f3..fed67b2b03 100755 --- a/examples/imageviewer/android/build.gradle.kts +++ b/examples/imageviewer/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 26 - targetSdk = 32 + targetSdk = 33 versionCode = 1 versionName = "1.0" } diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts index d5807ca5f3..fed67b2b03 100644 --- a/examples/issues/android/build.gradle.kts +++ b/examples/issues/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 26 - targetSdk = 32 + targetSdk = 33 versionCode = 1 versionName = "1.0" } diff --git a/examples/todoapp-lite/android/build.gradle.kts b/examples/todoapp-lite/android/build.gradle.kts index e479462fba..b3b4020d85 100755 --- a/examples/todoapp-lite/android/build.gradle.kts +++ b/examples/todoapp-lite/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 26 - targetSdk = 32 + targetSdk = 33 versionCode = 1 versionName = "1.0" } diff --git a/examples/widgets-gallery/android/build.gradle.kts b/examples/widgets-gallery/android/build.gradle.kts index 13073d45fb..f5acc2a464 100644 --- a/examples/widgets-gallery/android/build.gradle.kts +++ b/examples/widgets-gallery/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 26 - targetSdk = 32 + targetSdk = 33 versionCode = 1 versionName = "1.0" } diff --git a/experimental/examples/chat-mpp/gradle.properties b/experimental/examples/chat-mpp/gradle.properties index d589487b61..7a82d3311f 100644 --- a/experimental/examples/chat-mpp/gradle.properties +++ b/experimental/examples/chat-mpp/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.2.1 +compose.version=1.3.0-rc02 diff --git a/experimental/examples/codeviewer/gradle.properties b/experimental/examples/codeviewer/gradle.properties index ea83c74d6a..7a82d3311f 100644 --- a/experimental/examples/codeviewer/gradle.properties +++ b/experimental/examples/codeviewer/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.3.0-beta04-dev885 +compose.version=1.3.0-rc02 diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index d589487b61..7a82d3311f 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.2.1 +compose.version=1.3.0-rc02 diff --git a/experimental/examples/imageviewer/gradle.properties b/experimental/examples/imageviewer/gradle.properties index 48afff0860..e830ab9c66 100644 --- a/experimental/examples/imageviewer/gradle.properties +++ b/experimental/examples/imageviewer/gradle.properties @@ -12,7 +12,7 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.2.2 +compose.version=1.3.0-rc02 ktor.version=2.2.1 diff --git a/experimental/examples/minesweeper/gradle.properties b/experimental/examples/minesweeper/gradle.properties index ea83c74d6a..7a82d3311f 100644 --- a/experimental/examples/minesweeper/gradle.properties +++ b/experimental/examples/minesweeper/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.3.0-beta04-dev885 +compose.version=1.3.0-rc02 diff --git a/experimental/examples/todoapp-lite/gradle.properties b/experimental/examples/todoapp-lite/gradle.properties index d589487b61..7a82d3311f 100755 --- a/experimental/examples/todoapp-lite/gradle.properties +++ b/experimental/examples/todoapp-lite/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.2.1 +compose.version=1.3.0-rc02 diff --git a/experimental/examples/visual-effects/gradle.properties b/experimental/examples/visual-effects/gradle.properties index d589487b61..7a82d3311f 100644 --- a/experimental/examples/visual-effects/gradle.properties +++ b/experimental/examples/visual-effects/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.2.1 +compose.version=1.3.0-rc02 diff --git a/experimental/examples/widgets-gallery/gradle.properties b/experimental/examples/widgets-gallery/gradle.properties index d589487b61..7a82d3311f 100644 --- a/experimental/examples/widgets-gallery/gradle.properties +++ b/experimental/examples/widgets-gallery/gradle.properties @@ -12,6 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.7.20 +kotlin.version=1.8.0 agp.version=7.1.3 -compose.version=1.2.1 +compose.version=1.3.0-rc02 diff --git a/web/buildSrc/gradle.properties b/web/buildSrc/gradle.properties index bd827d7566..4d6a87f0d4 100644 --- a/web/buildSrc/gradle.properties +++ b/web/buildSrc/gradle.properties @@ -1 +1,2 @@ -kotlin.version=1.7.20 +kotlin.version=1.8.0 + diff --git a/web/kotlin-js-store/yarn.lock b/web/kotlin-js-store/yarn.lock index 2a60fedc5f..430dc06416 100644 --- a/web/kotlin-js-store/yarn.lock +++ b/web/kotlin-js-store/yarn.lock @@ -307,7 +307,12 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn@^8.4.1, acorn@^8.5.0: +acorn@^8.4.1: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== + +acorn@^8.5.0: version "8.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== @@ -917,9 +922,9 @@ engine.io@~6.2.0: ws "~8.2.3" enhanced-resolve@^5.9.3: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== + version "5.12.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" + integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0"