Browse Source

Miggrate to 1.0.0-alpha4-build362 (#1205)

pull/1208/head
Igor Demin 3 years ago committed by GitHub
parent
commit
6fe8be049d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      components/VideoPlayer/demo/src/jvmMain/kotlin/org/jetbrains/compose/videoplayer/demo/Main.kt
  2. 2
      components/gradle.properties
  3. 2
      templates/desktop-template/build.gradle.kts
  4. 4
      templates/multiplatform-template/android/build.gradle.kts
  5. 2
      templates/multiplatform-template/build.gradle.kts
  6. 4
      templates/multiplatform-template/common/build.gradle.kts
  7. 2
      web/buildSrc/build.gradle.kts
  8. 2
      web/compose-compiler-integration/main-template/build.gradle.kts
  9. 4
      web/gradle.properties
  10. 2
      web/settings.gradle.kts

7
components/VideoPlayer/demo/src/jvmMain/kotlin/org/jetbrains/compose/videoplayer/demo/Main.kt

@ -1,18 +1,16 @@
package org.jetbrains.compose.videoplayer.demo package org.jetbrains.compose.videoplayer.demo
import androidx.compose.desktop.DesktopTheme
import androidx.compose.desktop.Window
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.window.singleWindowApplication
import org.jetbrains.compose.videoplayer.VideoPlayer import org.jetbrains.compose.videoplayer.VideoPlayer
fun main() { fun main() {
Window( singleWindowApplication(
title = "Video Player", title = "Video Player",
size = IntSize(800, 800) size = IntSize(800, 800)
) { ) {
MaterialTheme { MaterialTheme {
DesktopTheme {
VideoPlayer( VideoPlayer(
url = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4", url = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
width = 640, width = 640,
@ -21,4 +19,3 @@ fun main() {
} }
} }
} }
}

2
components/gradle.properties

@ -4,4 +4,4 @@ android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.0.0-alpha4-build328 compose.version=1.0.0-alpha4-build362

2
templates/desktop-template/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.31" kotlin("jvm") version "1.5.31"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __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 { repositories {

4
templates/multiplatform-template/android/build.gradle.kts

@ -5,11 +5,11 @@ plugins {
} }
android { android {
compileSdkVersion(30) compileSdkVersion(31)
defaultConfig { defaultConfig {
minSdkVersion(21) minSdkVersion(21)
targetSdkVersion(30) targetSdkVersion(31)
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
} }

2
templates/multiplatform-template/build.gradle.kts

@ -1,6 +1,6 @@
buildscript { buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __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 { repositories {
mavenCentral() mavenCentral()

4
templates/multiplatform-template/common/build.gradle.kts

@ -30,11 +30,11 @@ kotlin {
} }
android { android {
compileSdkVersion(30) compileSdkVersion(31)
defaultConfig { defaultConfig {
minSdkVersion(21) minSdkVersion(21)
targetSdkVersion(30) targetSdkVersion(31)
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
} }

2
web/buildSrc/build.gradle.kts

@ -10,5 +10,5 @@ repositories {
} }
plugins { plugins {
id("org.jetbrains.kotlin.jvm") version "1.5.30" id("org.jetbrains.kotlin.jvm") version "1.5.31"
} }

2
web/compose-compiler-integration/main-template/build.gradle.kts

@ -1,5 +1,5 @@
plugins { plugins {
kotlin("multiplatform") version "1.5.30" kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") id("org.jetbrains.compose")
} }

4
web/gradle.properties

@ -1,6 +1,6 @@
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_CORE_VERSION=1.0.0-alpha4-build348 COMPOSE_CORE_VERSION=1.0.0-alpha4-build362
COMPOSE_WEB_VERSION=1.0.0-alpha4-build348 COMPOSE_WEB_VERSION=1.0.0-alpha4-build362
compose.web.buildSamples=false compose.web.buildSamples=false
compose.web.tests.integration.withFirefox compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false compose.web.tests.skip.benchmarks=false

2
web/settings.gradle.kts

@ -18,7 +18,7 @@ pluginManagement {
println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}") println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}")
useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${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") { } 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")
} }
} }
} }

Loading…
Cancel
Save