diff --git a/.idea/libraries/poko_compiler_plugin.xml b/.idea/libraries/poko_compiler_plugin.xml deleted file mode 100644 index 8bf3df42426a..000000000000 --- a/.idea/libraries/poko_compiler_plugin.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - 08edf341dfa4dd0a9e15b83a2a74850baad3a4a3ca2f93aed05ca6a481b1f394 - - - - - - - - - - - - \ No newline at end of file diff --git a/build/jvm-rules/BUILD.bazel b/build/jvm-rules/BUILD.bazel index badf9b01df7d..ac76e66aaebc 100644 --- a/build/jvm-rules/BUILD.bazel +++ b/build/jvm-rules/BUILD.bazel @@ -114,13 +114,6 @@ jvm_import( visibility = ["//visibility:public"], ) -jvm_import( - name = "poko-compiler-plugin", - jar = "@poko-compiler-plugin//file", - source_jar = "@poko-compiler-plugin-sources//file", - visibility = ["//visibility:public"], -) - jvm_import( name = "kotlinx-coroutines-core", jar = "@kotlinx-coroutines-core-jvm//file", diff --git a/build/jvm-rules/MODULE.bazel b/build/jvm-rules/MODULE.bazel index ac2e16501f3e..11b0c9990610 100644 --- a/build/jvm-rules/MODULE.bazel +++ b/build/jvm-rules/MODULE.bazel @@ -194,19 +194,6 @@ http_file( downloaded_file_path = "kotlin-compose-compiler-plugin-2.1.20-Beta2-sources.jar", ) -http_file( - name = "poko-compiler-plugin", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/dev/drewhamilton/poko/poko-compiler-plugin/0.18.2/poko-compiler-plugin-0.18.2.jar", - sha256 = "08edf341dfa4dd0a9e15b83a2a74850baad3a4a3ca2f93aed05ca6a481b1f394", - downloaded_file_path = "poko-compiler-plugin-0.18.2.jar", -) -http_file( - name = "poko-compiler-plugin-sources", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/dev/drewhamilton/poko/poko-compiler-plugin/0.18.2/poko-compiler-plugin-0.18.2-sources.jar", - sha256 = "02f7ac954f3a9574b37a54d7bdc79190325b9ee38a3244256a84d6d760eb6f1f", - downloaded_file_path = "poko-compiler-plugin-0.18.2-sources.jar", -) - http_file( name = "kotlinx-coroutines-core-jvm", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.10.1/kotlinx-coroutines-core-jvm-1.10.1.jar", diff --git a/build/jvm-rules/libs.lock.json b/build/jvm-rules/libs.lock.json index 1a11ac6aaa2c..303b916d5880 100644 --- a/build/jvm-rules/libs.lock.json +++ b/build/jvm-rules/libs.lock.json @@ -11,10 +11,6 @@ "db06fa9f6b43bb7d386420f854f41aa55a11023de36bad68e043c3ac3f33b8d5", "495063fbf5a1989435ee15ed6c6caf39b7dc7af22dd495e38fc7e6e7c00f1fcc" ], - "dev.drewhamilton.poko:poko-compiler-plugin:0.18.2": [ - "08edf341dfa4dd0a9e15b83a2a74850baad3a4a3ca2f93aed05ca6a481b1f394", - "02f7ac954f3a9574b37a54d7bdc79190325b9ee38a3244256a84d6d760eb6f1f" - ], "io.opentelemetry:opentelemetry-exporter-logging-otlp:1.46.0": [ "afbed5afecd48ebc66ffe16c438cd92da31759af56bdcbde0f260b131e43042a", "10c69d372df6c0e80486edb3cbd4191b75a99325e5faba10406242b3e609311e" diff --git a/build/jvm-rules/libs.yaml b/build/jvm-rules/libs.yaml index e825646de659..01d9c420f530 100644 --- a/build/jvm-rules/libs.yaml +++ b/build/jvm-rules/libs.yaml @@ -27,8 +27,6 @@ version: 2.1.20-Beta2 - id: org.jetbrains.kotlin:kotlin-compose-compiler-plugin version: 2.1.20-Beta2 - - id: dev.drewhamilton.poko:poko-compiler-plugin - version: 0.18.2 # other libs - id: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm version: 1.10.1 diff --git a/build/jvm-rules/src/kotlin-builder/BUILD.bazel b/build/jvm-rules/src/kotlin-builder/BUILD.bazel index 83fda7dcae5e..4d3a3405f5ef 100644 --- a/build/jvm-rules/src/kotlin-builder/BUILD.bazel +++ b/build/jvm-rules/src/kotlin-builder/BUILD.bazel @@ -19,7 +19,6 @@ kt_jvm_library( "//src/kotlin-plugins/jdeps", "//src/kotlin-plugins/abi", "//:kotlin-compose-compiler-plugin", - "//:poko-compiler-plugin", "//:kotlin-serialization-compiler-plugin", ], visibility = ["//visibility:public"], diff --git a/build/jvm-rules/src/kotlin-builder/compilation/plugins.kt b/build/jvm-rules/src/kotlin-builder/compilation/plugins.kt index d33ae8e030d4..a1fe4940aa45 100644 --- a/build/jvm-rules/src/kotlin-builder/compilation/plugins.kt +++ b/build/jvm-rules/src/kotlin-builder/compilation/plugins.kt @@ -72,15 +72,6 @@ internal fun configurePlugins( )) } - "dev.drewhamilton.poko.poko-compiler-plugin" -> { - addPlugin(RegisteredPluginInfo( - componentRegistrar = null, - compilerPluginRegistrar = PokoCompilerPluginRegistrar(), - commandLineProcessor = PokoCommandLineProcessor(), - pluginOptions = emptyList(), - )) - } - else -> throw IllegalArgumentException("plugin requires classpath: $id") } } diff --git a/fleet/compiler-plugins/fleet.compiler.plugins.iml b/fleet/compiler-plugins/fleet.compiler.plugins.iml index 988c0385fe61..7e9a902b053f 100644 --- a/fleet/compiler-plugins/fleet.compiler.plugins.iml +++ b/fleet/compiler-plugins/fleet.compiler.plugins.iml @@ -8,7 +8,6 @@ - \ No newline at end of file diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 504a3b9c8469..eb54a041cf3d 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -30,16 +30,6 @@ kt_compiler_plugin( visibility = ["//visibility:public"] ) -kt_compiler_plugin( - name = "poko-plugin", - id = "dev.drewhamilton.poko.poko-compiler-plugin", - # todo options -# options = { -# "pokoAnnotation": "org/jetbrains/jewel/foundation/GenerateDataFunctions", -# }, - visibility = ["//visibility:public"] -) - java_binary( name = "manifest_updater", srcs = ["ManifestUpdater.java"], diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt index aef93ec37423..c3d1787486a4 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -793,9 +793,6 @@ object CommunityLibraryLicenses { .apache("https://github.com/Kotlin/kotlinx.serialization/blob/master/LICENSE.txt") .suppliedByOrganizations(Suppliers.JETBRAINS), - LibraryLicense("Kotlin POKO Compiler", libraryName = "poko-compiler-plugin", url = "https://github.com/drewhamilton/Poko") - .apache("https://github.com/drewhamilton/Poko/blob/main/LICENSE"), - LibraryLicense("Kotlin reflection library", libraryName = "kotlin-reflect", url = "https://github.com/JetBrains/kotlin") .apache("https://github.com/JetBrains/kotlin/blob/master/license/LICENSE.txt") .suppliedByOrganizations(Suppliers.JETBRAINS), diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt index 149e5b042e54..a97b3b7f5aeb 100644 --- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt +++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt @@ -1,6 +1,9 @@ package org.jetbrains.jewel.foundation /** + * Instructs detekt to error out if equality members of the annotated class are missing or do not contain all properties from the constructor. + * + * Previous behavior: * Instructs the Poko compiler plugin to generate equals, hashcode, and toString functions for the class it's attached * to. * diff --git a/platform/jewel/markdown/extension/gfm-strikethrough/intellij.platform.jewel.markdown.extension.gfmStrikethrough.iml b/platform/jewel/markdown/extension/gfm-strikethrough/intellij.platform.jewel.markdown.extension.gfmStrikethrough.iml index b4ae3fdbc721..d175f3e8ee51 100644 --- a/platform/jewel/markdown/extension/gfm-strikethrough/intellij.platform.jewel.markdown.extension.gfmStrikethrough.iml +++ b/platform/jewel/markdown/extension/gfm-strikethrough/intellij.platform.jewel.markdown.extension.gfmStrikethrough.iml @@ -4,7 +4,7 @@ -