From 12afbe59a8fdd95248644b2d6d6bb5a30bb176f8 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Wed, 31 Jan 2024 16:46:59 +0100 Subject: [PATCH] add verification-metadata.xml file to verify vlcj artifacts (#4159) Update kotlin and dependencies and add verification-metadata.xml file to verify vlcj artifacts --------- Co-authored-by: Igor Demin --- .../VideoPlayer/library/build.gradle.kts | 2 +- .../compose/videoplayer/VideoPlayer.kt | 1 + experimental/components/build.gradle.kts | 22 +----- experimental/components/gradle.properties | 13 ++-- .../gradle/verification-metadata.xml | 67 +++++++++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- experimental/components/gradlew | 0 experimental/components/settings.gradle.kts | 20 ++++++ 8 files changed, 101 insertions(+), 26 deletions(-) create mode 100644 experimental/components/gradle/verification-metadata.xml mode change 100644 => 100755 experimental/components/gradlew diff --git a/experimental/components/VideoPlayer/library/build.gradle.kts b/experimental/components/VideoPlayer/library/build.gradle.kts index 7960e88a3c..902ba94d2a 100644 --- a/experimental/components/VideoPlayer/library/build.gradle.kts +++ b/experimental/components/VideoPlayer/library/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { } named("desktopMain") { dependencies { - implementation("uk.co.caprica:vlcj:4.7.0") + implementation("uk.co.caprica:vlcj:4.8.2") } } } diff --git a/experimental/components/VideoPlayer/library/src/commonMain/kotlin/org/jetbrains/compose/videoplayer/VideoPlayer.kt b/experimental/components/VideoPlayer/library/src/commonMain/kotlin/org/jetbrains/compose/videoplayer/VideoPlayer.kt index d9858f81df..f7094dffc7 100644 --- a/experimental/components/VideoPlayer/library/src/commonMain/kotlin/org/jetbrains/compose/videoplayer/VideoPlayer.kt +++ b/experimental/components/VideoPlayer/library/src/commonMain/kotlin/org/jetbrains/compose/videoplayer/VideoPlayer.kt @@ -31,6 +31,7 @@ fun VideoPlayer( onFinish = onFinish ) +@Composable internal expect fun VideoPlayerImpl( url: String, isResumed: Boolean, diff --git a/experimental/components/build.gradle.kts b/experimental/components/build.gradle.kts index d15b16f54a..7143c3e0e1 100644 --- a/experimental/components/build.gradle.kts +++ b/experimental/components/build.gradle.kts @@ -1,27 +1,11 @@ -buildscript { - val composeVersion = property("compose.version") - - repositories { - google() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } - - dependencies { - classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion") - classpath(kotlin("gradle-plugin", version = "1.5.31")) - } +plugins { + kotlin("multiplatform").apply(false) + id("org.jetbrains.compose").apply(false) } subprojects { version = findProperty("deploy.version") ?: property("compose.version")!! - repositories { - google() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } - plugins.withId("java") { configureIfExists { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/experimental/components/gradle.properties b/experimental/components/gradle.properties index f153c2b797..b961ea172b 100644 --- a/experimental/components/gradle.properties +++ b/experimental/components/gradle.properties @@ -1,5 +1,8 @@ -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -android.useAndroidX=true -android.enableJetifier=true -kotlin.code.style=official -compose.version=1.0.0 +org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M" +org.gradle.caching=true +org.gradle.configuration-cache=true + +compose.version=1.5.11 +kotlin.version=1.9.21 + +kotlin.code.style=official \ No newline at end of file diff --git a/experimental/components/gradle/verification-metadata.xml b/experimental/components/gradle/verification-metadata.xml new file mode 100644 index 0000000000..cea3054305 --- /dev/null +++ b/experimental/components/gradle/verification-metadata.xml @@ -0,0 +1,67 @@ + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/experimental/components/gradle/wrapper/gradle-wrapper.properties b/experimental/components/gradle/wrapper/gradle-wrapper.properties index 05679dc3c1..a595206642 100644 --- a/experimental/components/gradle/wrapper/gradle-wrapper.properties +++ b/experimental/components/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/experimental/components/gradlew b/experimental/components/gradlew old mode 100644 new mode 100755 diff --git a/experimental/components/settings.gradle.kts b/experimental/components/settings.gradle.kts index cda8fabd32..cab1154844 100644 --- a/experimental/components/settings.gradle.kts +++ b/experimental/components/settings.gradle.kts @@ -1,2 +1,22 @@ +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + } + + plugins { + kotlin("multiplatform").version(extra["kotlin.version"] as String) + id("org.jetbrains.compose").version(extra["compose.version"] as String) + } +} + +dependencyResolutionManagement { + repositories { + google() + mavenCentral() + } +} + include(":VideoPlayer:library") include(":VideoPlayer:demo") \ No newline at end of file