diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index cc7fa0a122..086c529207 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -27,6 +27,7 @@ import org.jetbrains.compose.internal.utils.currentTarget import org.jetbrains.compose.resources.ResourcesExtension import org.jetbrains.compose.resources.configureComposeResources import org.jetbrains.compose.web.WebExtension +import org.jetbrains.compose.web.internal.configureWeb import org.jetbrains.kotlin.com.github.gundy.semver4j.SemVer import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile @@ -65,7 +66,7 @@ abstract class ComposePlugin : Plugin { project.afterEvaluate { configureDesktop(project, desktopExtension) - project.configureExperimental(composeExtension, experimentalExtension) + project.configureWeb(composeExtension) project.plugins.withId(KOTLIN_MPP_PLUGIN_ID) { val mppExt = project.mppExt project.configureExperimentalTargetsFlagsCheck(mppExt) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalExtension.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalExtension.kt index 8c4a809c3e..4144d7a420 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalExtension.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalExtension.kt @@ -12,7 +12,15 @@ import javax.inject.Inject abstract class ExperimentalExtension @Inject constructor( objects: ObjectFactory ) { + + @Deprecated( + message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.", + ) val web: ExperimentalWebExtension = objects.newInstance(ExperimentalWebExtension::class.java) + + @Deprecated( + message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore." + ) fun web(action: Action) { action.execute(web) } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebApplication.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebApplication.kt index 42b78fb40f..c9f4981998 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebApplication.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebApplication.kt @@ -7,6 +7,9 @@ package org.jetbrains.compose.experimental.dsl import javax.inject.Inject +@Deprecated( + message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.", +) abstract class ExperimentalWebApplication @Inject constructor( @Suppress("unused") val name: String, diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebExtension.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebExtension.kt index 04425696b8..5d8439f7db 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebExtension.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/dsl/ExperimentalWebExtension.kt @@ -10,15 +10,24 @@ import org.gradle.api.model.ObjectFactory import org.gradle.api.plugins.ExtensionAware import javax.inject.Inject +@Deprecated( + message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.", +) abstract class ExperimentalWebExtension @Inject constructor(private val objectFactory: ObjectFactory) : ExtensionAware { internal var _isApplicationInitialized = false private set + @Deprecated( + message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.", + ) val application: ExperimentalWebApplication by lazy { _isApplicationInitialized = true objectFactory.newInstance(ExperimentalWebApplication::class.java, "main") } + @Deprecated( + message = "Starting from 1.6.10, Compose for Web goes to Alpha. Experimental configuration is not needed anymore.", + ) fun application(fn: Action) { fn.execute(application) } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt index c7c3282671..a5bb901ee2 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt @@ -27,7 +27,6 @@ private val TargetType.gradlePropertyName get() = "org.jetbrains.compose.experim private val EXPERIMENTAL_TARGETS: Set = setOf( TargetType("macos", presets = listOf("macosX64", "macosArm64")), TargetType("jscanvas", presets = listOf("jsIr", "js")), - TargetType("wasm", presets = listOf("wasm", "wasmJs")), ) private sealed interface CheckResult { diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt deleted file mode 100644 index f900441e38..0000000000 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package org.jetbrains.compose.experimental.internal - -import org.gradle.api.Project -import org.jetbrains.compose.ComposeExtension -import org.jetbrains.compose.experimental.dsl.ExperimentalExtension -import org.jetbrains.compose.experimental.web.internal.configureExperimentalWebApplication -import org.jetbrains.compose.web.WebExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension - -internal fun Project.configureExperimental( - composeExt: ComposeExtension, - experimentalExt: ExperimentalExtension -) { - if (experimentalExt.web._isApplicationInitialized) { - val webExt = composeExt.extensions.getByType(WebExtension::class.java) - webExt.targetsToConfigure(project) - .configureExperimentalWebApplication(project, experimentalExt.web.application) - } -} diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/tasks/ExperimentalUnpackSkikoWasmRuntimeTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/tasks/ExperimentalUnpackSkikoWasmRuntimeTask.kt index 867f0efdc6..c627cde01d 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/tasks/ExperimentalUnpackSkikoWasmRuntimeTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/tasks/ExperimentalUnpackSkikoWasmRuntimeTask.kt @@ -5,46 +5,10 @@ package org.jetbrains.compose.experimental.web.tasks -import org.gradle.api.DefaultTask -import org.gradle.api.file.ArchiveOperations -import org.gradle.api.file.DirectoryProperty -import org.gradle.api.file.FileCollection -import org.gradle.api.file.FileSystemOperations -import org.gradle.api.tasks.InputFiles -import org.gradle.api.tasks.OutputDirectory -import org.gradle.api.tasks.TaskAction -import org.jetbrains.compose.internal.utils.clearDirs -import java.io.File -import javax.inject.Inject +import org.jetbrains.compose.web.tasks.UnpackSkikoWasmRuntimeTask -abstract class ExperimentalUnpackSkikoWasmRuntimeTask : DefaultTask() { - @get:InputFiles - lateinit var skikoRuntimeFiles: FileCollection - - @get:OutputDirectory - abstract val outputDir: DirectoryProperty - - @get:Inject - internal abstract val archiveOperations: ArchiveOperations - - @get:Inject - internal abstract val fileOperations: FileSystemOperations - - @TaskAction - fun run() { - fileOperations.clearDirs(outputDir) - - for (file in skikoRuntimeFiles.files) { - if (file.name.endsWith(".jar", ignoreCase = true)) { - unpackJar(file) - } - } - } - - private fun unpackJar(file: File) { - fileOperations.copy { copySpec -> - copySpec.from(archiveOperations.zipTree(file)) - copySpec.into(outputDir) - } - } -} \ No newline at end of file +@Deprecated( + message = "Starting from 1.6.10 Compose for Web goes to Alpha", + replaceWith = ReplaceWith("UnpackSkikoWasmRuntimeTask") +) +abstract class ExperimentalUnpackSkikoWasmRuntimeTask : UnpackSkikoWasmRuntimeTask() \ No newline at end of file diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/dsl/WebApplication.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/dsl/WebApplication.kt new file mode 100644 index 0000000000..47efc29b96 --- /dev/null +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/dsl/WebApplication.kt @@ -0,0 +1,10 @@ +package org.jetbrains.compose.web.dsl + +import javax.inject.Inject + +abstract class WebApplication @Inject constructor( + @Suppress("unused") + val name: String, +) { + +} \ No newline at end of file diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt similarity index 85% rename from gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt rename to gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt index 06c6b284fd..2bbbcb28ae 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. */ -package org.jetbrains.compose.experimental.web.internal +package org.jetbrains.compose.web.internal import org.gradle.api.Project import org.gradle.api.artifacts.Configuration @@ -11,16 +11,25 @@ import org.gradle.api.artifacts.ResolvedDependency import org.gradle.api.artifacts.UnresolvedDependency import org.gradle.api.provider.Provider import org.jetbrains.compose.ComposeBuildConfig -import org.jetbrains.compose.experimental.dsl.ExperimentalWebApplication -import org.jetbrains.compose.experimental.web.tasks.ExperimentalUnpackSkikoWasmRuntimeTask +import org.jetbrains.compose.ComposeExtension +import org.jetbrains.compose.web.tasks.UnpackSkikoWasmRuntimeTask import org.jetbrains.compose.internal.utils.* import org.jetbrains.compose.internal.utils.registerTask import org.jetbrains.compose.internal.utils.uppercaseFirstChar +import org.jetbrains.compose.web.WebExtension import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget -internal fun Collection.configureExperimentalWebApplication( - project: Project, - app: ExperimentalWebApplication +internal fun Project.configureWeb( + composeExt: ComposeExtension, +) { + val webExt = composeExt.extensions.getByType(WebExtension::class.java) + // configure only if there is k/wasm or k/js target: + webExt.targetsToConfigure(project) + .configureWebApplication(project) +} + +internal fun Collection.configureWebApplication( + project: Project ) { val skikoJsWasmRuntimeConfiguration = project.configurations.create("COMPOSE_SKIKO_JS_WASM_RUNTIME") val skikoJsWasmRuntimeDependency = skikoVersionProvider(project).map { skikoVersion -> @@ -37,7 +46,7 @@ internal fun Collection.configureExperimentalWebApplication( mainCompilation.defaultSourceSet.resources.srcDir(unpackedRuntimeDir) testCompilation.defaultSourceSet.resources.srcDir(unpackedRuntimeDir) - val unpackRuntime = project.registerTask(taskName) { + val unpackRuntime = project.registerTask(taskName) { skikoRuntimeFiles = skikoJsWasmRuntimeConfiguration outputDir.set(unpackedRuntimeDir) } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/UnpackSkikoWasmRuntimeTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/UnpackSkikoWasmRuntimeTask.kt new file mode 100644 index 0000000000..954d46cd39 --- /dev/null +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/UnpackSkikoWasmRuntimeTask.kt @@ -0,0 +1,50 @@ +/* + * Copyright 2020-2022 JetBrains s.r.o. and respective authors and developers. + * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. + */ + +package org.jetbrains.compose.web.tasks + +import org.gradle.api.DefaultTask +import org.gradle.api.file.ArchiveOperations +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.FileCollection +import org.gradle.api.file.FileSystemOperations +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.TaskAction +import org.jetbrains.compose.internal.utils.clearDirs +import java.io.File +import javax.inject.Inject + +abstract class UnpackSkikoWasmRuntimeTask : DefaultTask() { + @get:InputFiles + lateinit var skikoRuntimeFiles: FileCollection + + @get:OutputDirectory + abstract val outputDir: DirectoryProperty + + @get:Inject + internal abstract val archiveOperations: ArchiveOperations + + @get:Inject + internal abstract val fileOperations: FileSystemOperations + + @TaskAction + fun run() { + fileOperations.clearDirs(outputDir) + + for (file in skikoRuntimeFiles.files) { + if (file.name.endsWith(".jar", ignoreCase = true)) { + unpackJar(file) + } + } + } + + private fun unpackJar(file: File) { + fileOperations.copy { copySpec -> + copySpec.from(archiveOperations.zipTree(file)) + copySpec.into(outputDir) + } + } +} \ No newline at end of file