From 18de4b6607743e2bbb54bc3dd572c71e2816811f Mon Sep 17 00:00:00 2001 From: Jakub Senohrabek Date: Thu, 6 Feb 2025 14:47:38 +0100 Subject: [PATCH] [jewel] IJPL-175221 [Poko] Introduce detection of missing properties and equality members for Jewel (cherry picked from commit 4ecf9c3abfa3d21c1c07e48a9f69f623170a4514) (cherry picked from commit e93a1ab5a0450ba919080fe2c79204bb6ed8665b) IJ-MR-155570 GitOrigin-RevId: 058c2f4dc5f7d377f929e5105a485bdb0f7af72f --- platform/jewel/buildSrc/build.gradle.kts | 1 - .../src/main/kotlin/jewel-check-public-api.gradle.kts | 3 --- .../jewel/buildlogic/demodata/AndroidStudioReleases.kt | 4 ++-- .../intellij.platform.jewel.decoratedWindow.iml | 5 ++--- .../foundation/intellij.platform.jewel.foundation.iml | 5 ++--- platform/jewel/gradle/libs.versions.toml | 3 --- .../intellij.platform.jewel.ideLafBridge.iml | 5 ++--- .../intellij.platform.jewel.intUi.decoratedWindow.iml | 5 ++--- .../intellij.platform.jewel.intUi.standalone.iml | 5 ++--- .../core/intellij.platform.jewel.markdown.core.iml | 9 ++++----- ...tellij.platform.jewel.markdown.extension.autolink.iml | 5 ++--- ...ellij.platform.jewel.markdown.extension.gfmAlerts.iml | 5 ++--- ...ellij.platform.jewel.markdown.extension.gfmTables.iml | 3 +-- ...ellij.platform.jewel.markdown.ideLafBridgeStyling.iml | 5 ++--- ...ij.platform.jewel.markdown.intUiStandaloneStyling.iml | 5 ++--- .../intellij.platform.jewel.samples.idePlugin.iml | 5 ++--- .../intellij.platform.jewel.samples.showcase.iml | 3 +-- .../intellij.platform.jewel.samples.standalone.iml | 5 ++--- .../jewel/ui-tests/intellij.platform.jewel.uiTests.iml | 5 ++--- platform/jewel/ui/intellij.platform.jewel.ui.iml | 5 ++--- 20 files changed, 34 insertions(+), 57 deletions(-) diff --git a/platform/jewel/buildSrc/build.gradle.kts b/platform/jewel/buildSrc/build.gradle.kts index 771e75f7cfdc..825d3c7372e0 100644 --- a/platform/jewel/buildSrc/build.gradle.kts +++ b/platform/jewel/buildSrc/build.gradle.kts @@ -27,7 +27,6 @@ dependencies { implementation(libs.ktfmt.gradlePlugin) implementation(libs.kotlinx.binaryCompatValidator.gradlePlugin) implementation(libs.kotlinx.serialization.json) - implementation(libs.poko.gradlePlugin) // Enables using type-safe accessors to reference plugins from the [plugins] block defined in // version catalogs. diff --git a/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts index b0134dd28a4c..fb5dfc64526c 100644 --- a/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts +++ b/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.jewel.buildlogic.apivalidation.ApiValidationExtension plugins { id("org.jetbrains.kotlinx.binary-compatibility-validator") - id("dev.drewhamilton.poko") kotlin("jvm") } @@ -16,8 +15,6 @@ apiValidation { nonPublicMarkers.add("org.jetbrains.jewel.InternalJewelApi") } -poko { pokoAnnotation = "org/jetbrains/jewel/foundation/GenerateDataFunctions" } - kotlin { explicitApi() } val extension = project.extensions.create("publicApiValidation", ApiValidationExtension::class.java) diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt index a44907bee388..b71c878c9a54 100644 --- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt +++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt @@ -1,8 +1,8 @@ package org.jetbrains.jewel.buildlogic.demodata import com.squareup.kotlinpoet.ClassName -import gradle.kotlin.dsl.accessors._2a8ca08099da662a3e5c042bc355f38a.kotlin -import gradle.kotlin.dsl.accessors._2a8ca08099da662a3e5c042bc355f38a.sourceSets +import gradle.kotlin.dsl.accessors._6b77fac1fb1b8c5058558e9072dfa468.kotlin +import gradle.kotlin.dsl.accessors._6b77fac1fb1b8c5058558e9072dfa468.sourceSets import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream import org.gradle.api.DefaultTask diff --git a/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml b/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml index 0385d201034d..4efbd86143a2 100644 --- a/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml +++ b/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/foundation/intellij.platform.jewel.foundation.iml b/platform/jewel/foundation/intellij.platform.jewel.foundation.iml index 7e1556cde104..591a3c7a844a 100644 --- a/platform/jewel/foundation/intellij.platform.jewel.foundation.iml +++ b/platform/jewel/foundation/intellij.platform.jewel.foundation.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/gradle/libs.versions.toml b/platform/jewel/gradle/libs.versions.toml index 7ccc2e8f3b16..d2bec47dac7b 100644 --- a/platform/jewel/gradle/libs.versions.toml +++ b/platform/jewel/gradle/libs.versions.toml @@ -14,7 +14,6 @@ kotlinterGradlePlugin = "4.4.1" kotlinxSerialization = "1.7.3" kotlinxBinaryCompat = "0.16.3" ktfmtGradlePlugin = "0.20.1" -poko = "0.17.1" [libraries] commonmark-core = { module = "org.commonmark:commonmark", version.ref = "commonmark" } @@ -40,7 +39,6 @@ kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" } kotlinter-gradlePlugin = { module = "org.jmailen.gradle:kotlinter-gradle", version.ref = "kotlinterGradlePlugin" } kotlinx-binaryCompatValidator-gradlePlugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "kotlinxBinaryCompat" } ktfmt-gradlePlugin = { module = "com.ncorti.ktfmt.gradle:plugin", version.ref = "ktfmtGradlePlugin" } -poko-gradlePlugin = { module = "dev.drewhamilton.poko:poko-gradle-plugin", version.ref = "poko" } [plugins] composeDesktop = { id = "org.jetbrains.compose", version.ref = "composeDesktop" } @@ -55,4 +53,3 @@ kotlinx-binaryCompatValidator = { id = "org.jetbrains.kotlinx.binary-compatibili kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinterGradlePlugin" } ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmtGradlePlugin" } -poko = { id = "dev.drewhamilton.poko", version.ref = "poko" } diff --git a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml index 94ab2c66c6d3..2a47925ea39c 100644 --- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml +++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml b/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml index d2fd43c0d5c7..674c4f98089d 100644 --- a/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml +++ b/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml b/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml index 2a92e13883e6..17bd924233fc 100644 --- a/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml +++ b/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml index 425184f97d08..bfcb906a931e 100644 --- a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml +++ b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar @@ -36,8 +35,8 @@ - - + + diff --git a/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml b/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml index 0ee382dd3534..3ba26667c901 100644 --- a/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml +++ b/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml b/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml index e7a3ef87637f..b9d22d29df9b 100644 --- a/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml +++ b/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/markdown/extension/gfm-tables/intellij.platform.jewel.markdown.extension.gfmTables.iml b/platform/jewel/markdown/extension/gfm-tables/intellij.platform.jewel.markdown.extension.gfmTables.iml index 1c84d33a47cb..f98afe1d8acb 100644 --- a/platform/jewel/markdown/extension/gfm-tables/intellij.platform.jewel.markdown.extension.gfmTables.iml +++ b/platform/jewel/markdown/extension/gfm-tables/intellij.platform.jewel.markdown.extension.gfmTables.iml @@ -4,7 +4,7 @@ - @@ -16,7 +16,6 @@ $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.2/poko-compiler-plugin-0.18.2.jar diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml index 29d500fac2a9..76d5b0995a11 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml +++ b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml b/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml index fd18fb44ff43..1a7c78fd16d3 100644 --- a/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml +++ b/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml b/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml index e5fba158d5d9..4132f892927f 100644 --- a/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml +++ b/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml b/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml index 38203fefcfe8..bfd8743b8a90 100644 --- a/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml +++ b/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml @@ -4,7 +4,7 @@ - @@ -16,7 +16,6 @@ $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.2/poko-compiler-plugin-0.18.2.jar diff --git a/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml b/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml index e8fe4ef2bbd2..846773a7043b 100644 --- a/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml +++ b/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml b/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml index e72c09ce3814..1f40b0a5b80f 100644 --- a/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml +++ b/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar diff --git a/platform/jewel/ui/intellij.platform.jewel.ui.iml b/platform/jewel/ui/intellij.platform.jewel.ui.iml index 2086c0d24f63..2d08f28e3e40 100644 --- a/platform/jewel/ui/intellij.platform.jewel.ui.iml +++ b/platform/jewel/ui/intellij.platform.jewel.ui.iml @@ -4,7 +4,7 @@ - @@ -15,8 +15,7 @@ - $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.0/kotlin-compose-compiler-plugin-2.1.0.jar - $MAVEN_REPOSITORY$/dev/drewhamilton/poko/poko-compiler-plugin/0.18.0/poko-compiler-plugin-0.18.0.jar + $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.1.10/kotlin-compose-compiler-plugin-2.1.10.jar