[Gradle, JS] Use dev server not as property in KotlinWebpackConfig

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt

@@ -244,7 +244,7 @@ constructor(
         outputFileName = mainOutputFileName.get(),
         configDirectory = configDirectory,
         rules = rules,
-        devServerProperty = devServerProperty,
+        devServer = devServerProperty.orNull,
         devtool = devtool,
         sourceMaps = sourceMaps,
         resolveFromModulesFirst = resolveFromModulesFirst,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt

@@ -8,9 +8,7 @@
 package org.jetbrains.kotlin.gradle.targets.js.webpack
 
 import com.google.gson.GsonBuilder
-import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Internal
 import org.jetbrains.kotlin.gradle.targets.js.NpmVersions
 import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
 import org.jetbrains.kotlin.gradle.targets.js.appendConfigsFromDir
@@ -33,7 +31,7 @@ data class KotlinWebpackConfig(
     var outputFileName: String? = entry?.name,
     var configDirectory: File? = null,
     var reportEvaluatedConfigFile: File? = null,
-    val devServerProperty: Property<DevServer>? = null,
+    var devServer: DevServer? = null,
     var watchOptions: WatchOptions? = null,
     var experiments: MutableSet<String> = mutableSetOf(),
     override val rules: KotlinWebpackRulesContainer,
@@ -56,17 +54,6 @@ data class KotlinWebpackConfig(
     val progressReporterPathFilterInput: String?
         get() = npmProjectDir?.get()?.let { npmProjectDir -> progressReporterPathFilter?.relativeOrAbsolute(npmProjectDir) }
 
-    @get:Internal
-    @Deprecated(
-        "This property is deprecated and will be removed in future. Use devServerProperty instead",
-        replaceWith = ReplaceWith("devServerProperty")
-    )
-    var devServer: DevServer?
-        get() = devServerProperty?.get()
-        set(value) {
-            devServerProperty?.set(value)
-        }
-
     fun getRequiredDependencies(versions: NpmVersions) =
         mutableSetOf<RequiredKotlinJsDependency>().also {
             it.add(
@@ -82,7 +69,7 @@ data class KotlinWebpackConfig(
                 )
             }
 
-            if (devServerProperty != null && devServerProperty!!.isPresent) {
+            if (devServer != null) {
                 it.add(
                     versions.webpackDevServer
                 )
@@ -189,10 +176,10 @@ data class KotlinWebpackConfig(
     }
 
     private fun Appendable.appendDevServer() {
-        if (devServerProperty != null && devServerProperty!!.isPresent) {
+        if (devServer != null) {
 
             appendLine("// dev server")
-            appendLine("config.devServer = ${json(devServerProperty!!.get())};")
+            appendLine("config.devServer = ${json(devServer!!)};")
             appendLine()
         }