From 6fe8be049d0a4f35e3340e1c07493a951516abab Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Tue, 28 Sep 2021 10:38:21 +0300 Subject: [PATCH] Miggrate to 1.0.0-alpha4-build362 (#1205) --- .../jetbrains/compose/videoplayer/demo/Main.kt | 17 +++++++---------- components/gradle.properties | 2 +- templates/desktop-template/build.gradle.kts | 2 +- .../android/build.gradle.kts | 4 ++-- .../multiplatform-template/build.gradle.kts | 2 +- .../common/build.gradle.kts | 4 ++-- web/buildSrc/build.gradle.kts | 2 +- .../main-template/build.gradle.kts | 2 +- web/gradle.properties | 4 ++-- web/settings.gradle.kts | 2 +- 10 files changed, 19 insertions(+), 22 deletions(-) diff --git a/components/VideoPlayer/demo/src/jvmMain/kotlin/org/jetbrains/compose/videoplayer/demo/Main.kt b/components/VideoPlayer/demo/src/jvmMain/kotlin/org/jetbrains/compose/videoplayer/demo/Main.kt index 22a41231bd..6e4224f1e1 100644 --- a/components/VideoPlayer/demo/src/jvmMain/kotlin/org/jetbrains/compose/videoplayer/demo/Main.kt +++ b/components/VideoPlayer/demo/src/jvmMain/kotlin/org/jetbrains/compose/videoplayer/demo/Main.kt @@ -1,24 +1,21 @@ package org.jetbrains.compose.videoplayer.demo -import androidx.compose.desktop.DesktopTheme -import androidx.compose.desktop.Window import androidx.compose.material.MaterialTheme import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.window.singleWindowApplication import org.jetbrains.compose.videoplayer.VideoPlayer fun main() { - Window( + singleWindowApplication( title = "Video Player", size = IntSize(800, 800) ) { MaterialTheme { - DesktopTheme { - VideoPlayer( - url = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4", - width = 640, - height = 480 - ) - } + VideoPlayer( + url = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4", + width = 640, + height = 480 + ) } } } diff --git a/components/gradle.properties b/components/gradle.properties index b6eb615666..2bebda45ca 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.0.0-alpha4-build328 +compose.version=1.0.0-alpha4-build362 diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index f6c71177b3..6b11cac181 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.5.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha4-build361") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha4-build362") } repositories { diff --git a/templates/multiplatform-template/android/build.gradle.kts b/templates/multiplatform-template/android/build.gradle.kts index 31c84584d8..acfacd2537 100644 --- a/templates/multiplatform-template/android/build.gradle.kts +++ b/templates/multiplatform-template/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdkVersion(30) + compileSdkVersion(31) defaultConfig { minSdkVersion(21) - targetSdkVersion(30) + targetSdkVersion(31) versionCode = 1 versionName = "1.0" } diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 633ab9cc6b..a88713839d 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha4-build328" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha4-build362" repositories { mavenCentral() diff --git a/templates/multiplatform-template/common/build.gradle.kts b/templates/multiplatform-template/common/build.gradle.kts index 4edeb03b78..e95f8fe293 100644 --- a/templates/multiplatform-template/common/build.gradle.kts +++ b/templates/multiplatform-template/common/build.gradle.kts @@ -30,11 +30,11 @@ kotlin { } android { - compileSdkVersion(30) + compileSdkVersion(31) defaultConfig { minSdkVersion(21) - targetSdkVersion(30) + targetSdkVersion(31) versionCode = 1 versionName = "1.0" } diff --git a/web/buildSrc/build.gradle.kts b/web/buildSrc/build.gradle.kts index 30162436e7..b65c16f4d4 100644 --- a/web/buildSrc/build.gradle.kts +++ b/web/buildSrc/build.gradle.kts @@ -10,5 +10,5 @@ repositories { } plugins { - id("org.jetbrains.kotlin.jvm") version "1.5.30" + id("org.jetbrains.kotlin.jvm") version "1.5.31" } diff --git a/web/compose-compiler-integration/main-template/build.gradle.kts b/web/compose-compiler-integration/main-template/build.gradle.kts index 2f3e62f08b..9c95cf1d30 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.30" + kotlin("multiplatform") version "1.5.31" id("org.jetbrains.compose") } diff --git a/web/gradle.properties b/web/gradle.properties index c1ff05201d..4001b68da7 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,6 +1,6 @@ # __LATEST_COMPOSE_RELEASE_VERSION__ -COMPOSE_CORE_VERSION=1.0.0-alpha4-build348 -COMPOSE_WEB_VERSION=1.0.0-alpha4-build348 +COMPOSE_CORE_VERSION=1.0.0-alpha4-build362 +COMPOSE_WEB_VERSION=1.0.0-alpha4-build362 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index 530d042824..3535906f97 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -18,7 +18,7 @@ pluginManagement { println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}") useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${extra["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.30") + useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.31") } } }