Refactor deprecated experimental configuration messages

Author: Omico

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."