Add ui-backhandler dependency to compose dependencies, update shadow jar plugin, and code cleanup

gradle-plugins/build.gradle.kts

@@ -55,7 +55,7 @@ subprojects {
 
                 maven {
                     name = "LocalDir"
-                    url = rootProject.buildDir.resolve("repo").toURI()
+                    url = uri(layout.buildDirectory.dir("repo"))
                 }
             }
         }
@@ -96,7 +96,7 @@ fun Project.configureMavenPublication(
                 licenses {
                     license {
                         name.set("The Apache License, Version 2.0")
-                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                        url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
                     }
                 }
             }

gradle-plugins/buildSrc/src/main/kotlin/gradleUtils.kt

@@ -3,7 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
  */
 
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.dsl.DependencyHandler
@@ -14,20 +13,14 @@ import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.testing.Test
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.jvm.toolchain.JavaToolchainService
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
-import java.io.File
 
 inline fun <reified T> Project.configureIfExists(fn: T.() -> Unit) {
     extensions.findByType(T::class.java)?.fn()
 }
 
-val isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows
-
 fun Project.configureAllTests(fn: Test.() -> Unit = {}) {
     fun DependencyHandler.testImplementation(notation: Any) =
         add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, notation)
@@ -47,12 +40,6 @@ fun Project.configureAllTests(fn: Test.() -> Unit = {}) {
     }
 }
 
-fun Test.systemProperties(map: Map<String, Any>) {
-    for ((k, v) in map) {
-        systemProperty(k, v)
-    }
-}
-
 fun TaskProvider<*>.dependsOn(vararg dependencies: Any) {
     configure {
         dependsOn(dependencies)
@@ -71,4 +58,4 @@ inline fun <reified T : Task> TaskContainer.registerVerificationTask(
     }
 
 val Provider<out Jar>.archiveFile: Provider<RegularFile>
-    get() = flatMap { it.archiveFile }
+    get() = flatMap { it.archiveFile }

gradle-plugins/compose/build.gradle.kts

@@ -39,7 +39,7 @@ sourceSets.main.configure {
     java.srcDir(buildConfig.flatMap { it.generatedOutputDir })
 }
 
-val embeddedDependencies by configurations.creating {
+val embeddedDependencies: Configuration by configurations.creating {
     isTransitive = false
 }
 
@@ -74,22 +74,22 @@ dependencies {
 
 val packagesToRelocate = listOf("de.undercouch", "com.squareup.kotlinpoet")
 
-val shadow = tasks.named<ShadowJar>("shadowJar") {
+val shadowJar = tasks.named<ShadowJar>("shadowJar") {
     for (packageToRelocate in packagesToRelocate) {
         relocate(packageToRelocate, "org.jetbrains.compose.internal.$packageToRelocate")
     }
-    archiveBaseName.set("shadow")
-    archiveClassifier.set("")
-    archiveVersion.set("")
+    archiveBaseName = "shadow"
+    archiveClassifier = ""
+    archiveVersion = ""
     configurations = listOf(embeddedDependencies)
     exclude("META-INF/gradle-plugins/de.undercouch.download.properties")
     exclude("META-INF/versions/**")
 }
 
 val jar = tasks.named<Jar>("jar") {
-    dependsOn(shadow)
-    from(zipTree(shadow.get().archiveFile))
-    this.duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    dependsOn(shadowJar)
+    from(zipTree(shadowJar.get().archiveFile))
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 val supportedGradleVersions = project.propertyList("compose.tests.gradle.versions")
@@ -148,7 +148,6 @@ for (jdkVersion in jdkVersionsForTests) {
     }
     val unpackJdkTask = tasks.register("unpackJdk$jdkVersion", Copy::class) {
         dependsOn(downloadJdkTask)
-        val archive = archive
         val archiveTree = when {
             archive.name.endsWith(".tar.gz") -> tarTree(archive)
             archive.name.endsWith(".zip") -> zipTree(archive)

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

@@ -30,8 +30,6 @@ import org.jetbrains.compose.web.internal.configureWeb
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
-internal val composeVersion get() = ComposeBuildConfig.composeVersion
-
 abstract class ComposePlugin : Plugin<Project> {
     override fun apply(project: Project) {
         val composeExtension = project.extensions.create("compose", ComposeExtension::class.java, project)
@@ -63,46 +61,56 @@ abstract class ComposePlugin : Plugin<Project> {
         }
     }
 
+    // Please sort them in the order of stable, experimental, and deprecated,
+    // and keep them in alphabetical order.
+    // Thus make it easier to find a missing dependency.
     @Suppress("DEPRECATION")
     class Dependencies(project: Project) {
-        val desktop = DesktopDependencies
         val compiler = CompilerDependencies(project)
-        val animation get() = composeDependency("org.jetbrains.compose.animation:animation")
-        val animationGraphics get() = composeDependency("org.jetbrains.compose.animation:animation-graphics")
-        val foundation get() = composeDependency("org.jetbrains.compose.foundation:foundation")
-        val material get() = composeDependency("org.jetbrains.compose.material:material")
-        val material3 get() = composeDependency("org.jetbrains.compose.material3:material3")
-        val material3AdaptiveNavigationSuite get() = composeDependency("org.jetbrains.compose.material3:material3-adaptive-navigation-suite")
-        val runtime get() = composeDependency("org.jetbrains.compose.runtime:runtime")
-        val runtimeSaveable get() = composeDependency("org.jetbrains.compose.runtime:runtime-saveable")
-        val ui get() = composeDependency("org.jetbrains.compose.ui:ui")
-        @Deprecated("Use desktop.uiTestJUnit4", replaceWith = ReplaceWith("desktop.uiTestJUnit4"))
+        val components = CommonComponentsDependencies
+        val desktop = DesktopDependencies
+        val html: HtmlDependencies = HtmlDependencies
+
+        val animation = composeDependency("org.jetbrains.compose.animation:animation")
+        val animationGraphics = composeDependency("org.jetbrains.compose.animation:animation-graphics")
+        val foundation = composeDependency("org.jetbrains.compose.foundation:foundation")
+        val material3 = composeDependency("org.jetbrains.compose.material3:material3")
+        val material3AdaptiveNavigationSuite = composeDependency("org.jetbrains.compose.material3:material3-adaptive-navigation-suite")
+        val material = composeDependency("org.jetbrains.compose.material:material")
+        val materialIconsExtended = "org.jetbrains.compose.material:material-icons-extended:1.7.3"
+        val preview = composeDependency("org.jetbrains.compose.ui:ui-tooling-preview")
+        val runtime = composeDependency("org.jetbrains.compose.runtime:runtime")
+        val runtimeSaveable = composeDependency("org.jetbrains.compose.runtime:runtime-saveable")
+        val ui = composeDependency("org.jetbrains.compose.ui:ui")
+        val uiTooling = composeDependency("org.jetbrains.compose.ui:ui-tooling")
+        val uiUtil = composeDependency("org.jetbrains.compose.ui:ui-util")
+
         @ExperimentalComposeLibrary
-        val uiTestJUnit4 get() = composeDependency("org.jetbrains.compose.ui:ui-test-junit4")
+        val uiBackHandler = composeDependency("org.jetbrains.compose.ui:ui-backhandler")
+
         @ExperimentalComposeLibrary
-        val uiTest get() = composeDependency("org.jetbrains.compose.ui:ui-test")
-        val uiTooling get() = composeDependency("org.jetbrains.compose.ui:ui-tooling")
-        val uiUtil get() = composeDependency("org.jetbrains.compose.ui:ui-util")
-        val preview get() = composeDependency("org.jetbrains.compose.ui:ui-tooling-preview")
-        val materialIconsExtended get() = "org.jetbrains.compose.material:material-icons-extended:1.7.3"
-        val components get() = CommonComponentsDependencies
+        val uiTest = composeDependency("org.jetbrains.compose.ui:ui-test")
+
         @Deprecated("Use compose.html", replaceWith = ReplaceWith("html"))
         val web: WebDependencies get() = WebDependencies
-        val html: HtmlDependencies get() = HtmlDependencies
+
+        @Deprecated("Use desktop.uiTestJUnit4", replaceWith = ReplaceWith("desktop.uiTestJUnit4"))
+        @ExperimentalComposeLibrary
+        val uiTestJUnit4 = composeDependency("org.jetbrains.compose.ui:ui-test-junit4")
     }
 
     object DesktopDependencies {
         val components = DesktopComponentsDependencies
 
         val common = composeDependency("org.jetbrains.compose.desktop:desktop")
-        val linux_x64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-linux-x64")
         val linux_arm64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-linux-arm64")
-        val windows_x64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-windows-x64")
-        val windows_arm64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-windows-arm64")
-        val macos_x64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-macos-x64")
+        val linux_x64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-linux-x64")
         val macos_arm64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-macos-arm64")
+        val macos_x64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-macos-x64")
+        val windows_arm64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-windows-arm64")
+        val windows_x64 = composeDependency("org.jetbrains.compose.desktop:desktop-jvm-windows-x64")
 
-        val uiTestJUnit4 get() = composeDependency("org.jetbrains.compose.ui:ui-test-junit4")
+        val uiTestJUnit4 = composeDependency("org.jetbrains.compose.ui:ui-test-junit4")
 
         val currentOs by lazy {
             composeDependency("org.jetbrains.compose.desktop:desktop-jvm-${currentTarget.id}")
@@ -111,7 +119,7 @@ abstract class ComposePlugin : Plugin<Project> {
 
     class CompilerDependencies(private val project: Project) {
         fun forKotlin(version: String) = "org.jetbrains.compose.compiler:compiler:" +
-                ComposeCompilerCompatibility.compilerVersionFor(version)
+            ComposeCompilerCompatibility.compilerVersionFor(version)
 
         /**
          * Compose Compiler that is chosen by the version of Kotlin applied to the Gradle project
@@ -126,39 +134,23 @@ abstract class ComposePlugin : Plugin<Project> {
 
     object DesktopComponentsDependencies {
         @ExperimentalComposeLibrary
-        val splitPane = composeDependency("org.jetbrains.compose.components:components-splitpane")
+        val animatedImage = composeDependency("org.jetbrains.compose.components:components-animatedimage")
 
         @ExperimentalComposeLibrary
-        val animatedImage = composeDependency("org.jetbrains.compose.components:components-animatedimage")
+        val splitPane = composeDependency("org.jetbrains.compose.components:components-splitpane")
     }
 
     @Deprecated("Use compose.html")
     object WebDependencies {
-        val core by lazy {
-            composeDependency("org.jetbrains.compose.html:html-core")
-        }
-
-        val svg by lazy {
-            composeDependency("org.jetbrains.compose.html:html-svg")
-        }
-
-        val testUtils by lazy {
-            composeDependency("org.jetbrains.compose.html:html-test-utils")
-        }
+        val core = composeDependency("org.jetbrains.compose.html:html-core")
+        val svg = composeDependency("org.jetbrains.compose.html:html-svg")
+        val testUtils = composeDependency("org.jetbrains.compose.html:html-test-utils")
     }
 
     object HtmlDependencies {
-        val core by lazy {
-            composeDependency("org.jetbrains.compose.html:html-core")
-        }
-
-        val svg by lazy {
-            composeDependency("org.jetbrains.compose.html:html-svg")
-        }
-
-        val testUtils by lazy {
-            composeDependency("org.jetbrains.compose.html:html-test-utils")
-        }
+        val core = composeDependency("org.jetbrains.compose.html:html-core")
+        val svg = composeDependency("org.jetbrains.compose.html:html-svg")
+        val testUtils = composeDependency("org.jetbrains.compose.html:html-test-utils")
     }
 }
 
@@ -169,7 +161,7 @@ fun KotlinDependencyHandler.compose(groupWithArtifact: String) = composeDependen
 
 fun DependencyHandler.compose(groupWithArtifact: String) = composeDependency(groupWithArtifact)
 
-private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion"
+private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:${ComposeBuildConfig.composeVersion}"
 
 private fun setUpGroovyDslExtensions(project: Project) {
     project.plugins.withId("org.jetbrains.kotlin.multiplatform") {

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalExtension.kt

@@ -7,21 +7,21 @@ package org.jetbrains.compose.experimental.dsl
 
 import org.gradle.api.Action
 import org.gradle.api.model.ObjectFactory
+import org.jetbrains.compose.internal.DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION
 import javax.inject.Inject
 
 abstract class ExperimentalExtension @Inject constructor(
     objects: ObjectFactory
 ) {
-
+    @Suppress("DEPRECATION")
     @Deprecated(
-        message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.",
+        message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION,
     )
     val web: ExperimentalWebExtension = objects.newInstance(ExperimentalWebExtension::class.java)
 
+    @Suppress("DEPRECATION")
     @Deprecated(
-        message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore."
+        message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION,
     )
-    fun web(action: Action<ExperimentalWebExtension>) {
-        action.execute(web)
-    }
-}
+    fun web(action: Action<ExperimentalWebExtension>): Unit = action.execute(web)
+}

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebApplication.kt

@@ -5,14 +5,12 @@
 
 package org.jetbrains.compose.experimental.dsl
 
+import org.jetbrains.compose.internal.DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION
 import javax.inject.Inject
 
 @Deprecated(
-    message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.",
+    message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION,
+)
+abstract class ExperimentalWebApplication @Inject constructor(
+    @Suppress("unused") val name: String,
 )
-abstract class ExperimentalWebApplication  @Inject constructor(
-    @Suppress("unused")
-    val name: String,
-) {
-
-}

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebExtension.kt

@@ -8,27 +8,24 @@ package org.jetbrains.compose.experimental.dsl
 import org.gradle.api.Action
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.ExtensionAware
+import org.jetbrains.compose.internal.DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION
 import javax.inject.Inject
 
 @Deprecated(
-    message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.",
+    message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION,
 )
 abstract class ExperimentalWebExtension @Inject constructor(private val objectFactory: ObjectFactory) : ExtensionAware {
-    internal var _isApplicationInitialized = false
-        private set
-
+    @Suppress("DEPRECATION")
     @Deprecated(
-        message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.",
+        message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION,
     )
     val application: ExperimentalWebApplication by lazy {
-        _isApplicationInitialized = true
         objectFactory.newInstance(ExperimentalWebApplication::class.java, "main")
     }
 
+    @Suppress("DEPRECATION")
     @Deprecated(
-        message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.",
+        message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION,
     )
-    fun application(fn: Action<ExperimentalWebApplication>) {
-        fn.execute(application)
-    }
+    fun application(fn: Action<ExperimentalWebApplication>): Unit = fn.execute(application)
 }

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/tasks/ExperimentalUnpackSkikoWasmRuntimeTask.kt

@@ -5,10 +5,11 @@
 
 package org.jetbrains.compose.experimental.web.tasks
 
+import org.jetbrains.compose.internal.DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB
 import org.jetbrains.compose.web.tasks.UnpackSkikoWasmRuntimeTask
 
 @Deprecated(
-    message = "Starting from 1.6.10 Compose for Web goes to Alpha",
+    message = DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB,
     replaceWith = ReplaceWith("UnpackSkikoWasmRuntimeTask")
 )
-abstract class ExperimentalUnpackSkikoWasmRuntimeTask : UnpackSkikoWasmRuntimeTask()
+abstract class ExperimentalUnpackSkikoWasmRuntimeTask : UnpackSkikoWasmRuntimeTask()

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/constants.kt

@@ -11,4 +11,9 @@ internal const val KOTLIN_ANDROID_PLUGIN_ID = "org.jetbrains.kotlin.android"
 internal const val KOTLIN_JS_PLUGIN_ID = "org.jetbrains.kotlin.js"
 internal const val COMPOSE_PLUGIN_ID = "org.jetbrains.compose"
 
-internal const val IDEA_IMPORT_TASK_NAME = "prepareKotlinIdeaImport"
+internal const val IDEA_IMPORT_TASK_NAME = "prepareKotlinIdeaImport"
+
+internal const val DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB: String =
+    "Starting from 1.6.10, Compose for Web goes to Alpha."
+internal const val DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB_IN_CONFIGURATION: String =
+    DEPRECATED_EXPERIMENTAL_MESSAGE_FOR_WEB + "Experimental configuration is not needed anymore."

gradle-plugins/gradle/libs.versions.toml

@@ -3,7 +3,7 @@ kotlin = "2.0.0"
 gradle-download-plugin = "5.5.0"
 kotlin-poet = "1.16.0"
 plugin-android = "8.8.0-alpha08"
-shadow-jar = "8.1.1"
+shadow-jar = "8.3.6"
 publish-plugin = "1.2.1"
 
 [libraries]
@@ -15,5 +15,5 @@ plugin-android-api = { module = "com.android.tools.build:gradle-api", version.re
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 download = { id = "de.undercouch.download", version.ref = "gradle-download-plugin" }
-shadow-jar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-jar" }
+shadow-jar = { id = "com.gradleup.shadow", version.ref = "shadow-jar" }
 publish-plugin = { id = "com.gradle.plugin-publish", version.ref = "publish-plugin" }