Remove support for and use of Kotlin JS plugin (cashapp#1399)

This plugin is going away in favor of using the multiplatform plugin.
winter-love-dev · Aug 10, 2023 · 357b4de · 357b4de
1 parent 93985ce
commit 357b4de
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 65 deletions.
diff --git a/build-support/src/main/kotlin/app/cash/redwood/buildsupport/RedwoodBuildPlugin.kt b/build-support/src/main/kotlin/app/cash/redwood/buildsupport/RedwoodBuildPlugin.kt
@@ -200,7 +200,6 @@ private class RedwoodBuildExtensionImpl(private val project: Project) : RedwoodB
       explicit = true
     }
     project.plugins.withId("org.jetbrains.kotlin.android", kotlinPluginHandler)
-    project.plugins.withId("org.jetbrains.kotlin.js", kotlinPluginHandler)
     project.plugins.withId("org.jetbrains.kotlin.jvm", kotlinPluginHandler)
     project.plugins.withId("org.jetbrains.kotlin.multiplatform", kotlinPluginHandler)
     project.afterEvaluate {

diff --git a/redwood-gradle-plugin/src/main/kotlin/app/cash/redwood/gradle/RedwoodLintPlugin.kt b/redwood-gradle-plugin/src/main/kotlin/app/cash/redwood/gradle/RedwoodLintPlugin.kt
@@ -29,10 +29,8 @@ import org.gradle.api.attributes.Usage.USAGE_ATTRIBUTE
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.language.base.plugins.LifecycleBasePlugin.CHECK_TASK_NAME
 import org.gradle.language.base.plugins.LifecycleBasePlugin.VERIFICATION_GROUP
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.androidJvm
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.common
@@ -64,8 +62,6 @@ public class RedwoodLintPlugin : Plugin<Project> {
           configureKotlinMultiplatformTargets(project, rootTask)
         }
         rootTask
-      } else if (project.plugins.hasPlugin("org.jetbrains.kotlin.js")) {
-        configureKotlinJsProject(project)
       } else if (project.plugins.hasPlugin("org.jetbrains.kotlin.jvm")) {
         configureKotlinJvmProject(project)
       } else if (project.plugins.hasPlugin("org.jetbrains.kotlin.android")) {
@@ -158,15 +154,6 @@ private fun configureKotlinMultiplatformTargets(
   }
 }
 
-private fun configureKotlinJsProject(
-  project: Project,
-): TaskProvider<out Task> {
-  val kotlin = project.extensions.getByType(KotlinJsProjectExtension::class.java)
-  // Cast to supertype avoids deprecation on subtype of related mutable DSL API.
-  val target = (kotlin as KotlinSingleTargetExtension<*>).target
-  return createKotlinTargetRedwoodLintTask(project, target, baseTaskName)
-}
-
 private fun configureKotlinJvmProject(
   project: Project,
 ): TaskProvider<out Task> {

diff --git a/redwood-gradle-plugin/src/test/fixture/lint-js/build.gradle b/redwood-gradle-plugin/src/test/fixture/lint-js/build.gradle
diff --git a/redwood-gradle-plugin/src/test/fixture/lint-js/gradle.properties b/redwood-gradle-plugin/src/test/fixture/lint-js/gradle.properties
diff --git a/redwood-gradle-plugin/src/test/fixture/lint-js/settings.gradle b/redwood-gradle-plugin/src/test/fixture/lint-js/settings.gradle
diff --git a/redwood-gradle-plugin/src/test/kotlin/app/cash/redwood/gradle/FixtureTest.kt b/redwood-gradle-plugin/src/test/kotlin/app/cash/redwood/gradle/FixtureTest.kt
@@ -131,15 +131,6 @@ class FixtureTest {
     )
   }
 
-  @Test fun lintJs() {
-    val fixtureDir = File("src/test/fixture/lint-js")
-    val result = fixtureGradleRunner(fixtureDir).build()
-    val lintTasks = result.tasks.map { it.path }.filter { it.startsWith(":redwoodLint") }
-    assertThat(lintTasks).containsExactly(
-      ":redwoodLint",
-    )
-  }
-
   @Test fun lintJvm() {
     val fixtureDir = File("src/test/fixture/lint-jvm")
     val result = fixtureGradleRunner(fixtureDir).build()

diff --git a/redwood-layout-dom/build.gradle b/redwood-layout-dom/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'org.jetbrains.kotlin.js'
+apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
 redwoodBuild {
   publishing()
@@ -10,7 +10,7 @@ kotlin {
   }
 
   sourceSets {
-    main {
+    commonMain {
       dependencies {
         api projects.redwoodLayoutWidget
       }

diff --git a/.../HTMLElementRedwoodLayoutWidgetFactory.kt → .../HTMLElementRedwoodLayoutWidgetFactory.kt b/.../HTMLElementRedwoodLayoutWidgetFactory.kt → .../HTMLElementRedwoodLayoutWidgetFactory.kt
diff --git a/...tlin/app/cash/redwood/layout/dom/utils.kt → ...tlin/app/cash/redwood/layout/dom/utils.kt b/...tlin/app/cash/redwood/layout/dom/utils.kt → ...tlin/app/cash/redwood/layout/dom/utils.kt
diff --git a/redwood-lazylayout-dom/build.gradle b/redwood-lazylayout-dom/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'org.jetbrains.kotlin.js'
+apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
 redwoodBuild {
 }
@@ -9,7 +9,7 @@ kotlin {
   }
 
   sourceSets {
-    main {
+    commonMain {
       dependencies {
         api projects.redwoodLazylayoutWidget
       }

diff --git a/.../HTMLElementRedwoodLayoutWidgetFactory.kt → .../HTMLElementRedwoodLayoutWidgetFactory.kt b/.../HTMLElementRedwoodLayoutWidgetFactory.kt → .../HTMLElementRedwoodLayoutWidgetFactory.kt
diff --git a/...p/cash/redwood/layout/dom/HTMLLazyList.kt → ...p/cash/redwood/layout/dom/HTMLLazyList.kt b/...p/cash/redwood/layout/dom/HTMLLazyList.kt → ...p/cash/redwood/layout/dom/HTMLLazyList.kt
diff --git a/samples/counter/browser/build.gradle b/samples/counter/browser/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'org.jetbrains.kotlin.js'
+apply plugin: 'org.jetbrains.kotlin.multiplatform'
 apply plugin: 'app.cash.redwood'
 
 // The name of the final JS file to be referenced from HTML.
@@ -13,7 +13,7 @@ kotlin {
   }
 
   sourceSets {
-    main {
+    commonMain {
       dependencies {
         implementation projects.samples.counter.schema.widget
         implementation projects.samples.counter.presenter

diff --git a/...m/example/redwood/counter/browser/main.kt → ...m/example/redwood/counter/browser/main.kt b/...m/example/redwood/counter/browser/main.kt → ...m/example/redwood/counter/browser/main.kt
diff --git a/.../redwood/counter/browser/widgetFactory.kt → .../redwood/counter/browser/widgetFactory.kt b/.../redwood/counter/browser/widgetFactory.kt → .../redwood/counter/browser/widgetFactory.kt
diff --git a/...xample/redwood/counter/browser/widgets.kt → ...xample/redwood/counter/browser/widgets.kt b/...xample/redwood/counter/browser/widgets.kt → ...xample/redwood/counter/browser/widgets.kt
diff --git a/...ter/browser/src/main/resources/index.html → ...owser/src/commonMain/resources/index.html b/...ter/browser/src/main/resources/index.html → ...owser/src/commonMain/resources/index.html
diff --git a/samples/emoji-search/browser/build.gradle b/samples/emoji-search/browser/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'org.jetbrains.kotlin.js'
+apply plugin: 'org.jetbrains.kotlin.multiplatform'
 apply plugin: 'app.cash.redwood'
 
 // The name of the final JS file to be referenced from HTML.
@@ -13,7 +13,7 @@ kotlin {
   }
 
   sourceSets {
-    main {
+    commonMain {
       dependencies {
         implementation projects.samples.emojiSearch.schema.widget
         implementation projects.samples.emojiSearch.presenter

diff --git a/...er/HTMLElementEmojiSearchWidgetFactory.kt → ...er/HTMLElementEmojiSearchWidgetFactory.kt b/...er/HTMLElementEmojiSearchWidgetFactory.kt → ...er/HTMLElementEmojiSearchWidgetFactory.kt
diff --git a/...ample/redwood/emojisearch/browser/main.kt → ...ample/redwood/emojisearch/browser/main.kt b/...ample/redwood/emojisearch/browser/main.kt → ...ample/redwood/emojisearch/browser/main.kt
diff --git a/...rch/browser/src/main/resources/index.html → ...owser/src/commonMain/resources/index.html b/...rch/browser/src/main/resources/index.html → ...owser/src/commonMain/resources/index.html