diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 4f1fed2253..44c7d60417 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.0.0 +compose.version=1.0.1-rc2 kotlin.code.style=official diff --git a/components/gradle.properties b/components/gradle.properties index b9582acb89..e6f23541f2 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 \ No newline at end of file +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/compose/frameworks/support b/compose/frameworks/support index e2a3108b92..7dce7a026b 160000 --- a/compose/frameworks/support +++ b/compose/frameworks/support @@ -1 +1 @@ -Subproject commit e2a3108b92d4c54b5780f9eeceb1712845961cd7 +Subproject commit 7dce7a026bf977363d8ab85c407e6efab36f856a diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 5f7597d432..53cd8cde1a 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -19,6 +19,6 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -kotlin.version=1.5.31 +kotlin.version=1.6.10 agp.version=4.2.2 -compose.version=1.0.0 +compose.version=1.0.1-rc2 diff --git a/examples/falling-balls-web/gradle.properties b/examples/falling-balls-web/gradle.properties index a161a21c41..09a8915b34 100644 --- a/examples/falling-balls-web/gradle.properties +++ b/examples/falling-balls-web/gradle.properties @@ -1,2 +1,2 @@ -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index 06bacfe25f..e09f731866 100644 --- a/examples/falling-balls/gradle.properties +++ b/examples/falling-balls/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Tooltip.kt b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Tooltip.kt index c13605ab08..4cee5684fc 100644 --- a/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Tooltip.kt +++ b/examples/imageviewer/common/src/desktopMain/kotlin/example/imageviewer/view/Tooltip.kt @@ -1,6 +1,7 @@ package example.imageviewer.view import androidx.compose.foundation.BoxWithTooltip +import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.TooltipArea import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -12,6 +13,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +@OptIn(ExperimentalFoundationApi::class) @Composable fun Tooltip( text: String = "Tooltip", @@ -33,4 +35,4 @@ fun Tooltip( ) { content() } -} \ No newline at end of file +} diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 5f7597d432..53cd8cde1a 100755 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -19,6 +19,6 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -kotlin.version=1.5.31 +kotlin.version=1.6.10 agp.version=4.2.2 -compose.version=1.0.0 +compose.version=1.0.1-rc2 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index 06bacfe25f..e09f731866 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index fc41fc8e48..9cc269d6ad 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -19,6 +19,6 @@ kotlin.code.style=official android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -kotlin.version=1.5.31 +kotlin.version=1.6.10 agp.version=4.2.2 -compose.version=1.0.0 +compose.version=1.0.1-rc2 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 999cde62e9..a33aa2d639 100644 --- a/examples/notepad/gradle.properties +++ b/examples/notepad/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 5f7597d432..53cd8cde1a 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -19,6 +19,6 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -kotlin.version=1.5.31 +kotlin.version=1.6.10 agp.version=4.2.2 -compose.version=1.0.0 +compose.version=1.0.1-rc2 diff --git a/examples/todoapp/buildSrc/gradle.properties b/examples/todoapp/buildSrc/gradle.properties index a161a21c41..09a8915b34 100755 --- a/examples/todoapp/buildSrc/gradle.properties +++ b/examples/todoapp/buildSrc/gradle.properties @@ -1,2 +1,2 @@ -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index 8d00bb2f2a..e09f731866 100644 --- a/examples/visual-effects/gradle.properties +++ b/examples/visual-effects/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 \ No newline at end of file +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties index 8b9727b436..417a2d5b9e 100644 --- a/examples/web-compose-bird/gradle.properties +++ b/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.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties index 06bacfe25f..e09f731866 100644 --- a/examples/web-landing/gradle.properties +++ b/examples/web-landing/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties index 06bacfe25f..e09f731866 100644 --- a/examples/web-with-react/gradle.properties +++ b/examples/web-with-react/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index b728e12c2b..a44945beaa 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -19,6 +19,6 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 agp.version=4.2.2 diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt index 2a39d3496b..2c4e9cd38d 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt @@ -7,6 +7,7 @@ package org.jetbrains.compose.test @Suppress("EnumEntryName") enum class TestKotlinVersion(val versionString: String) { - Default("1.5.31"), + Default("1.6.10"), + V1_5_31("1.5.31"), V1_5_20("1.5.20") -} \ No newline at end of file +} diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 7ebd48084e..0b41d54add 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -5,7 +5,7 @@ kotlin.code.style=official # that will be used by published Gradle plugin, # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # -compose.version=1.0.0 +compose.version=1.0.1-rc2 compose.with.web=false # A version of Gradle plugin, that will be published, diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties index 431cc21904..a33aa2d639 100644 --- a/templates/desktop-template/gradle.properties +++ b/templates/desktop-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 \ No newline at end of file +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index dba9f49d9c..b347fb5a00 100644 --- a/templates/multiplatform-template/gradle.properties +++ b/templates/multiplatform-template/gradle.properties @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -kotlin.version=1.5.31 +kotlin.version=1.6.10 agp.version=4.2.2 -compose.version=1.0.0 +compose.version=1.0.1-rc2 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 431cc21904..a33aa2d639 100644 --- a/templates/web-template/gradle.properties +++ b/templates/web-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.5.31 -compose.version=1.0.0 \ No newline at end of file +kotlin.version=1.6.10 +compose.version=1.0.1-rc2 diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index a5435677f7..7c9963d6de 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -43,8 +43,8 @@ just search for "Compose Multiplatform". The Compose plugin version used in the wizard above may be not the last. Update the version of the plugin to the latest available by editing the `build.gradle.kts` file, finding and updating the version information as shown below. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site. ``` plugins { - kotlin("jvm") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0" + kotlin("jvm") version "1.6.10" + id("org.jetbrains.compose") version "1.0.1-rc2" } ``` @@ -79,8 +79,8 @@ Then create `build.gradle.kts` with the following content: import org.jetbrains.compose.compose plugins { - kotlin("jvm") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0" + kotlin("jvm") version "1.6.10" + id("org.jetbrains.compose") version "1.0.1-rc2" } repositories { diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md index 1e8f89006f..13073810ba 100644 --- a/tutorials/Web/Getting_Started/README.md +++ b/tutorials/Web/Getting_Started/README.md @@ -38,8 +38,8 @@ pluginManagement { ``` kotlin // Add compose gradle plugin plugins { - kotlin("multiplatform") version "1.5.31" - id("org.jetbrains.compose") version "1.0.0" + kotlin("multiplatform") version "1.6.10" + id("org.jetbrains.compose") version "1.0.1-rc2" } // Add maven repositories diff --git a/web/buildSrc/build.gradle.kts b/web/buildSrc/build.gradle.kts index b8e067c579..c14d462ef7 100644 --- a/web/buildSrc/build.gradle.kts +++ b/web/buildSrc/build.gradle.kts @@ -1,8 +1,8 @@ repositories { gradlePluginPortal() mavenCentral() - maven { - url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") + maven { + url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } maven { url = uri("https://packages.jetbrains.team/maven/p/ui/dev") @@ -10,15 +10,15 @@ repositories { } plugins { - id("org.jetbrains.kotlin.jvm") version "1.5.31" + id("org.jetbrains.kotlin.jvm") version "1.6.10" } java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -} +} dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") } diff --git a/web/compose-compiler-integration/README.md b/web/compose-compiler-integration/README.md index 8bbe517667..f8d63f0094 100644 --- a/web/compose-compiler-integration/README.md +++ b/web/compose-compiler-integration/README.md @@ -2,7 +2,7 @@ RUN from project root directory: `./gradlew :compose-compiler-integration:checkComposeCases` To use specific version: -`./gradlew :compose-compiler-integration:checkComposeCases -PCOMPOSE_CORE_VERSION=1.0.0 -PCOMPOSE_WEB_VERSION=1.0.0 +`./gradlew :compose-compiler-integration:checkComposeCases -PCOMPOSE_CORE_VERSION=1.0.1-rc2 -PCOMPOSE_WEB_VERSION=1.0.1-rc2 To fun only filtered cases (check for contained in file path): `./gradlew :compose-compiler-integration:checkComposeCases -PFILTER_CASES=CaseName` diff --git a/web/compose-compiler-integration/main-template/build.gradle.kts b/web/compose-compiler-integration/main-template/build.gradle.kts index 9c95cf1d30..ac0f279081 100644 --- a/web/compose-compiler-integration/main-template/build.gradle.kts +++ b/web/compose-compiler-integration/main-template/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.5.31" + kotlin("multiplatform") version "1.6.10" id("org.jetbrains.compose") } diff --git a/web/compose-compiler-integration/testcases/failing/ComposableWithNullableTypeParameter.kt b/web/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt similarity index 100% rename from web/compose-compiler-integration/testcases/failing/ComposableWithNullableTypeParameter.kt rename to web/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt diff --git a/web/gradle.properties b/web/gradle.properties index f0c428cfe8..28ed16ed3c 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,5 +1,5 @@ -COMPOSE_CORE_VERSION=1.0.0 -COMPOSE_WEB_VERSION=1.0.0 +COMPOSE_CORE_VERSION=1.0.1-rc2 +COMPOSE_WEB_VERSION=1.0.1-rc2 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt index b2027c33e8..d2887fd062 100644 --- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt +++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt @@ -14,6 +14,7 @@ import kotlinx.browser.window import kotlinx.coroutines.MainScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.jetbrains.compose.web.ExperimentalComposeWebStyleApi import org.jetbrains.compose.web.attributes.* import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.* @@ -119,6 +120,7 @@ fun Counter(value: Int) { } } +@OptIn(ExperimentalComposeWebStyleApi::class) fun main() { val urlParams = URLSearchParams(window.location.search) diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index 3952ebb776..ba5d2c96ed 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -17,7 +17,7 @@ pluginManagement { } val localProperties: java.util.Properties? = properties("local.properties") - + val repos = (localProperties?.getProperty("compose.web.repos"))?.split(File.pathSeparator) @@ -46,7 +46,7 @@ pluginManagement { if (requested.id.id == "org.jetbrains.compose") { useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:$COMPOSE_CORE_VERSION") } else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") { - useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.31") + useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.10") } } } diff --git a/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js b/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js index 139fc782e4..01cc1a8a1d 100644 --- a/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js +++ b/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js @@ -1,6 +1,6 @@ // This is a workaround for https://github.com/karma-runner/karma-teamcity-reporter/issues/86 -const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.5.31/karma-kotlin-reporter"); +const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.6.10/karma-kotlin-reporter"); const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];