[Build] Update java-instrumentation convention
- Avoid using `allprojects {}`, apply the plugin explicitly.
- Register the instrumentation classpath as a task input.
- Update Configurations to separately declare/resolve dependencies.
diff --git a/analysis/analysis-api-fe10/build.gradle.kts b/analysis/analysis-api-fe10/build.gradle.kts
index 6e7074f..43a3da6 100644
--- a/analysis/analysis-api-fe10/build.gradle.kts
+++ b/analysis/analysis-api-fe10/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts
index 52ba7ba..711b02a 100644
--- a/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts
+++ b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts
index 600409b..79c171e 100644
--- a/analysis/analysis-api-fir/build.gradle.kts
+++ b/analysis/analysis-api-fir/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api-impl-barebone/build.gradle.kts b/analysis/analysis-api-impl-barebone/build.gradle.kts
index bb5ab66..4a40fe3 100644
--- a/analysis/analysis-api-impl-barebone/build.gradle.kts
+++ b/analysis/analysis-api-impl-barebone/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -23,4 +24,4 @@
"test" { projectDefault() }
}
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts
index 90894ab..0d0cff7 100644
--- a/analysis/analysis-api-impl-base/build.gradle.kts
+++ b/analysis/analysis-api-impl-base/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api-platform-interface/build.gradle.kts b/analysis/analysis-api-platform-interface/build.gradle.kts
index a91d8f7..84148d4 100644
--- a/analysis/analysis-api-platform-interface/build.gradle.kts
+++ b/analysis/analysis-api-platform-interface/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api-standalone/analysis-api-fir-standalone-base/build.gradle.kts b/analysis/analysis-api-standalone/analysis-api-fir-standalone-base/build.gradle.kts
index 623e35f..a66ad21 100644
--- a/analysis/analysis-api-standalone/analysis-api-fir-standalone-base/build.gradle.kts
+++ b/analysis/analysis-api-standalone/analysis-api-fir-standalone-base/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts b/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts
index 3d9ece6..8287808 100644
--- a/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts
+++ b/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api-standalone/build.gradle.kts b/analysis/analysis-api-standalone/build.gradle.kts
index 845e3f5..bb9c640 100644
--- a/analysis/analysis-api-standalone/build.gradle.kts
+++ b/analysis/analysis-api-standalone/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts
index 291a059..e0cdd1e 100644
--- a/analysis/analysis-api/build.gradle.kts
+++ b/analysis/analysis-api/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-internal-utils/build.gradle.kts b/analysis/analysis-internal-utils/build.gradle.kts
index 57a5cc8..801a205 100644
--- a/analysis/analysis-internal-utils/build.gradle.kts
+++ b/analysis/analysis-internal-utils/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -17,4 +18,4 @@
kotlin {
explicitApi()
-}
\ No newline at end of file
+}
diff --git a/analysis/analysis-test-framework/build.gradle.kts b/analysis/analysis-test-framework/build.gradle.kts
index 00acc48..7ddf2db1 100644
--- a/analysis/analysis-test-framework/build.gradle.kts
+++ b/analysis/analysis-test-framework/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generated/build.gradle.kts b/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generated/build.gradle.kts
index ab4638e..9762a0c 100644
--- a/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generated/build.gradle.kts
+++ b/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generated/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
id("jps-compatible")
}
diff --git a/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generator/build.gradle.kts b/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generator/build.gradle.kts
index 64bc48c..cb65be9 100644
--- a/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generator/build.gradle.kts
+++ b/analysis/analysis-tools/deprecated-k1-frontend-internals-for-ide-generator/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
application
kotlin("jvm")
id("jps-compatible")
diff --git a/analysis/build.gradle.kts b/analysis/build.gradle.kts
index e8a833a..abfcf81 100644
--- a/analysis/build.gradle.kts
+++ b/analysis/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
tasks.register("analysisAllTests") {
diff --git a/analysis/decompiled/decompiler-js/build.gradle.kts b/analysis/decompiled/decompiler-js/build.gradle.kts
index 7a2e5a0..be1ea7a 100644
--- a/analysis/decompiled/decompiler-js/build.gradle.kts
+++ b/analysis/decompiled/decompiler-js/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/decompiled/decompiler-native/build.gradle.kts b/analysis/decompiled/decompiler-native/build.gradle.kts
index bb44647..07fb39f 100644
--- a/analysis/decompiled/decompiler-native/build.gradle.kts
+++ b/analysis/decompiled/decompiler-native/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts
index 2a5ff6a..103fb5b 100644
--- a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts
+++ b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -31,4 +32,4 @@
}
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/analysis/decompiled/decompiler-to-psi/build.gradle.kts b/analysis/decompiled/decompiler-to-psi/build.gradle.kts
index db24278..79316d2 100644
--- a/analysis/decompiled/decompiler-to-psi/build.gradle.kts
+++ b/analysis/decompiled/decompiler-to-psi/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -31,4 +32,4 @@
workingDir = rootDir
}
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/analysis/decompiled/decompiler-to-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-stubs/build.gradle.kts
index 00f1287..21695b9 100644
--- a/analysis/decompiled/decompiler-to-stubs/build.gradle.kts
+++ b/analysis/decompiled/decompiler-to-stubs/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -18,5 +19,3 @@
"main" { projectDefault() }
"test" {}
}
-
-
diff --git a/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts b/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts
index 2649770..b01b5cd 100644
--- a/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts
+++ b/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts b/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
index 5ea9442..c4939c2 100644
--- a/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
+++ b/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/kt-references/build.gradle.kts b/analysis/kt-references/build.gradle.kts
index 0b242f5..f267a2c 100644
--- a/analysis/kt-references/build.gradle.kts
+++ b/analysis/kt-references/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/light-classes-base/build.gradle.kts b/analysis/light-classes-base/build.gradle.kts
index f23fe3d..2045145 100644
--- a/analysis/light-classes-base/build.gradle.kts
+++ b/analysis/light-classes-base/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/low-level-api-fir/build.gradle.kts b/analysis/low-level-api-fir/build.gradle.kts
index efc8fba..6f02ade 100644
--- a/analysis/low-level-api-fir/build.gradle.kts
+++ b/analysis/low-level-api-fir/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/low-level-api-fir/tests-jdk11/build.gradle.kts b/analysis/low-level-api-fir/tests-jdk11/build.gradle.kts
index b8824fc..cb5906f 100644
--- a/analysis/low-level-api-fir/tests-jdk11/build.gradle.kts
+++ b/analysis/low-level-api-fir/tests-jdk11/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/analysis/symbol-light-classes/build.gradle.kts b/analysis/symbol-light-classes/build.gradle.kts
index 4544052..acb685e 100644
--- a/analysis/symbol-light-classes/build.gradle.kts
+++ b/analysis/symbol-light-classes/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/ant/build.gradle.kts b/ant/build.gradle.kts
index a35c92c..8a5c96a 100644
--- a/ant/build.gradle.kts
+++ b/ant/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 4a08575..1e686da 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
java
kotlin("jvm")
+ id("java-instrumentation")
id("org.jetbrains.kotlinx.benchmark") version "0.4.6-1"
}
diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index 6d0ea1e..ff17df2 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index d5f5f5f..5bc79d1 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("android-sdk-provisioner")
}
diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index c3d047a..3f82f89 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/backend.common.jvm/build.gradle.kts b/compiler/backend.common.jvm/build.gradle.kts
index c8ae7c8..f299c04 100644
--- a/compiler/backend.common.jvm/build.gradle.kts
+++ b/compiler/backend.common.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts
index 0461daa..b5580a7 100644
--- a/compiler/backend/build.gradle.kts
+++ b/compiler/backend/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/build-tools/kotlin-build-statistics/build.gradle.kts b/compiler/build-tools/kotlin-build-statistics/build.gradle.kts
index 4fc22d7..ae8e610 100644
--- a/compiler/build-tools/kotlin-build-statistics/build.gradle.kts
+++ b/compiler/build-tools/kotlin-build-statistics/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
@@ -31,4 +32,4 @@
publish()
-standardPublicJars()
\ No newline at end of file
+standardPublicJars()
diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts
index d637888..1c94498 100644
--- a/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts
+++ b/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
`jvm-test-suite`
id("test-symlink-transformation")
}
@@ -131,4 +132,4 @@
tasks.named("check") {
dependsOn(testing.suites.matching { it.name != "testExample" }) // do not run example tests by default
-}
\ No newline at end of file
+}
diff --git a/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts
index b0a69c6..662b325 100644
--- a/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts
+++ b/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
}
@@ -35,4 +36,4 @@
projectTest(jUnitMode = JUnitMode.JUnit5) {
useJUnitPlatform()
-}
\ No newline at end of file
+}
diff --git a/compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts
index caea856..1841522 100644
--- a/compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts
+++ b/compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -33,4 +34,4 @@
compilerOptions {
optIn.add("org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi")
}
-}
\ No newline at end of file
+}
diff --git a/compiler/build-tools/kotlin-build-tools-jdk-utils/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-jdk-utils/build.gradle.kts
index a5c2572..cbcc024 100644
--- a/compiler/build-tools/kotlin-build-tools-jdk-utils/build.gradle.kts
+++ b/compiler/build-tools/kotlin-build-tools-jdk-utils/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -22,4 +23,4 @@
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
}
-}
\ No newline at end of file
+}
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index e9e9a92..4a205bd 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index b177bd8..7a8282b 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/cli/cli-base/build.gradle.kts b/compiler/cli/cli-base/build.gradle.kts
index 80ba1367..bfa37d5 100644
--- a/compiler/cli/cli-base/build.gradle.kts
+++ b/compiler/cli/cli-base/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts
index beed9bb..3b58163 100644
--- a/compiler/cli/cli-common/build.gradle.kts
+++ b/compiler/cli/cli-common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts
index 0521198..fc57e33 100644
--- a/compiler/cli/cli-js/build.gradle.kts
+++ b/compiler/cli/cli-js/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("share-kotlin-wasm-custom-formatters")
}
@@ -39,4 +40,4 @@
projectDefault()
resources.srcDir(updateWasmResources)
}
-}
\ No newline at end of file
+}
diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts
index 9ef061a..eb9a976 100644
--- a/compiler/cli/cli-runner/build.gradle.kts
+++ b/compiler/cli/cli-runner/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/compiler-runner-unshaded/build.gradle.kts b/compiler/compiler-runner-unshaded/build.gradle.kts
index d14f6bf..6ff1ef4 100644
--- a/compiler/compiler-runner-unshaded/build.gradle.kts
+++ b/compiler/compiler-runner-unshaded/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index aabb0d6..3e06193 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/compiler.version/build.gradle.kts b/compiler/compiler.version/build.gradle.kts
index cbecb31..36fd4ad 100644
--- a/compiler/compiler.version/build.gradle.kts
+++ b/compiler/compiler.version/build.gradle.kts
@@ -1,6 +1,7 @@
import org.apache.tools.ant.filters.ReplaceTokens
plugins {
+ id("java-instrumentation")
java
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
diff --git a/compiler/config.jvm/build.gradle.kts b/compiler/config.jvm/build.gradle.kts
index 7714a50..c2d06a4 100644
--- a/compiler/config.jvm/build.gradle.kts
+++ b/compiler/config.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/config/build.gradle.kts b/compiler/config/build.gradle.kts
index 113716a..505fb55 100644
--- a/compiler/config/build.gradle.kts
+++ b/compiler/config/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index 48e624a..c71cb08 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index 31bc604..c14b77f 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts
index 3a10024..d9ee9f4 100644
--- a/compiler/daemon/daemon-client/build.gradle.kts
+++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index a603762..3332fca 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/daemon/daemon-tests/build.gradle.kts b/compiler/daemon/daemon-tests/build.gradle.kts
index fbbabd5..6cb40b8 100644
--- a/compiler/daemon/daemon-tests/build.gradle.kts
+++ b/compiler/daemon/daemon-tests/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts
index e090cf7..3e80157 100644
--- a/compiler/fir/analysis-tests/build.gradle.kts
+++ b/compiler/fir/analysis-tests/build.gradle.kts
@@ -7,6 +7,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
index f29e5ac..f99e265 100644
--- a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
@@ -7,6 +7,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/checkers/build.gradle.kts b/compiler/fir/checkers/build.gradle.kts
index c2fb02f..44fccf0 100644
--- a/compiler/fir/checkers/build.gradle.kts
+++ b/compiler/fir/checkers/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/checkers/checkers-component-generator/build.gradle.kts b/compiler/fir/checkers/checkers-component-generator/build.gradle.kts
index 6525ca7..35d0e4e 100644
--- a/compiler/fir/checkers/checkers-component-generator/build.gradle.kts
+++ b/compiler/fir/checkers/checkers-component-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
diff --git a/compiler/fir/checkers/checkers.js/build.gradle.kts b/compiler/fir/checkers/checkers.js/build.gradle.kts
index c9a408d..138184c 100644
--- a/compiler/fir/checkers/checkers.js/build.gradle.kts
+++ b/compiler/fir/checkers/checkers.js/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/checkers/checkers.jvm/build.gradle.kts b/compiler/fir/checkers/checkers.jvm/build.gradle.kts
index abe656c..e02bf42 100644
--- a/compiler/fir/checkers/checkers.jvm/build.gradle.kts
+++ b/compiler/fir/checkers/checkers.jvm/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/checkers/checkers.native/build.gradle.kts b/compiler/fir/checkers/checkers.native/build.gradle.kts
index 1145bec..5d2386b 100644
--- a/compiler/fir/checkers/checkers.native/build.gradle.kts
+++ b/compiler/fir/checkers/checkers.native/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/checkers/checkers.wasm/build.gradle.kts b/compiler/fir/checkers/checkers.wasm/build.gradle.kts
index 53e8f3c..5e5211f 100644
--- a/compiler/fir/checkers/checkers.wasm/build.gradle.kts
+++ b/compiler/fir/checkers/checkers.wasm/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/checkers/checkers.web.common/build.gradle.kts b/compiler/fir/checkers/checkers.web.common/build.gradle.kts
index c5ed9ca..6429c4f 100644
--- a/compiler/fir/checkers/checkers.web.common/build.gradle.kts
+++ b/compiler/fir/checkers/checkers.web.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/cones/build.gradle.kts b/compiler/fir/cones/build.gradle.kts
index f4f740d..2576072 100644
--- a/compiler/fir/cones/build.gradle.kts
+++ b/compiler/fir/cones/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/dump/build.gradle.kts b/compiler/fir/dump/build.gradle.kts
index 529edc3..0dba44d 100644
--- a/compiler/fir/dump/build.gradle.kts
+++ b/compiler/fir/dump/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/entrypoint/build.gradle.kts b/compiler/fir/entrypoint/build.gradle.kts
index c50803b..0eb9166 100644
--- a/compiler/fir/entrypoint/build.gradle.kts
+++ b/compiler/fir/entrypoint/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/fir-deserialization/build.gradle.kts b/compiler/fir/fir-deserialization/build.gradle.kts
index cfd06c8..3ddf298 100644
--- a/compiler/fir/fir-deserialization/build.gradle.kts
+++ b/compiler/fir/fir-deserialization/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/fir-serialization/build.gradle.kts b/compiler/fir/fir-serialization/build.gradle.kts
index d83ffea..d8d7770 100644
--- a/compiler/fir/fir-serialization/build.gradle.kts
+++ b/compiler/fir/fir-serialization/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts
index 06fcb5c..bbc83f5 100644
--- a/compiler/fir/fir2ir/build.gradle.kts
+++ b/compiler/fir/fir2ir/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts
index c5346f1..67b862e 100644
--- a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts
+++ b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/java/build.gradle.kts b/compiler/fir/java/build.gradle.kts
index f46e702..e7b2e3f 100644
--- a/compiler/fir/java/build.gradle.kts
+++ b/compiler/fir/java/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts
index f200cec..43429f9 100644
--- a/compiler/fir/modularized-tests/build.gradle.kts
+++ b/compiler/fir/modularized-tests/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/native/build.gradle.kts b/compiler/fir/native/build.gradle.kts
index e4ff8d9..ca15278 100644
--- a/compiler/fir/native/build.gradle.kts
+++ b/compiler/fir/native/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/plugin-utils/build.gradle.kts b/compiler/fir/plugin-utils/build.gradle.kts
index 47d64ce..a5b9089 100644
--- a/compiler/fir/plugin-utils/build.gradle.kts
+++ b/compiler/fir/plugin-utils/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/providers/build.gradle.kts b/compiler/fir/providers/build.gradle.kts
index 1573102..ae2a637 100644
--- a/compiler/fir/providers/build.gradle.kts
+++ b/compiler/fir/providers/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
index f0342fd..e6fe2d8 100644
--- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
+++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
index e54afc6f..af23a47 100644
--- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts
+++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
@@ -7,6 +7,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts
index ffacf4b8..9e26426 100644
--- a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts
+++ b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("generators.checkers.generated-sources")
}
diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts
index 91c7c78..5767765 100644
--- a/compiler/fir/resolve/build.gradle.kts
+++ b/compiler/fir/resolve/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/semantics/build.gradle.kts b/compiler/fir/semantics/build.gradle.kts
index 739d2a6..906de3f 100644
--- a/compiler/fir/semantics/build.gradle.kts
+++ b/compiler/fir/semantics/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts
index 19e7e5f..7e66b844 100644
--- a/compiler/fir/tree/build.gradle.kts
+++ b/compiler/fir/tree/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts
index e7ba4f2..b2cb095 100644
--- a/compiler/fir/tree/tree-generator/build.gradle.kts
+++ b/compiler/fir/tree/tree-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
diff --git a/compiler/frontend.common-psi/build.gradle.kts b/compiler/frontend.common-psi/build.gradle.kts
index 7a137ff..3e8b451 100644
--- a/compiler/frontend.common-psi/build.gradle.kts
+++ b/compiler/frontend.common-psi/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/frontend.common.jvm/build.gradle.kts b/compiler/frontend.common.jvm/build.gradle.kts
index 8a0ac70..4cd0419 100644
--- a/compiler/frontend.common.jvm/build.gradle.kts
+++ b/compiler/frontend.common.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/frontend.common/build.gradle.kts b/compiler/frontend.common/build.gradle.kts
index 0ac8992..1a166ae 100644
--- a/compiler/frontend.common/build.gradle.kts
+++ b/compiler/frontend.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts
index ef6775b..2fa2272 100644
--- a/compiler/frontend.java/build.gradle.kts
+++ b/compiler/frontend.java/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -22,4 +23,3 @@
"main" { projectDefault() }
"test" {}
}
-
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index f967af1..b94e200 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/frontend/cfg/build.gradle.kts b/compiler/frontend/cfg/build.gradle.kts
index a92f373..9326e88 100644
--- a/compiler/frontend/cfg/build.gradle.kts
+++ b/compiler/frontend/cfg/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index 967cf9c..cd56842 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/backend.common/build.gradle.kts b/compiler/ir/backend.common/build.gradle.kts
index 71c03ca..f910deb 100644
--- a/compiler/ir/backend.common/build.gradle.kts
+++ b/compiler/ir/backend.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -22,4 +23,3 @@
"main" { projectDefault() }
"test" { projectDefault() }
}
-
diff --git a/compiler/ir/backend.js/build.gradle.kts b/compiler/ir/backend.js/build.gradle.kts
index f0beb25..1736e6c 100644
--- a/compiler/ir/backend.js/build.gradle.kts
+++ b/compiler/ir/backend.js/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts
index ac6d020..a696aeb 100644
--- a/compiler/ir/backend.jvm/build.gradle.kts
+++ b/compiler/ir/backend.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/backend.jvm/codegen/build.gradle.kts b/compiler/ir/backend.jvm/codegen/build.gradle.kts
index 503b5e7..d4311c8 100644
--- a/compiler/ir/backend.jvm/codegen/build.gradle.kts
+++ b/compiler/ir/backend.jvm/codegen/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/backend.jvm/entrypoint/build.gradle.kts b/compiler/ir/backend.jvm/entrypoint/build.gradle.kts
index f51c1fe..25db2e9 100644
--- a/compiler/ir/backend.jvm/entrypoint/build.gradle.kts
+++ b/compiler/ir/backend.jvm/entrypoint/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/backend.jvm/lower/build.gradle.kts b/compiler/ir/backend.jvm/lower/build.gradle.kts
index c6e73b5..34a3f2c 100644
--- a/compiler/ir/backend.jvm/lower/build.gradle.kts
+++ b/compiler/ir/backend.jvm/lower/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/backend.wasm/build.gradle.kts b/compiler/ir/backend.wasm/build.gradle.kts
index 3b59927..c7a8d75 100644
--- a/compiler/ir/backend.wasm/build.gradle.kts
+++ b/compiler/ir/backend.wasm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/ir.actualization/build.gradle.kts b/compiler/ir/ir.actualization/build.gradle.kts
index 5c401f1..e154d97 100644
--- a/compiler/ir/ir.actualization/build.gradle.kts
+++ b/compiler/ir/ir.actualization/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -19,4 +20,3 @@
"main" { projectDefault() }
"test" {}
}
-
diff --git a/compiler/ir/ir.inline/build.gradle.kts b/compiler/ir/ir.inline/build.gradle.kts
index 6597f5b..26659dd 100644
--- a/compiler/ir/ir.inline/build.gradle.kts
+++ b/compiler/ir/ir.inline/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -14,4 +15,3 @@
"main" { projectDefault() }
"test" {}
}
-
diff --git a/compiler/ir/ir.interpreter/build.gradle.kts b/compiler/ir/ir.interpreter/build.gradle.kts
index 1c826e7..b01c184 100644
--- a/compiler/ir/ir.interpreter/build.gradle.kts
+++ b/compiler/ir/ir.interpreter/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -18,4 +19,3 @@
"main" { projectDefault() }
"test" {}
}
-
diff --git a/compiler/ir/ir.objcinterop/build.gradle.kts b/compiler/ir/ir.objcinterop/build.gradle.kts
index cedc81e..1170b18 100644
--- a/compiler/ir/ir.objcinterop/build.gradle.kts
+++ b/compiler/ir/ir.objcinterop/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts
index 0bd478f..0d2cf9a 100644
--- a/compiler/ir/ir.psi2ir/build.gradle.kts
+++ b/compiler/ir/ir.psi2ir/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/ir.tree/build.gradle.kts b/compiler/ir/ir.tree/build.gradle.kts
index 8ec7fee..8716c49 100644
--- a/compiler/ir/ir.tree/build.gradle.kts
+++ b/compiler/ir/ir.tree/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/ir.tree/tree-generator/build.gradle.kts b/compiler/ir/ir.tree/tree-generator/build.gradle.kts
index 8969668..8ac27b6 100644
--- a/compiler/ir/ir.tree/tree-generator/build.gradle.kts
+++ b/compiler/ir/ir.tree/tree-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts
index 890d3f2..fbfa747 100644
--- a/compiler/ir/serialization.common/build.gradle.kts
+++ b/compiler/ir/serialization.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/serialization.js/build.gradle.kts b/compiler/ir/serialization.js/build.gradle.kts
index a1966e9..45633c1 100644
--- a/compiler/ir/serialization.js/build.gradle.kts
+++ b/compiler/ir/serialization.js/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/serialization.jvm/build.gradle.kts b/compiler/ir/serialization.jvm/build.gradle.kts
index adfa6e4..3f0dae9 100644
--- a/compiler/ir/serialization.jvm/build.gradle.kts
+++ b/compiler/ir/serialization.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/ir/serialization.native/build.gradle.kts b/compiler/ir/serialization.native/build.gradle.kts
index a4774b9..3adcdc9 100644
--- a/compiler/ir/serialization.native/build.gradle.kts
+++ b/compiler/ir/serialization.native/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/javac-wrapper/build.gradle.kts b/compiler/javac-wrapper/build.gradle.kts
index ecd8032..a7ba77d 100644
--- a/compiler/javac-wrapper/build.gradle.kts
+++ b/compiler/javac-wrapper/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts
index 8f75783..491239a 100644
--- a/compiler/light-classes/build.gradle.kts
+++ b/compiler/light-classes/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts
index 5cca2f2..06b44c9 100644
--- a/compiler/plugin-api/build.gradle.kts
+++ b/compiler/plugin-api/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts
index 2676fc9..c15f4d9 100644
--- a/compiler/preloader/build.gradle.kts
+++ b/compiler/preloader/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts
index 9dc77293..5b0ee52 100644
--- a/compiler/psi/build.gradle.kts
+++ b/compiler/psi/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/resolution.common.jvm/build.gradle.kts b/compiler/resolution.common.jvm/build.gradle.kts
index d68a936..062167d 100644
--- a/compiler/resolution.common.jvm/build.gradle.kts
+++ b/compiler/resolution.common.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/resolution.common/build.gradle.kts b/compiler/resolution.common/build.gradle.kts
index a4547cc..03bc7da 100644
--- a/compiler/resolution.common/build.gradle.kts
+++ b/compiler/resolution.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts
index 18fe805..bee1bda 100644
--- a/compiler/resolution/build.gradle.kts
+++ b/compiler/resolution/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts
index 5e3ba61..1592239 100644
--- a/compiler/serialization/build.gradle.kts
+++ b/compiler/serialization/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/test-infrastructure-utils/build.gradle.kts b/compiler/test-infrastructure-utils/build.gradle.kts
index 71974c9..1b43b58 100644
--- a/compiler/test-infrastructure-utils/build.gradle.kts
+++ b/compiler/test-infrastructure-utils/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/test-infrastructure/build.gradle.kts b/compiler/test-infrastructure/build.gradle.kts
index 7e09a5c..419b026 100644
--- a/compiler/test-infrastructure/build.gradle.kts
+++ b/compiler/test-infrastructure/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-against-klib/build.gradle.kts b/compiler/tests-against-klib/build.gradle.kts
index ecd32c8..a4b111d 100644
--- a/compiler/tests-against-klib/build.gradle.kts
+++ b/compiler/tests-against-klib/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("compiler-tests-convention")
}
diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts
index 5d03596..253d638 100644
--- a/compiler/tests-common-new/build.gradle.kts
+++ b/compiler/tests-common-new/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("compiler-tests-convention")
}
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index 8955b0d..f4bb8fd 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts
index cde0542..e8405e3 100644
--- a/compiler/tests-compiler-utils/build.gradle.kts
+++ b/compiler/tests-compiler-utils/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts
index 471605b..78bf945 100644
--- a/compiler/tests-different-jdk/build.gradle.kts
+++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-for-compiler-generator/build.gradle.kts b/compiler/tests-for-compiler-generator/build.gradle.kts
index 0aa4b7f..77b0f49 100644
--- a/compiler/tests-for-compiler-generator/build.gradle.kts
+++ b/compiler/tests-for-compiler-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-integration/build.gradle.kts b/compiler/tests-integration/build.gradle.kts
index 5cfaa8d..53f1d1a 100644
--- a/compiler/tests-integration/build.gradle.kts
+++ b/compiler/tests-integration/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 969a8d0..26da659 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-mutes/build.gradle.kts b/compiler/tests-mutes/build.gradle.kts
index 019f8af..280ddba 100644
--- a/compiler/tests-mutes/build.gradle.kts
+++ b/compiler/tests-mutes/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/tests-mutes/tc-integration/build.gradle.kts b/compiler/tests-mutes/tc-integration/build.gradle.kts
index b214c5a..3315b07 100644
--- a/compiler/tests-mutes/tc-integration/build.gradle.kts
+++ b/compiler/tests-mutes/tc-integration/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 5a0531d..052977a 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("compiler-tests-convention")
}
diff --git a/compiler/util-io/build.gradle.kts b/compiler/util-io/build.gradle.kts
index 2702ab5..e0afc20 100644
--- a/compiler/util-io/build.gradle.kts
+++ b/compiler/util-io/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/util-klib-abi/build.gradle.kts b/compiler/util-klib-abi/build.gradle.kts
index 4a0a3c9..aef9589 100644
--- a/compiler/util-klib-abi/build.gradle.kts
+++ b/compiler/util-klib-abi/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/compiler/util-klib-metadata/build.gradle.kts b/compiler/util-klib-metadata/build.gradle.kts
index e387987..0a86e4b 100644
--- a/compiler/util-klib-metadata/build.gradle.kts
+++ b/compiler/util-klib-metadata/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/compiler/util-klib/build.gradle.kts b/compiler/util-klib/build.gradle.kts
index dca6bce..35330aa 100644
--- a/compiler/util-klib/build.gradle.kts
+++ b/compiler/util-klib/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -25,4 +26,4 @@
publish()
-standardPublicJars()
\ No newline at end of file
+standardPublicJars()
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index 5b49ec04..f9b2332 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
@@ -41,4 +42,4 @@
projectTest(parallel = true) {
workingDir = rootDir
-}
\ No newline at end of file
+}
diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index a2aaf5d..0aaa551 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -1,6 +1,7 @@
import org.gradle.api.tasks.PathSensitivity.RELATIVE
plugins {
+ id("java-instrumentation")
base
`maven-publish`
}
diff --git a/core/compiler.common.js/build.gradle.kts b/core/compiler.common.js/build.gradle.kts
index 636b5c3..2c61451 100644
--- a/core/compiler.common.js/build.gradle.kts
+++ b/core/compiler.common.js/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/compiler.common.jvm/build.gradle.kts b/core/compiler.common.jvm/build.gradle.kts
index cee0329..c3f7d8f 100644
--- a/core/compiler.common.jvm/build.gradle.kts
+++ b/core/compiler.common.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/core/compiler.common.native/build.gradle.kts b/core/compiler.common.native/build.gradle.kts
index c70c878..221260b4 100644
--- a/core/compiler.common.native/build.gradle.kts
+++ b/core/compiler.common.native/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/compiler.common.wasm/build.gradle.kts b/core/compiler.common.wasm/build.gradle.kts
index 4ee5cdf..0afab12 100644
--- a/core/compiler.common.wasm/build.gradle.kts
+++ b/core/compiler.common.wasm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/compiler.common.web/build.gradle.kts b/core/compiler.common.web/build.gradle.kts
index 166bf0f..45163ff 100644
--- a/core/compiler.common.web/build.gradle.kts
+++ b/core/compiler.common.web/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/compiler.common/build.gradle.kts b/core/compiler.common/build.gradle.kts
index 570c88e..bad8b2a 100644
--- a/core/compiler.common/build.gradle.kts
+++ b/core/compiler.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index 4d40085..8c2bcac 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index 60982cb..4e12c36 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index e9dbc49..2ba71ea 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/core/deserialization.common.jvm/build.gradle.kts b/core/deserialization.common.jvm/build.gradle.kts
index 0fc1a12..c362078 100644
--- a/core/deserialization.common.jvm/build.gradle.kts
+++ b/core/deserialization.common.jvm/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/deserialization.common/build.gradle.kts b/core/deserialization.common/build.gradle.kts
index 86e27b8..13645db 100644
--- a/core/deserialization.common/build.gradle.kts
+++ b/core/deserialization.common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index 536a9f8..a80d5cc 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index ab6c337..1b81796 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index d661247..d794298 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 7d910b4..e37467d 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/dependencies/intellij-core/build.gradle.kts b/dependencies/intellij-core/build.gradle.kts
index 15ce6ee..fc7b9fa 100644
--- a/dependencies/intellij-core/build.gradle.kts
+++ b/dependencies/intellij-core/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
`java-library`
}
@@ -33,4 +34,4 @@
api("com.jetbrains.intellij.java:java-psi:$intellijVersion") { isTransitive = false }
api("com.jetbrains.intellij.java:java-psi-impl:$intellijVersion") { isTransitive = false }
runtimeOnly("com.jetbrains.intellij.platform:diagnostic:$intellijVersion") { isTransitive = false }
-}
\ No newline at end of file
+}
diff --git a/dependencies/tools-jar-api/build.gradle.kts b/dependencies/tools-jar-api/build.gradle.kts
index 7b628cd..34ef447 100644
--- a/dependencies/tools-jar-api/build.gradle.kts
+++ b/dependencies/tools-jar-api/build.gradle.kts
@@ -8,6 +8,7 @@
import java.util.zip.ZipFile
plugins {
+ id("java-instrumentation")
base
`java-base`
}
diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts
index c981f4a..4bedc8a 100644
--- a/generators/analysis-api-generator/build.gradle.kts
+++ b/generators/analysis-api-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index e01947a..b18dcf1 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/generators/ide-iml-to-gradle-generator/build.gradle.kts b/generators/ide-iml-to-gradle-generator/build.gradle.kts
index 3426d1f..6bd83a3 100644
--- a/generators/ide-iml-to-gradle-generator/build.gradle.kts
+++ b/generators/ide-iml-to-gradle-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/generators/sir-tests-generator/build.gradle.kts b/generators/sir-tests-generator/build.gradle.kts
index a074a7e..030b0e7 100644
--- a/generators/sir-tests-generator/build.gradle.kts
+++ b/generators/sir-tests-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts
index 3f8fac6..9670c5f 100644
--- a/generators/test-generator/build.gradle.kts
+++ b/generators/test-generator/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/generators/tree-generator-common/build.gradle.kts b/generators/tree-generator-common/build.gradle.kts
index e1cc9d6..032bd17 100644
--- a/generators/tree-generator-common/build.gradle.kts
+++ b/generators/tree-generator-common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts
index 585cd32..2ab47a1 100644
--- a/jps/jps-common/build.gradle.kts
+++ b/jps/jps-common/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/jps/jps-platform-api-signatures/build.gradle.kts b/jps/jps-platform-api-signatures/build.gradle.kts
index b1d3a1a..e365ab6 100644
--- a/jps/jps-platform-api-signatures/build.gradle.kts
+++ b/jps/jps-platform-api-signatures/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 896600d..c679e6c 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -142,4 +143,4 @@
tasks.withType<KotlinCompilationTask<*>>().configureEach {
compilerOptions.apiVersion.value(KotlinVersion.KOTLIN_1_8).finalizeValueOnRead()
compilerOptions.languageVersion.value(KotlinVersion.KOTLIN_1_8).finalizeValueOnRead()
-}
\ No newline at end of file
+}
diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts
index 9246b00..b6c138c 100644
--- a/js/js.ast/build.gradle.kts
+++ b/js/js.ast/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.config/build.gradle.kts b/js/js.config/build.gradle.kts
index 86f93ed..1f75acb 100644
--- a/js/js.config/build.gradle.kts
+++ b/js/js.config/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts
index 43295ac..deeb809 100644
--- a/js/js.dce/build.gradle.kts
+++ b/js/js.dce/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -17,4 +18,3 @@
"main" { projectDefault() }
"test" {}
}
-
diff --git a/js/js.engines/build.gradle.kts b/js/js.engines/build.gradle.kts
index 555a7d7..ea0fd79 100644
--- a/js/js.engines/build.gradle.kts
+++ b/js/js.engines/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts
index 2936d2f..b14cf37 100644
--- a/js/js.frontend/build.gradle.kts
+++ b/js/js.frontend/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts
index 2cd8a8a..5d13af7 100644
--- a/js/js.parser/build.gradle.kts
+++ b/js/js.parser/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts
index b720cea..03990b9 100644
--- a/js/js.serializer/build.gradle.kts
+++ b/js/js.serializer/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.sourcemap/build.gradle.kts b/js/js.sourcemap/build.gradle.kts
index 5c78766..5deb2e0 100644
--- a/js/js.sourcemap/build.gradle.kts
+++ b/js/js.sourcemap/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 793a007..d639ed5 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -9,6 +9,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
kotlin("plugin.serialization")
id("jps-compatible")
alias(libs.plugins.gradle.node)
diff --git a/js/js.tests/klib-compatibility/build.gradle.kts b/js/js.tests/klib-compatibility/build.gradle.kts
index bfe4be9..da929a1 100644
--- a/js/js.tests/klib-compatibility/build.gradle.kts
+++ b/js/js.tests/klib-compatibility/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -60,4 +61,3 @@
setUpJsBoxTests()
useJUnitPlatform()
}
-
diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts
index 121a275..0f4db61 100644
--- a/js/js.translator/build.gradle.kts
+++ b/js/js.translator/build.gradle.kts
@@ -1,6 +1,7 @@
import org.gradle.plugins.ide.idea.model.IdeaModel
plugins {
+ id("java-instrumentation")
idea
kotlin("jvm")
id("jps-compatible")
diff --git a/libraries/examples/annotation-processor-example/build.gradle.kts b/libraries/examples/annotation-processor-example/build.gradle.kts
index 8ce00d0..ecbdcd1 100644
--- a/libraries/examples/annotation-processor-example/build.gradle.kts
+++ b/libraries/examples/annotation-processor-example/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
`maven-publish` // only used for installing to mavenLocal()
}
@@ -23,4 +24,4 @@
tasks.register("install") {
dependsOn(tasks.named("publishToMavenLocal"))
-}
\ No newline at end of file
+}
diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
index 578e1af..98ddbe8 100644
--- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -17,4 +18,3 @@
"main" { projectDefault() }
"test" { projectDefault() }
}
-
diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
index 6f34ad7..be82220 100644
--- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
index faef44e..221ded3 100644
--- a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
index b1fdc34..f3695a0 100644
--- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
index a5bc53f..ad5efac 100644
--- a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/libraries/kotlin-dom-api-compat/build.gradle.kts b/libraries/kotlin-dom-api-compat/build.gradle.kts
index 5fb940c..cbab4aa 100644
--- a/libraries/kotlin-dom-api-compat/build.gradle.kts
+++ b/libraries/kotlin-dom-api-compat/build.gradle.kts
@@ -6,6 +6,7 @@
import plugins.configureKotlinPomAttributes
plugins {
+ id("java-instrumentation")
`maven-publish`
kotlin("js")
}
diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts
index 6467405..adbc83d 100644
--- a/libraries/kotlin.test/build.gradle.kts
+++ b/libraries/kotlin.test/build.gradle.kts
@@ -14,6 +14,7 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
`maven-publish`
signing
}
diff --git a/libraries/kotlin.test/js/it/build.gradle.kts b/libraries/kotlin.test/js/it/build.gradle.kts
index 2ea759b..b6aa227 100644
--- a/libraries/kotlin.test/js/it/build.gradle.kts
+++ b/libraries/kotlin.test/js/it/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
alias(libs.plugins.gradle.node)
idea
}
diff --git a/libraries/kotlinx-metadata/build.gradle.kts b/libraries/kotlinx-metadata/build.gradle.kts
index 7997f63..aa21633 100644
--- a/libraries/kotlinx-metadata/build.gradle.kts
+++ b/libraries/kotlinx-metadata/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts
index 26e8ab8..93ada80 100644
--- a/libraries/kotlinx-metadata/jvm/build.gradle.kts
+++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts
@@ -6,6 +6,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
id("org.jetbrains.dokka")
diff --git a/libraries/kotlinx-metadata/klib/build.gradle.kts b/libraries/kotlinx-metadata/klib/build.gradle.kts
index d952d9f..3308bb5 100644
--- a/libraries/kotlinx-metadata/klib/build.gradle.kts
+++ b/libraries/kotlinx-metadata/klib/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index 061bcbc..325eb36 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -17,6 +17,7 @@
}
plugins {
+ id("java-instrumentation")
`java-library`
}
diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts
index 4a99392..ffa6bc6 100644
--- a/libraries/scripting/common/build.gradle.kts
+++ b/libraries/scripting/common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts
index 8ec25e1..f80cd17 100644
--- a/libraries/scripting/dependencies-maven-all/build.gradle.kts
+++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts
@@ -15,6 +15,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts
index 39994a4..776e0a7 100644
--- a/libraries/scripting/dependencies-maven/build.gradle.kts
+++ b/libraries/scripting/dependencies-maven/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts
index e84d3ad..5a9cc2e 100644
--- a/libraries/scripting/dependencies/build.gradle.kts
+++ b/libraries/scripting/dependencies/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/scripting/intellij/build.gradle.kts b/libraries/scripting/intellij/build.gradle.kts
index c20b1ad..d3f4a83 100644
--- a/libraries/scripting/intellij/build.gradle.kts
+++ b/libraries/scripting/intellij/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/scripting/jsr223-embeddable/build.gradle.kts b/libraries/scripting/jsr223-embeddable/build.gradle.kts
index 42f6902..c77ec94 100644
--- a/libraries/scripting/jsr223-embeddable/build.gradle.kts
+++ b/libraries/scripting/jsr223-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin Scripting JSR-223 support"
plugins {
+ id("java-instrumentation")
java
}
diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts
index 2bfe63e..dce6359 100644
--- a/libraries/scripting/jsr223-test/build.gradle.kts
+++ b/libraries/scripting/jsr223-test/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val embeddableTestRuntime by configurations.creating {
diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts
index ef52789..8aa4149 100644
--- a/libraries/scripting/jsr223/build.gradle.kts
+++ b/libraries/scripting/jsr223/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publish()
@@ -32,4 +33,3 @@
standardPublicJars()
projectTest(parallel = true)
-
diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts
index 9554a2b..1fbdaa8 100644
--- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts
+++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin Scripting JVM host (for using with embeddable compiler)"
plugins {
+ id("java-instrumentation")
java
}
diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts
index c47d84d..f85c684 100644
--- a/libraries/scripting/jvm-host-test/build.gradle.kts
+++ b/libraries/scripting/jvm-host-test/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val allTestsRuntime by configurations.creating
@@ -24,7 +25,7 @@
testRuntimeOnly(project(":kotlin-compiler"))
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
-
+
embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
embeddableTestRuntime(kotlinTest("junit"))
embeddableTestRuntime(projectTests(":compiler:tests-common")) { isTransitive = false }
diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts
index 619ca20..aaad071 100644
--- a/libraries/scripting/jvm-host/build.gradle.kts
+++ b/libraries/scripting/jvm-host/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -32,4 +33,3 @@
}
standardPublicJars()
-
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index 4d85cf4..8b52306 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index 5052edc2..22acd0a 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -22,6 +22,7 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
`maven-publish`
signing
}
diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
index 04ed2ab..65cee26 100644
--- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
}
kotlin {
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index b340cb3..a1fad75 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
`maven-publish`
}
diff --git a/libraries/tools/abi-comparator/build.gradle.kts b/libraries/tools/abi-comparator/build.gradle.kts
index 03ee8b6..9d502a8 100644
--- a/libraries/tools/abi-comparator/build.gradle.kts
+++ b/libraries/tools/abi-comparator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
@@ -28,4 +29,4 @@
application {
mainClass = "org.jetbrains.kotlin.abicmp.AbiComparatorMain"
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/atomicfu/build.gradle.kts b/libraries/tools/atomicfu/build.gradle.kts
index f4f8482..1b1fd30 100644
--- a/libraries/tools/atomicfu/build.gradle.kts
+++ b/libraries/tools/atomicfu/build.gradle.kts
@@ -18,4 +18,4 @@
implementationClass = "org.jetbrains.kotlinx.atomicfu.gradle.AtomicfuKotlinGradleSubplugin"
}
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle.kts b/libraries/tools/binary-compatibility-validator/build.gradle.kts
index 0aca34d..ce862b1 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle.kts
+++ b/libraries/tools/binary-compatibility-validator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val testArtifacts by configurations.creating
diff --git a/libraries/tools/gradle/android-test-fixes/build.gradle.kts b/libraries/tools/gradle/android-test-fixes/build.gradle.kts
index a797c6d..ddc638c 100644
--- a/libraries/tools/gradle/android-test-fixes/build.gradle.kts
+++ b/libraries/tools/gradle/android-test-fixes/build.gradle.kts
@@ -43,4 +43,4 @@
tasks.named("publishPlugins") {
enabled = false
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/gradle/gradle-warnings-detector/build.gradle.kts b/libraries/tools/gradle/gradle-warnings-detector/build.gradle.kts
index 200f14c..f9255d5 100644
--- a/libraries/tools/gradle/gradle-warnings-detector/build.gradle.kts
+++ b/libraries/tools/gradle/gradle-warnings-detector/build.gradle.kts
@@ -26,4 +26,4 @@
tasks.named("publishPlugins") {
enabled = false
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/gradle/kotlin-compiler-args-properties/build.gradle.kts b/libraries/tools/gradle/kotlin-compiler-args-properties/build.gradle.kts
index 482ab25..2b1cf30 100644
--- a/libraries/tools/gradle/kotlin-compiler-args-properties/build.gradle.kts
+++ b/libraries/tools/gradle/kotlin-compiler-args-properties/build.gradle.kts
@@ -34,4 +34,4 @@
tasks.named("publishPlugins") {
enabled = false
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts b/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
index b9418e1..5573364 100644
--- a/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
+++ b/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/libraries/tools/gradle/regression-benchmarks/build.gradle.kts b/libraries/tools/gradle/regression-benchmarks/build.gradle.kts
index 1ce4779..9b8f9e0 100644
--- a/libraries/tools/gradle/regression-benchmarks/build.gradle.kts
+++ b/libraries/tools/gradle/regression-benchmarks/build.gradle.kts
@@ -1,6 +1,7 @@
import org.jetbrains.kotlin.build.androidsdkprovisioner.ProvisioningType
plugins {
+ id("java-instrumentation")
`java-base`
id("android-sdk-provisioner")
}
@@ -102,4 +103,4 @@
taskName = "benchmarkRegressionKvision",
script = "kvision.benchmark.kts",
JavaLanguageVersion.of(11)
-)
\ No newline at end of file
+)
diff --git a/libraries/tools/ide-plugin-dependencies-validator/build.gradle.kts b/libraries/tools/ide-plugin-dependencies-validator/build.gradle.kts
index aac9d25..3f50b97 100644
--- a/libraries/tools/ide-plugin-dependencies-validator/build.gradle.kts
+++ b/libraries/tools/ide-plugin-dependencies-validator/build.gradle.kts
@@ -3,6 +3,7 @@
import kotlin.io.path.readLines
plugins {
+ id("java-instrumentation")
application
kotlin("jvm")
id("jps-compatible")
diff --git a/libraries/tools/jdk-api-validator/build.gradle.kts b/libraries/tools/jdk-api-validator/build.gradle.kts
index e33b24f..21e8578 100644
--- a/libraries/tools/jdk-api-validator/build.gradle.kts
+++ b/libraries/tools/jdk-api-validator/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("kotlin")
}
diff --git a/libraries/tools/js-plain-objects/build.gradle.kts b/libraries/tools/js-plain-objects/build.gradle.kts
index 9fa61ff..d4a3f34 100644
--- a/libraries/tools/js-plain-objects/build.gradle.kts
+++ b/libraries/tools/js-plain-objects/build.gradle.kts
@@ -15,4 +15,4 @@
implementationClass = "org.jetbrains.kotlinx.jspo.gradle.JsPlainObjectsKotlinGradleSubplugin"
}
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts b/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
index f9cee6c..1e3059a 100644
--- a/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
+++ b/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
@@ -1,6 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
id("jps-compatible")
}
diff --git a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
index 81a2f73..efd4b01 100644
--- a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
@@ -4,6 +4,7 @@
description = "kotlin-gradle-statistics"
plugins {
+ id("java-instrumentation")
`java-library`
id("org.jetbrains.kotlin.jvm")
id("jps-compatible")
diff --git a/libraries/tools/kotlin-gradle-compiler-types/build.gradle.kts b/libraries/tools/kotlin-gradle-compiler-types/build.gradle.kts
index 6b563cf..3b40468 100644
--- a/libraries/tools/kotlin-gradle-compiler-types/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-compiler-types/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
id("jps-compatible")
}
diff --git a/libraries/tools/kotlin-gradle-plugin-annotations/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-annotations/build.gradle.kts
index 34246eb..963b78f 100644
--- a/libraries/tools/kotlin-gradle-plugin-annotations/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-annotations/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
}
@@ -22,4 +23,4 @@
apiBuild {
inputJar.value(jar.flatMap { it.archiveFile })
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
index fbba39c..71a54b8 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("gradle-plugin-dependency-configuration")
id("jps-compatible")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
index 5ed8c9f..f03831e 100644
--- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-idea-proto/build.gradle.kts
index f805f34..7de04e8 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/build.gradle.kts
@@ -6,6 +6,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts
index 37ecef9..1702ccd 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
`java-test-fixtures`
`maven-publish`
id("org.jetbrains.kotlinx.binary-compatibility-validator")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index 582d1c9..26526aa 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
kotlin("plugin.serialization")
id("android-sdk-provisioner")
}
diff --git a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
index b75dd4e..1bf4438 100644
--- a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("gradle-plugin-dependency-configuration")
id("jps-compatible")
}
diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts
index a5e958d..a6824e7 100644
--- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -18,4 +19,4 @@
"org.jetbrains.kotlin.generators.gradle.targets.js.outputSourceRoot",
project(":kotlin-gradle-plugin").projectDir.resolve("src/common/kotlin").absolutePath
)
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts
index 38f3fdd..5ea6610 100644
--- a/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
`maven-publish`
}
diff --git a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
index 4615012..f4f06bf 100644
--- a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
@@ -6,6 +6,7 @@
description = "Shaded test jars from compiler for Gradle integration tests"
plugins {
+ id("java-instrumentation")
`java-library`
}
diff --git a/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts b/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts
index f04820f..84a3075 100644
--- a/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts
@@ -1,6 +1,7 @@
import plugins.signLibraryPublication
plugins {
+ id("java-instrumentation")
id("java-platform")
id("maven-publish")
}
diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
index 81a2f73..efd4b01 100644
--- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
@@ -4,6 +4,7 @@
description = "kotlin-gradle-statistics"
plugins {
+ id("java-instrumentation")
`java-library`
id("org.jetbrains.kotlin.jvm")
id("jps-compatible")
diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
index d8d71a0..3880548 100644
--- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val kotlinxSerializationGradlePluginClasspath by configurations.creating
diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts
index d2efaf8..2e9a630 100644
--- a/libraries/tools/kotlin-main-kts/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/tools/kotlin-privacy-manifests-plugin/build.gradle.kts b/libraries/tools/kotlin-privacy-manifests-plugin/build.gradle.kts
index cf0d1e0..e437046 100644
--- a/libraries/tools/kotlin-privacy-manifests-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-privacy-manifests-plugin/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
`java-gradle-plugin`
`maven-publish`
}
@@ -88,4 +89,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
index a75096b..f63d770 100644
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
@@ -21,4 +21,4 @@
implementationClass = "org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin"
}
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-stdlib-gen/build.gradle.kts b/libraries/tools/kotlin-stdlib-gen/build.gradle.kts
index ebcf322..1f5c570 100644
--- a/libraries/tools/kotlin-stdlib-gen/build.gradle.kts
+++ b/libraries/tools/kotlin-stdlib-gen/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val copyrightDirectory = project.layout.buildDirectory.dir("copyright")
diff --git a/libraries/tools/kotlin-tooling-core/build.gradle.kts b/libraries/tools/kotlin-tooling-core/build.gradle.kts
index 72f2858..ede836f 100644
--- a/libraries/tools/kotlin-tooling-core/build.gradle.kts
+++ b/libraries/tools/kotlin-tooling-core/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
}
@@ -18,4 +19,4 @@
apiBuild {
inputJar.value(jar.flatMap { it.archiveFile })
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-tooling-metadata/build.gradle.kts b/libraries/tools/kotlin-tooling-metadata/build.gradle.kts
index da7bab5..f67a244 100644
--- a/libraries/tools/kotlin-tooling-metadata/build.gradle.kts
+++ b/libraries/tools/kotlin-tooling-metadata/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
kotlin("jvm")
id("jps-compatible")
diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts
index 74e77ce..7b2ce85 100644
--- a/libraries/tools/kotlinp/build.gradle.kts
+++ b/libraries/tools/kotlinp/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/tools/kotlinp/jvm/build.gradle.kts b/libraries/tools/kotlinp/jvm/build.gradle.kts
index 117b639..887c2e5 100644
--- a/libraries/tools/kotlinp/jvm/build.gradle.kts
+++ b/libraries/tools/kotlinp/jvm/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/tools/kotlinp/klib/build.gradle.kts b/libraries/tools/kotlinp/klib/build.gradle.kts
index 8b61926..d3c1923 100644
--- a/libraries/tools/kotlinp/klib/build.gradle.kts
+++ b/libraries/tools/kotlinp/klib/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/libraries/tools/mutability-annotations-compat/build.gradle.kts b/libraries/tools/mutability-annotations-compat/build.gradle.kts
index c9f05fa..b59f5ba 100644
--- a/libraries/tools/mutability-annotations-compat/build.gradle.kts
+++ b/libraries/tools/mutability-annotations-compat/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Compatibility artifact with Mutable and ReadOnly annotations"
plugins {
+ id("java-instrumentation")
java
id("jps-compatible")
}
diff --git a/native/analysis-api-klib-reader/build.gradle.kts b/native/analysis-api-klib-reader/build.gradle.kts
index f4ca09d..868b55bd 100644
--- a/native/analysis-api-klib-reader/build.gradle.kts
+++ b/native/analysis-api-klib-reader/build.gradle.kts
@@ -6,6 +6,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/native/analysis-api-klib-reader/testProject/build.gradle.kts b/native/analysis-api-klib-reader/testProject/build.gradle.kts
index cd2fc6c..424adca 100644
--- a/native/analysis-api-klib-reader/testProject/build.gradle.kts
+++ b/native/analysis-api-klib-reader/testProject/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
}
kotlin {
diff --git a/native/base/build.gradle.kts b/native/base/build.gradle.kts
index a6da10b..a605d90 100644
--- a/native/base/build.gradle.kts
+++ b/native/base/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/native/commonizer-api/build.gradle.kts b/native/commonizer-api/build.gradle.kts
index e9ebffa..5a7d999 100644
--- a/native/commonizer-api/build.gradle.kts
+++ b/native/commonizer-api/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/native/commonizer-embeddable/build.gradle.kts b/native/commonizer-embeddable/build.gradle.kts
index cb54696..d1eae182 100644
--- a/native/commonizer-embeddable/build.gradle.kts
+++ b/native/commonizer-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin KLIB Library Commonizer (for using with embeddable compiler)"
plugins {
+ id("java-instrumentation")
java
}
diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts
index 52938e8..1cd607f 100644
--- a/native/commonizer/build.gradle.kts
+++ b/native/commonizer/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
description = "Kotlin KLIB Library Commonizer"
diff --git a/native/executors/build.gradle.kts b/native/executors/build.gradle.kts
index 9f1c97b..25708bb 100644
--- a/native/executors/build.gradle.kts
+++ b/native/executors/build.gradle.kts
@@ -8,6 +8,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val isNativeBuildToolsProject = rootProject.name == "native-build-tools"
diff --git a/native/frontend/build.gradle.kts b/native/frontend/build.gradle.kts
index d055c69..7f4bd12 100644
--- a/native/frontend/build.gradle.kts
+++ b/native/frontend/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts
index 1827186..c8e627d 100644
--- a/native/native.tests/build.gradle.kts
+++ b/native/native.tests/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/native/native.tests/driver/build.gradle.kts b/native/native.tests/driver/build.gradle.kts
index 592cbea..506fb04 100644
--- a/native/native.tests/driver/build.gradle.kts
+++ b/native/native.tests/driver/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -24,4 +25,4 @@
"test",
null,
allowParallelExecution = false, // Driver tests run Native compiler from CLI. This is resource-intensive and should be done isolated.
-)
\ No newline at end of file
+)
diff --git a/native/native.tests/klib-compatibility/build.gradle.kts b/native/native.tests/klib-compatibility/build.gradle.kts
index 544f258..c62418c 100644
--- a/native/native.tests/klib-compatibility/build.gradle.kts
+++ b/native/native.tests/klib-compatibility/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -52,4 +53,4 @@
null,
releasedCompilerDist = releasedCompilerDist,
maxMetaspaceSizeMb = 1024 // to handle two compilers in classloader
-)
\ No newline at end of file
+)
diff --git a/native/native.tests/stress/build.gradle.kts b/native/native.tests/stress/build.gradle.kts
index 5496845..163a6b9 100644
--- a/native/native.tests/stress/build.gradle.kts
+++ b/native/native.tests/stress/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -25,4 +26,4 @@
null,
requirePlatformLibs = true,
allowParallelExecution = false, // Stress tests are resource-intensive tests and they must be run in isolation.
-)
\ No newline at end of file
+)
diff --git a/native/objcexport-header-generator/build.gradle.kts b/native/objcexport-header-generator/build.gradle.kts
index d56156e..2f5555d 100644
--- a/native/objcexport-header-generator/build.gradle.kts
+++ b/native/objcexport-header-generator/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
sourceSets {
diff --git a/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts b/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts
index 19ad1cc..9795dd1 100644
--- a/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts
+++ b/native/objcexport-header-generator/impl/analysis-api/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
kotlin {
diff --git a/native/objcexport-header-generator/impl/k1/build.gradle.kts b/native/objcexport-header-generator/impl/k1/build.gradle.kts
index 01889e12..dd897fb 100644
--- a/native/objcexport-header-generator/impl/k1/build.gradle.kts
+++ b/native/objcexport-header-generator/impl/k1/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
sourceSets {
diff --git a/native/objcexport-header-generator/testDependencies/testExtensionsLibrary/build.gradle.kts b/native/objcexport-header-generator/testDependencies/testExtensionsLibrary/build.gradle.kts
index 4e658db..d2d5cdd 100644
--- a/native/objcexport-header-generator/testDependencies/testExtensionsLibrary/build.gradle.kts
+++ b/native/objcexport-header-generator/testDependencies/testExtensionsLibrary/build.gradle.kts
@@ -1,3 +1,4 @@
plugins {
+ id("java-instrumentation")
id("objc-export-header-generator-test-library")
}
diff --git a/native/objcexport-header-generator/testDependencies/testInternalLibrary/build.gradle.kts b/native/objcexport-header-generator/testDependencies/testInternalLibrary/build.gradle.kts
index 4e658db..d2d5cdd 100644
--- a/native/objcexport-header-generator/testDependencies/testInternalLibrary/build.gradle.kts
+++ b/native/objcexport-header-generator/testDependencies/testInternalLibrary/build.gradle.kts
@@ -1,3 +1,4 @@
plugins {
+ id("java-instrumentation")
id("objc-export-header-generator-test-library")
}
diff --git a/native/objcexport-header-generator/testDependencies/testLibraryA/build.gradle.kts b/native/objcexport-header-generator/testDependencies/testLibraryA/build.gradle.kts
index 4e658db..d2d5cdd 100644
--- a/native/objcexport-header-generator/testDependencies/testLibraryA/build.gradle.kts
+++ b/native/objcexport-header-generator/testDependencies/testLibraryA/build.gradle.kts
@@ -1,3 +1,4 @@
plugins {
+ id("java-instrumentation")
id("objc-export-header-generator-test-library")
}
diff --git a/native/objcexport-header-generator/testDependencies/testLibraryB/build.gradle.kts b/native/objcexport-header-generator/testDependencies/testLibraryB/build.gradle.kts
index 4e658db..d2d5cdd 100644
--- a/native/objcexport-header-generator/testDependencies/testLibraryB/build.gradle.kts
+++ b/native/objcexport-header-generator/testDependencies/testLibraryB/build.gradle.kts
@@ -1,3 +1,4 @@
plugins {
+ id("java-instrumentation")
id("objc-export-header-generator-test-library")
}
diff --git a/native/swift/build.gradle.kts b/native/swift/build.gradle.kts
index 1f4cd74..3dcdde8 100644
--- a/native/swift/build.gradle.kts
+++ b/native/swift/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
tasks.register("sirAllTests") {
@@ -9,4 +10,4 @@
":native:swift:sir-compiler-bridge:test",
":native:swift:sir-printer:test",
)
-}
\ No newline at end of file
+}
diff --git a/native/swift/sir-compiler-bridge/build.gradle.kts b/native/swift/sir-compiler-bridge/build.gradle.kts
index 170f14f..e903e7d 100644
--- a/native/swift/sir-compiler-bridge/build.gradle.kts
+++ b/native/swift/sir-compiler-bridge/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -45,4 +46,4 @@
runtimeJar()
sourcesJar()
-javadocJar()
\ No newline at end of file
+javadocJar()
diff --git a/native/swift/sir-light-classes/build.gradle.kts b/native/swift/sir-light-classes/build.gradle.kts
index 21a6a57..8ec817b 100644
--- a/native/swift/sir-light-classes/build.gradle.kts
+++ b/native/swift/sir-light-classes/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -27,4 +28,4 @@
runtimeJar()
sourcesJar()
-javadocJar()
\ No newline at end of file
+javadocJar()
diff --git a/native/swift/sir-printer/build.gradle.kts b/native/swift/sir-printer/build.gradle.kts
index 0536208..ff15d42 100644
--- a/native/swift/sir-printer/build.gradle.kts
+++ b/native/swift/sir-printer/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -43,4 +44,4 @@
runtimeJar()
sourcesJar()
-javadocJar()
\ No newline at end of file
+javadocJar()
diff --git a/native/swift/sir-providers/build.gradle.kts b/native/swift/sir-providers/build.gradle.kts
index d1e54c6..626a1ec 100644
--- a/native/swift/sir-providers/build.gradle.kts
+++ b/native/swift/sir-providers/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/native/swift/sir/build.gradle.kts b/native/swift/sir/build.gradle.kts
index 5f9fb27..46ac99c 100644
--- a/native/swift/sir/build.gradle.kts
+++ b/native/swift/sir/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/native/swift/sir/tree-generator/build.gradle.kts b/native/swift/sir/tree-generator/build.gradle.kts
index 44808c6..c571f496 100644
--- a/native/swift/sir/tree-generator/build.gradle.kts
+++ b/native/swift/sir/tree-generator/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
application
}
diff --git a/native/swift/swift-export-embeddable/build.gradle.kts b/native/swift/swift-export-embeddable/build.gradle.kts
index ef88687..9e7157e 100644
--- a/native/swift/swift-export-embeddable/build.gradle.kts
+++ b/native/swift/swift-export-embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
}
diff --git a/native/swift/swift-export-standalone/build.gradle.kts b/native/swift/swift-export-standalone/build.gradle.kts
index 4cb81ea..d4a34c5 100644
--- a/native/swift/swift-export-standalone/build.gradle.kts
+++ b/native/swift/swift-export-standalone/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts
index 28fdf87..30c1370 100644
--- a/native/utils/build.gradle.kts
+++ b/native/utils/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/allopen/allopen.cli/build.gradle.kts b/plugins/allopen/allopen.cli/build.gradle.kts
index 2b6729c..494a468 100644
--- a/plugins/allopen/allopen.cli/build.gradle.kts
+++ b/plugins/allopen/allopen.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/allopen/allopen.common/build.gradle.kts b/plugins/allopen/allopen.common/build.gradle.kts
index bc99536..fef5ccc 100644
--- a/plugins/allopen/allopen.common/build.gradle.kts
+++ b/plugins/allopen/allopen.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/allopen/allopen.embeddable/build.gradle.kts b/plugins/allopen/allopen.embeddable/build.gradle.kts
index 7349446..14d2590 100644
--- a/plugins/allopen/allopen.embeddable/build.gradle.kts
+++ b/plugins/allopen/allopen.embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/allopen/allopen.k1/build.gradle.kts b/plugins/allopen/allopen.k1/build.gradle.kts
index f559cee..165d321 100644
--- a/plugins/allopen/allopen.k1/build.gradle.kts
+++ b/plugins/allopen/allopen.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/allopen/allopen.k2/build.gradle.kts b/plugins/allopen/allopen.k2/build.gradle.kts
index 7fc77b2..0f34e4f 100644
--- a/plugins/allopen/allopen.k2/build.gradle.kts
+++ b/plugins/allopen/allopen.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/allopen/build.gradle.kts b/plugins/allopen/build.gradle.kts
index 2cfefa5..e7051f8 100644
--- a/plugins/allopen/build.gradle.kts
+++ b/plugins/allopen/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index b9b5cf2..d29e85e 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("android-sdk-provisioner")
}
diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
index 0d1a41b..e712526 100644
--- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/assign-plugin/assign-plugin.cli/build.gradle.kts b/plugins/assign-plugin/assign-plugin.cli/build.gradle.kts
index 9a0fd5e..925c665 100644
--- a/plugins/assign-plugin/assign-plugin.cli/build.gradle.kts
+++ b/plugins/assign-plugin/assign-plugin.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/assign-plugin/assign-plugin.common/build.gradle.kts b/plugins/assign-plugin/assign-plugin.common/build.gradle.kts
index 6b40d4d..9bda6eb 100644
--- a/plugins/assign-plugin/assign-plugin.common/build.gradle.kts
+++ b/plugins/assign-plugin/assign-plugin.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts b/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
index 7df04bd..2b1ce7b 100644
--- a/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
+++ b/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/assign-plugin/assign-plugin.k1/build.gradle.kts b/plugins/assign-plugin/assign-plugin.k1/build.gradle.kts
index ba5661c..ecb5d76 100644
--- a/plugins/assign-plugin/assign-plugin.k1/build.gradle.kts
+++ b/plugins/assign-plugin/assign-plugin.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/assign-plugin/assign-plugin.k2/build.gradle.kts b/plugins/assign-plugin/assign-plugin.k2/build.gradle.kts
index 85997dd..7302feb 100644
--- a/plugins/assign-plugin/assign-plugin.k2/build.gradle.kts
+++ b/plugins/assign-plugin/assign-plugin.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/assign-plugin/build.gradle.kts b/plugins/assign-plugin/build.gradle.kts
index c8c0ab2..e60cd9c 100644
--- a/plugins/assign-plugin/build.gradle.kts
+++ b/plugins/assign-plugin/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/atomicfu/atomicfu-compiler-embeddable/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler-embeddable/build.gradle.kts
index ab95c6b..da29548b 100644
--- a/plugins/atomicfu/atomicfu-compiler-embeddable/build.gradle.kts
+++ b/plugins/atomicfu/atomicfu-compiler-embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
index ad54765..946ae0e 100644
--- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
@@ -8,6 +8,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -206,4 +207,4 @@
if (kotlinBuildProperties.isKotlinNativeEnabled) {
dependsOn(nativeTest)
}
-}
\ No newline at end of file
+}
diff --git a/plugins/atomicfu/atomicfu-runtime/build.gradle.kts b/plugins/atomicfu/atomicfu-runtime/build.gradle.kts
index 35005e5..c075283 100644
--- a/plugins/atomicfu/atomicfu-runtime/build.gradle.kts
+++ b/plugins/atomicfu/atomicfu-runtime/build.gradle.kts
@@ -4,6 +4,7 @@
description = "Runtime library for the Atomicfu compiler plugin"
plugins {
+ id("java-instrumentation")
kotlin("js")
`maven-publish`
}
@@ -45,4 +46,4 @@
}
}
-configureDefaultPublishing()
\ No newline at end of file
+configureDefaultPublishing()
diff --git a/plugins/compose/compiler-hosted/build.gradle.kts b/plugins/compose/compiler-hosted/build.gradle.kts
index cae5189..ba6bf54 100644
--- a/plugins/compose/compiler-hosted/build.gradle.kts
+++ b/plugins/compose/compiler-hosted/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
repositories {
diff --git a/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts b/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts
index d89cb64..62c5cd4 100644
--- a/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts
+++ b/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
}
repositories {
@@ -101,4 +102,4 @@
this.systemProperty("java.awt.headless", "true")
// runtime tests are executed in this module with compiler built from source (see androidx.compose.compiler.plugins.kotlin.RuntimeTests)
this.inputs.dir(File(rootDir, "plugins/compose/compiler-hosted/runtime-tests/src")).withPathSensitivity(PathSensitivity.RELATIVE)
-}
\ No newline at end of file
+}
diff --git a/plugins/compose/compiler-hosted/integration-tests/protobuf-test-classes/build.gradle.kts b/plugins/compose/compiler-hosted/integration-tests/protobuf-test-classes/build.gradle.kts
index 719076a..250098e 100644
--- a/plugins/compose/compiler-hosted/integration-tests/protobuf-test-classes/build.gradle.kts
+++ b/plugins/compose/compiler-hosted/integration-tests/protobuf-test-classes/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("com.google.protobuf") version "0.9.4"
id("java")
}
diff --git a/plugins/compose/compiler/build.gradle.kts b/plugins/compose/compiler/build.gradle.kts
index 5162e16..f951901 100644
--- a/plugins/compose/compiler/build.gradle.kts
+++ b/plugins/compose/compiler/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
kotlin.jvmToolchain(11)
@@ -31,4 +32,4 @@
}
sourcesJar()
-javadocJar()
\ No newline at end of file
+javadocJar()
diff --git a/plugins/fir-plugin-prototype/build.gradle.kts b/plugins/fir-plugin-prototype/build.gradle.kts
index 772d9ac..7baf5d2 100644
--- a/plugins/fir-plugin-prototype/build.gradle.kts
+++ b/plugins/fir-plugin-prototype/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts b/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts
index d703c2d..dafc41d 100644
--- a/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts
+++ b/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts b/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
index 590ee7b..782280d 100644
--- a/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
+++ b/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("multiplatform")
+ id("java-instrumentation")
}
kotlin {
diff --git a/plugins/imports-dumper/build.gradle.kts b/plugins/imports-dumper/build.gradle.kts
index f80d98e..d2d89be 100644
--- a/plugins/imports-dumper/build.gradle.kts
+++ b/plugins/imports-dumper/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/js-plain-objects/compiler-plugin-embeddable/build.gradle.kts b/plugins/js-plain-objects/compiler-plugin-embeddable/build.gradle.kts
index 249268c..e9794d2 100644
--- a/plugins/js-plain-objects/compiler-plugin-embeddable/build.gradle.kts
+++ b/plugins/js-plain-objects/compiler-plugin-embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/js-plain-objects/compiler-plugin/build.gradle.kts b/plugins/js-plain-objects/compiler-plugin/build.gradle.kts
index fa588c0..beeac22 100644
--- a/plugins/js-plain-objects/compiler-plugin/build.gradle.kts
+++ b/plugins/js-plain-objects/compiler-plugin/build.gradle.kts
@@ -6,6 +6,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.backend/build.gradle.kts b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.backend/build.gradle.kts
index 4530bf2..a5701ab 100644
--- a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.backend/build.gradle.kts
+++ b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.backend/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/build.gradle.kts b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/build.gradle.kts
index 7c0078b..31e3d78 100644
--- a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/build.gradle.kts
+++ b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/build.gradle.kts b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/build.gradle.kts
index 84487a7..24cc462 100644
--- a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/build.gradle.kts
+++ b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/build.gradle.kts b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/build.gradle.kts
index c0982ef..d2602f3 100644
--- a/plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/build.gradle.kts
+++ b/plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/js-plain-objects/runtime/build.gradle.kts b/plugins/js-plain-objects/runtime/build.gradle.kts
index c43b3d1..2395084 100644
--- a/plugins/js-plain-objects/runtime/build.gradle.kts
+++ b/plugins/js-plain-objects/runtime/build.gradle.kts
@@ -4,6 +4,7 @@
description = "Runtime library for the JS Plain Objects compiler plugin"
plugins {
+ id("java-instrumentation")
kotlin("js")
`maven-publish`
}
@@ -39,4 +40,4 @@
artifact(emptyJavadocJar)
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts
index a82a49c..a6786cc 100644
--- a/plugins/jvm-abi-gen/build.gradle.kts
+++ b/plugins/jvm-abi-gen/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/jvm-abi-gen/embeddable/build.gradle.kts b/plugins/jvm-abi-gen/embeddable/build.gradle.kts
index 34dbbe9..62a4a32 100644
--- a/plugins/jvm-abi-gen/embeddable/build.gradle.kts
+++ b/plugins/jvm-abi-gen/embeddable/build.gradle.kts
@@ -3,6 +3,7 @@
description = "ABI generation for Kotlin/JVM (for using with embeddable compiler)"
plugins {
+ id("java-instrumentation")
`java`
}
@@ -16,4 +17,4 @@
sourcesJar()
-javadocJar()
\ No newline at end of file
+javadocJar()
diff --git a/plugins/kapt3/kapt3-base/build.gradle.kts b/plugins/kapt3/kapt3-base/build.gradle.kts
index 9645729..99dce1a 100644
--- a/plugins/kapt3/kapt3-base/build.gradle.kts
+++ b/plugins/kapt3/kapt3-base/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kapt3/kapt3-cli/build.gradle.kts b/plugins/kapt3/kapt3-cli/build.gradle.kts
index 003b39c..69802c1 100644
--- a/plugins/kapt3/kapt3-cli/build.gradle.kts
+++ b/plugins/kapt3/kapt3-cli/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index 8dc4d27..abec5f8 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts
index 4b3cdda..f4b595f 100644
--- a/plugins/kapt3/kapt3-runtime/build.gradle.kts
+++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts b/plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts
index 0f4e41a..55d0e14 100644
--- a/plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts
+++ b/plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts
@@ -6,6 +6,7 @@
description = "Annotation Processor for Kotlin (for using with embeddable compiler)"
plugins {
+ id("java-instrumentation")
`java-library`
}
diff --git a/plugins/kapt4/build.gradle.kts b/plugins/kapt4/build.gradle.kts
index e8ac42e..541098f 100644
--- a/plugins/kapt4/build.gradle.kts
+++ b/plugins/kapt4/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -83,4 +84,4 @@
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlinx-serialization/build.gradle.kts b/plugins/kotlinx-serialization/build.gradle.kts
index 7ab8fcf..344dd41 100644
--- a/plugins/kotlinx-serialization/build.gradle.kts
+++ b/plugins/kotlinx-serialization/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.backend/build.gradle.kts b/plugins/kotlinx-serialization/kotlinx-serialization.backend/build.gradle.kts
index 953b3c7..b2f784b 100644
--- a/plugins/kotlinx-serialization/kotlinx-serialization.backend/build.gradle.kts
+++ b/plugins/kotlinx-serialization/kotlinx-serialization.backend/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.cli/build.gradle.kts b/plugins/kotlinx-serialization/kotlinx-serialization.cli/build.gradle.kts
index f6151c0..775dfdf 100644
--- a/plugins/kotlinx-serialization/kotlinx-serialization.cli/build.gradle.kts
+++ b/plugins/kotlinx-serialization/kotlinx-serialization.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.common/build.gradle.kts b/plugins/kotlinx-serialization/kotlinx-serialization.common/build.gradle.kts
index e59a61b..cf0b02f 100644
--- a/plugins/kotlinx-serialization/kotlinx-serialization.common/build.gradle.kts
+++ b/plugins/kotlinx-serialization/kotlinx-serialization.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.embeddable/build.gradle.kts b/plugins/kotlinx-serialization/kotlinx-serialization.embeddable/build.gradle.kts
index 5615e8c..cd31eb9 100644
--- a/plugins/kotlinx-serialization/kotlinx-serialization.embeddable/build.gradle.kts
+++ b/plugins/kotlinx-serialization/kotlinx-serialization.embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.k1/build.gradle.kts b/plugins/kotlinx-serialization/kotlinx-serialization.k1/build.gradle.kts
index d85915e..7714771 100644
--- a/plugins/kotlinx-serialization/kotlinx-serialization.k1/build.gradle.kts
+++ b/plugins/kotlinx-serialization/kotlinx-serialization.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.k2/build.gradle.kts b/plugins/kotlinx-serialization/kotlinx-serialization.k2/build.gradle.kts
index fd614ad..a3bb86c 100644
--- a/plugins/kotlinx-serialization/kotlinx-serialization.k2/build.gradle.kts
+++ b/plugins/kotlinx-serialization/kotlinx-serialization.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts
index a660280..0f75f36 100644
--- a/plugins/lombok/build.gradle.kts
+++ b/plugins/lombok/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/lombok/lombok.cli/build.gradle.kts b/plugins/lombok/lombok.cli/build.gradle.kts
index 5e4f50b..e8e1310 100644
--- a/plugins/lombok/lombok.cli/build.gradle.kts
+++ b/plugins/lombok/lombok.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/lombok/lombok.common/build.gradle.kts b/plugins/lombok/lombok.common/build.gradle.kts
index 3418742..fec6f65 100644
--- a/plugins/lombok/lombok.common/build.gradle.kts
+++ b/plugins/lombok/lombok.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/lombok/lombok.embeddable/build.gradle.kts b/plugins/lombok/lombok.embeddable/build.gradle.kts
index 3312dba..8616f66 100644
--- a/plugins/lombok/lombok.embeddable/build.gradle.kts
+++ b/plugins/lombok/lombok.embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/lombok/lombok.k1/build.gradle.kts b/plugins/lombok/lombok.k1/build.gradle.kts
index c0bb809..b9bd3b2 100644
--- a/plugins/lombok/lombok.k1/build.gradle.kts
+++ b/plugins/lombok/lombok.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/lombok/lombok.k2/build.gradle.kts b/plugins/lombok/lombok.k2/build.gradle.kts
index faf4392..a087cb1 100644
--- a/plugins/lombok/lombok.k2/build.gradle.kts
+++ b/plugins/lombok/lombok.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/noarg/build.gradle.kts b/plugins/noarg/build.gradle.kts
index 590d7f9..b6ec7c4 100644
--- a/plugins/noarg/build.gradle.kts
+++ b/plugins/noarg/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/noarg/noarg.backend/build.gradle.kts b/plugins/noarg/noarg.backend/build.gradle.kts
index c963860..7d6342f 100644
--- a/plugins/noarg/noarg.backend/build.gradle.kts
+++ b/plugins/noarg/noarg.backend/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/noarg/noarg.cli/build.gradle.kts b/plugins/noarg/noarg.cli/build.gradle.kts
index c994b4a..031be24 100644
--- a/plugins/noarg/noarg.cli/build.gradle.kts
+++ b/plugins/noarg/noarg.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/noarg/noarg.common/build.gradle.kts b/plugins/noarg/noarg.common/build.gradle.kts
index bc99536..fef5ccc 100644
--- a/plugins/noarg/noarg.common/build.gradle.kts
+++ b/plugins/noarg/noarg.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/noarg/noarg.embeddable/build.gradle.kts b/plugins/noarg/noarg.embeddable/build.gradle.kts
index 9538b81..3d1b961 100644
--- a/plugins/noarg/noarg.embeddable/build.gradle.kts
+++ b/plugins/noarg/noarg.embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/noarg/noarg.k1/build.gradle.kts b/plugins/noarg/noarg.k1/build.gradle.kts
index 2b6602e..dfa4c49 100644
--- a/plugins/noarg/noarg.k1/build.gradle.kts
+++ b/plugins/noarg/noarg.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/noarg/noarg.k2/build.gradle.kts b/plugins/noarg/noarg.k2/build.gradle.kts
index 10f1b4c..04fd4a6 100644
--- a/plugins/noarg/noarg.k2/build.gradle.kts
+++ b/plugins/noarg/noarg.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts
index 0d96627..e2060a4 100644
--- a/plugins/parcelize/parcelize-compiler/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("android-sdk-provisioner")
}
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts
index b915d3e..115f00c 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts
index 8ae3c58..b4a6186 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.common/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.common/build.gradle.kts
index ee44a05..d7c993c 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.common/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/parcelize.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.k1/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.k1/build.gradle.kts
index 92f1568..f50f7ab 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.k1/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/parcelize.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts
index 1649cd2..d69d31a 100644
--- a/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/parcelize/parcelize-runtime/build.gradle.kts b/plugins/parcelize/parcelize-runtime/build.gradle.kts
index c7171f1..286bbc0 100644
--- a/plugins/parcelize/parcelize-runtime/build.gradle.kts
+++ b/plugins/parcelize/parcelize-runtime/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index b68e4da..4b78fcc 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/pill/pill-importer/build.gradle.kts b/plugins/pill/pill-importer/build.gradle.kts
index c45701f..2c85008 100644
--- a/plugins/pill/pill-importer/build.gradle.kts
+++ b/plugins/pill/pill-importer/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/plugins-interactions-testing/build.gradle.kts b/plugins/plugins-interactions-testing/build.gradle.kts
index 8167647..f247e96 100644
--- a/plugins/plugins-interactions-testing/build.gradle.kts
+++ b/plugins/plugins-interactions-testing/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/power-assert/build.gradle.kts b/plugins/power-assert/build.gradle.kts
index 6afc436..e51d785 100644
--- a/plugins/power-assert/build.gradle.kts
+++ b/plugins/power-assert/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/power-assert/power-assert.backend/build.gradle.kts b/plugins/power-assert/power-assert.backend/build.gradle.kts
index 7c0d1c8..95f3fea 100644
--- a/plugins/power-assert/power-assert.backend/build.gradle.kts
+++ b/plugins/power-assert/power-assert.backend/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/power-assert/power-assert.cli/build.gradle.kts b/plugins/power-assert/power-assert.cli/build.gradle.kts
index 21e0dc6..6f33474 100644
--- a/plugins/power-assert/power-assert.cli/build.gradle.kts
+++ b/plugins/power-assert/power-assert.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/power-assert/power-assert.embeddable/build.gradle.kts b/plugins/power-assert/power-assert.embeddable/build.gradle.kts
index b13aeca..ed21a8f 100644
--- a/plugins/power-assert/power-assert.embeddable/build.gradle.kts
+++ b/plugins/power-assert/power-assert.embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/sam-with-receiver/build.gradle.kts b/plugins/sam-with-receiver/build.gradle.kts
index a5dc7cb..995d4d6 100644
--- a/plugins/sam-with-receiver/build.gradle.kts
+++ b/plugins/sam-with-receiver/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts
index 48d8a7e..34ddcee 100644
--- a/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/sam-with-receiver/sam-with-receiver.common/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver.common/build.gradle.kts
index d4bb8fce..cc35781 100644
--- a/plugins/sam-with-receiver/sam-with-receiver.common/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver.common/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/sam-with-receiver/sam-with-receiver.embeddable/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver.embeddable/build.gradle.kts
index e4279ac..9d41d3d 100644
--- a/plugins/sam-with-receiver/sam-with-receiver.embeddable/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver.embeddable/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
id("org.jetbrains.kotlin.jvm")
}
diff --git a/plugins/sam-with-receiver/sam-with-receiver.k1/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver.k1/build.gradle.kts
index 619b23c..9dd19f3 100644
--- a/plugins/sam-with-receiver/sam-with-receiver.k1/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver.k1/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -19,4 +20,3 @@
runtimeJar()
sourcesJar()
javadocJar()
-
diff --git a/plugins/sam-with-receiver/sam-with-receiver.k2/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver.k2/build.gradle.kts
index ddfa636..a5b23ae 100644
--- a/plugins/sam-with-receiver/sam-with-receiver.k2/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver.k2/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
index 53bc2e0..b05fd20 100644
--- a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin Scripting Compiler Plugin for embeddable compiler"
plugins {
+ id("java-instrumentation")
java
}
diff --git a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
index 97b9e16..f28076b 100644
--- a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin Compiler Infrastructure for Scripting for embeddable compiler"
plugins {
+ id("java-instrumentation")
java
}
diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
index 2582e55..654a745 100644
--- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts
index e587d74..6ef972a 100644
--- a/plugins/scripting/scripting-compiler/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -83,4 +84,3 @@
systemProperty("kotlin.script.base.compiler.arguments", "-language-version 1.9")
}
}
-
diff --git a/plugins/scripting/scripting-ide-common/build.gradle.kts b/plugins/scripting/scripting-ide-common/build.gradle.kts
index 728bbde..6e17044 100644
--- a/plugins/scripting/scripting-ide-common/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-common/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
index 0c4d7c2..e5748a6 100644
--- a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin Scripting Compiler extension providing code completion and static analysis (for using in embeddable mode)"
plugins {
+ id("java-instrumentation")
java
}
diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
index c9174b5..10977b3 100644
--- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
project.updateJvmTarget("1.8")
diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts
index e72e063..685358e 100644
--- a/plugins/scripting/scripting-ide-services/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/scripting/scripting-tests/build.gradle.kts b/plugins/scripting/scripting-tests/build.gradle.kts
index e783117..d62d340 100644
--- a/plugins/scripting/scripting-tests/build.gradle.kts
+++ b/plugins/scripting/scripting-tests/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/plugins/scripting/test-script-definition/build.gradle.kts b/plugins/scripting/test-script-definition/build.gradle.kts
index bd96a90..e2cfc74 100644
--- a/plugins/scripting/test-script-definition/build.gradle.kts
+++ b/plugins/scripting/test-script-definition/build.gradle.kts
@@ -1,6 +1,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/prepare/analysis-api-test-framework/build.gradle.kts b/prepare/analysis-api-test-framework/build.gradle.kts
index 88441a8..8abf50e 100644
--- a/prepare/analysis-api-test-framework/build.gradle.kts
+++ b/prepare/analysis-api-test-framework/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
}
diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts
index 36d02c1..7cc972d 100644
--- a/prepare/android-extensions-compiler-gradle/build.gradle.kts
+++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -31,4 +32,3 @@
sourcesJar()
javadocJar()
-
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index 7d2aa63..f913ac4 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val testCompilerClasspath by configurations.creating {
@@ -17,7 +18,7 @@
embedded(project(":compiler:cli-common")) { isTransitive = false }
embedded(project(":daemon-common")) { isTransitive = false }
embedded(project(":kotlin-daemon-client")) { isTransitive = false }
-
+
testApi(project(":compiler:cli-common"))
testApi(project(":daemon-common"))
testApi(project(":kotlin-daemon-client"))
diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts
index 25bd23a..cfe5183 100644
--- a/prepare/compiler-embeddable/build.gradle.kts
+++ b/prepare/compiler-embeddable/build.gradle.kts
@@ -4,6 +4,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val testCompilationClasspath by configurations.creating
@@ -73,4 +74,3 @@
systemProperty("compilationClasspath", testCompilationClasspathProvider.get())
}
}
-
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 3c11953..b768894 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -6,6 +6,7 @@
description = "Kotlin Compiler"
plugins {
+ id("java-instrumentation")
// HACK: java plugin makes idea import dependencies on this project as source (with empty sources however),
// this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules
`java-library`
diff --git a/prepare/ide-plugin-dependencies/allopen-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-for-ide/build.gradle.kts
index 798d2de..fa3ad44 100644
--- a/prepare/ide-plugin-dependencies/allopen-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
index 50006d6..aa6e30f 100644
--- a/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":compiler:incremental-compilation-impl"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-fe10-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-fe10-for-ide/build.gradle.kts
index 2662831..7850b6f 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-fe10-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-fe10-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api-fe10"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-fe10-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-fe10-tests-for-ide/build.gradle.kts
index 5cb9a97..1696426 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-fe10-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-fe10-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":analysis:analysis-api-fe10"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-for-ide/build.gradle.kts
index 480e63a..5f9f43c 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-impl-base-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-impl-base-for-ide/build.gradle.kts
index 8523afb..3ea2264 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-impl-base-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-impl-base-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/analysis-api-impl-base-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-impl-base-tests-for-ide/build.gradle.kts
index 7e49697..f16b7a9 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-impl-base-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-impl-base-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":analysis:analysis-api-impl-barebone", ":analysis:analysis-api-impl-base"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-k2-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-k2-for-ide/build.gradle.kts
index 2e86bba..71dfb2b 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-k2-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-k2-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api-fir"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-k2-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-k2-tests-for-ide/build.gradle.kts
index 7ef2e76..db866a3 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-k2-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-k2-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":analysis:analysis-api-fir"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-platform-interface-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-platform-interface-for-ide/build.gradle.kts
index e0b634be..917afbf 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-platform-interface-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-platform-interface-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api-platform-interface"))
diff --git a/prepare/ide-plugin-dependencies/analysis-api-standalone-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-standalone-for-ide/build.gradle.kts
index 2c20480..ac5b2f8 100644
--- a/prepare/ide-plugin-dependencies/analysis-api-standalone-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/analysis-api-standalone-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/android-extensions-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/android-extensions-compiler-plugin-for-ide/build.gradle.kts
index 99a0611..28921d5 100644
--- a/prepare/ide-plugin-dependencies/android-extensions-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/android-extensions-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":plugins:android-extensions-compiler"))
diff --git a/prepare/ide-plugin-dependencies/assignment-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/assignment-compiler-plugin-for-ide/build.gradle.kts
index c48203a..3cdd2f2 100644
--- a/prepare/ide-plugin-dependencies/assignment-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/assignment-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/compose-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/compose-compiler-plugin-for-ide/build.gradle.kts
index bf0ebda..a7ea2aa 100644
--- a/prepare/ide-plugin-dependencies/compose-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/compose-compiler-plugin-for-ide/build.gradle.kts
@@ -1,7 +1,8 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
listOf(":plugins:compose-compiler-plugin:compiler-hosted")
-)
\ No newline at end of file
+)
diff --git a/prepare/ide-plugin-dependencies/high-level-api-fe10-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-fe10-for-ide/build.gradle.kts
index 2662831..7850b6f 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-fe10-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-fe10-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api-fe10"))
diff --git a/prepare/ide-plugin-dependencies/high-level-api-fe10-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-fe10-tests-for-ide/build.gradle.kts
index 5cb9a97..1696426 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-fe10-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-fe10-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":analysis:analysis-api-fe10"))
diff --git a/prepare/ide-plugin-dependencies/high-level-api-fir-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-fir-for-ide/build.gradle.kts
index 2e86bba..71dfb2b 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-fir-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-fir-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api-fir"))
diff --git a/prepare/ide-plugin-dependencies/high-level-api-fir-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-fir-tests-for-ide/build.gradle.kts
index 7ef2e76..db866a3 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-fir-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-fir-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":analysis:analysis-api-fir"))
diff --git a/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts
index 480e63a..5f9f43c 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:analysis-api"))
diff --git a/prepare/ide-plugin-dependencies/high-level-api-impl-base-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-impl-base-for-ide/build.gradle.kts
index 8523afb..3ea2264 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-impl-base-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-impl-base-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/high-level-api-impl-base-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-impl-base-tests-for-ide/build.gradle.kts
index 7e49697..f16b7a9 100644
--- a/prepare/ide-plugin-dependencies/high-level-api-impl-base-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/high-level-api-impl-base-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":analysis:analysis-api-impl-barebone", ":analysis:analysis-api-impl-base"))
diff --git a/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
index 50006d6..aa6e30f 100644
--- a/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":compiler:incremental-compilation-impl"))
diff --git a/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts
index d60d3b8..758ece7 100644
--- a/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
}
@@ -20,4 +21,4 @@
zipTree(klibTask.singleOutputFile(layout))
}
}
-}
\ No newline at end of file
+}
diff --git a/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
index 3b87eb9..aa4e10c 100644
--- a/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(listOf(":kotlin-build-common"))
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts
index 52e3678..f8ab587 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts
index 8253749..91b9927 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val commonCompilerModules: Array<String> by rootProject.extra
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-fe10-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-fe10-for-ide/build.gradle.kts
index aeef202..7ff9f25 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-fe10-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-fe10-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val fe10CompilerModules: Array<String> by rootProject.extra
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-fir-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-fir-for-ide/build.gradle.kts
index c68b243..aef25f2 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-fir-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-fir-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val firCompilerCoreModules: Array<String> by rootProject.extra
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-ir-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-ir-for-ide/build.gradle.kts
index 96b26f7..39727c0 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-ir-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-ir-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
val irCompilerModulesForIDE: Array<String> by rootProject.extra
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
index 43b2bc6..fd49fd8 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts
index 95857d0..556a7c6 100644
--- a/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
}
@@ -21,4 +22,4 @@
sourcesJar()
javadocJar()
-}
\ No newline at end of file
+}
diff --git a/prepare/ide-plugin-dependencies/kotlin-gradle-statistics-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-gradle-statistics-for-ide/build.gradle.kts
index 885ce97..3617db8 100644
--- a/prepare/ide-plugin-dependencies/kotlin-gradle-statistics-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-gradle-statistics-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":kotlin-gradle-statistics"))
diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts
index 2da042b7..a8907bc 100644
--- a/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":jps:jps-common"))
diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-tests-for-ide/build.gradle.kts
index d1df967..92db5c0 100644
--- a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-tests-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishTestJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/kotlin-objcexport-header-generator-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-objcexport-header-generator-for-ide/build.gradle.kts
index 6514bb0..6693175 100644
--- a/prepare/ide-plugin-dependencies/kotlin-objcexport-header-generator-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-objcexport-header-generator-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts
index 39aee49..ffe5031 100644
--- a/prepare/ide-plugin-dependencies/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlinx-serialization-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts
index bbc51a7..e4f27c4 100644
--- a/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/low-level-api-fir-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/low-level-api-fir-for-ide/build.gradle.kts
index f62b119..3598fc3 100644
--- a/prepare/ide-plugin-dependencies/low-level-api-fir-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/low-level-api-fir-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:low-level-api-fir"))
diff --git a/prepare/ide-plugin-dependencies/noarg-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/noarg-compiler-plugin-for-ide/build.gradle.kts
index 589cc99..b7f0feb 100644
--- a/prepare/ide-plugin-dependencies/noarg-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/noarg-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts
index 4c13b89..92edcd8 100644
--- a/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/parcelize-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
index a6ddfc8..ac5ffd9 100644
--- a/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
diff --git a/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts
index 8bc1ef2..86a930c 100644
--- a/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts
@@ -1,9 +1,10 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(
listOf(
":kotlin-scripting-compiler"
)
-)
\ No newline at end of file
+)
diff --git a/prepare/ide-plugin-dependencies/symbol-light-classes-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/symbol-light-classes-for-ide/build.gradle.kts
index 4028d67..9ab31f9 100644
--- a/prepare/ide-plugin-dependencies/symbol-light-classes-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/symbol-light-classes-for-ide/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
publishJarsForIde(listOf(":analysis:symbol-light-classes"))
diff --git a/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts b/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts
index dbd6f7f..c8d0c95 100644
--- a/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts
+++ b/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
java
}
diff --git a/prepare/kotlin-daemon-embeddable/build.gradle.kts b/prepare/kotlin-daemon-embeddable/build.gradle.kts
index d4a201c..e949418 100644
--- a/prepare/kotlin-daemon-embeddable/build.gradle.kts
+++ b/prepare/kotlin-daemon-embeddable/build.gradle.kts
@@ -1,6 +1,7 @@
description = "Kotlin Daemon (for using with embeddable compiler)"
plugins {
+ id("java-instrumentation")
`java`
}
diff --git a/prepare/kotlin-jps-plugin/build.gradle.kts b/prepare/kotlin-jps-plugin/build.gradle.kts
index 0034f18..53eacbf 100644
--- a/prepare/kotlin-jps-plugin/build.gradle.kts
+++ b/prepare/kotlin-jps-plugin/build.gradle.kts
@@ -1,4 +1,5 @@
plugins {
+ id("java-instrumentation")
`java-library`
}
diff --git a/prepare/parcelize-compiler-gradle/build.gradle.kts b/prepare/parcelize-compiler-gradle/build.gradle.kts
index 7eb0320..552b5b6 100644
--- a/prepare/parcelize-compiler-gradle/build.gradle.kts
+++ b/prepare/parcelize-compiler-gradle/build.gradle.kts
@@ -2,6 +2,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
@@ -30,4 +31,4 @@
sourcesJar()
-javadocJar()
\ No newline at end of file
+javadocJar()
diff --git a/repo/artifacts-tests/build.gradle.kts b/repo/artifacts-tests/build.gradle.kts
index 2845f00..b2beabc 100644
--- a/repo/artifacts-tests/build.gradle.kts
+++ b/repo/artifacts-tests/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
}
dependencies {
diff --git a/repo/codebase-tests/build.gradle.kts b/repo/codebase-tests/build.gradle.kts
index 70cce07..08ec86e 100644
--- a/repo/codebase-tests/build.gradle.kts
+++ b/repo/codebase-tests/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
@@ -28,4 +29,4 @@
workingDir = rootDir
}
-testsJar()
\ No newline at end of file
+testsJar()
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/InstrumentJava.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/InstrumentJava.kt
index 3224ff7..c69d4ec 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/InstrumentJava.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/InstrumentJava.kt
@@ -1,25 +1,26 @@
-import org.gradle.api.Action
-import org.gradle.api.Task
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.withGroovyBuilder
-import java.io.File
-
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
+import org.gradle.api.Action
+import org.gradle.api.Task
+import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.ClasspathNormalizer
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.kotlin.dsl.withGroovyBuilder
+import org.gradle.kotlin.dsl.withNormalizer
-class InstrumentJava(@Transient val javaInstrumentator: Configuration) : Action<Task> {
- private val instrumentatorClasspath: String by lazy {
- javaInstrumentator.asPath
- }
+internal class InstrumentJava(private val javaInstrumentatorClasspath: FileCollection) : Action<Task> {
override fun execute(task: Task) {
require(task is JavaCompile) { "$task is not of type JavaCompile!" }
- // There is a requirement for Javac.execute() to have an existen non-empty directory as a source dir for the compilation
+ val instrumentatorClasspath = javaInstrumentatorClasspath
+ task.inputs.files(instrumentatorClasspath)
+ .withPropertyName("instrumentatorClasspath")
+ .withNormalizer(ClasspathNormalizer::class)
+
+ // There is a requirement for Javac.execute() to have an existing non-empty directory as a source dir for the compilation
// even if compilation is disabled.
//
// So we create an empty dummy directory during the execution.
@@ -29,18 +30,19 @@
// InstrumentIdeaExtensions - https://github.com/JetBrains/intellij-community/blob/9c40bdd/java/compiler/javac2/src/com/intellij/ant/InstrumentIdeaExtensions.java
// Javac2.compile() - https://github.com/JetBrains/intellij-community/blob/9c40bdd/java/compiler/javac2/src/com/intellij/ant/Javac2.java#L237
val dummyInstrumentSrcDir = task.project.layout.buildDirectory.dir("instrument_dummy_src").get().asFile
- val dummyInstrumentSrcRelativePath = dummyInstrumentSrcDir.relativeTo(task.project.projectDir).path.replace("\\", "/")
+ val dummyInstrumentSrcRelativePath = dummyInstrumentSrcDir.relativeTo(task.project.projectDir).invariantSeparatorsPath
task.doLast {
task.ant.withGroovyBuilder {
"taskdef"(
"name" to "instrumentIdeaExtensions",
- "classpath" to instrumentatorClasspath,
+ "classpath" to instrumentatorClasspath.asPath,
"loaderref" to "java2.loader",
"classname" to "com.intellij.ant.InstrumentIdeaExtensions"
)
}
+ dummyInstrumentSrcDir.deleteRecursively()
dummyInstrumentSrcDir.mkdirs()
task.ant.withGroovyBuilder {
@@ -54,4 +56,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
index 1837754..70ec364 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
@@ -9,6 +9,7 @@
`java-gradle-plugin`
`maven-publish`
id("com.gradle.plugin-publish")
+ id("java-instrumentation")
}
// Enable signing for publications into Gradle Plugin Portal
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/java-instrumentation.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/java-instrumentation.gradle.kts
index 8232afd..1166577 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/java-instrumentation.gradle.kts
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/java-instrumentation.gradle.kts
@@ -3,27 +3,36 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
-allprojects {
- afterEvaluate {
- configureJavaInstrumentation()
- }
-}
+/**
+ * Configures instrumentation for main and test [JavaCompile] tasks in the project.
+ */
// Hide window of instrumentation tasks
val headlessOldValue: String? = System.setProperty("java.awt.headless", "true")
logger.info("Setting java.awt.headless=true, old value was $headlessOldValue")
-/**
- * Configures instrumentation for all JavaCompile tasks in project
- */
-fun Project.configureJavaInstrumentation() {
- if (plugins.hasPlugin("org.gradle.java")) {
- val javaInstrumentator by configurations.creating
- dependencies {
- javaInstrumentator("com.jetbrains.intellij.java:java-compiler-ant-tasks:${rootProject.extra["versions.intellijSdk"]}")
- }
- for (sourceSet in listOf(mainSourceSet, testSourceSet)) {
- tasks.named(sourceSet.compileJavaTaskName, InstrumentJava(javaInstrumentator))
+pluginManager.withPlugin("org.gradle.java") {
+ val javaInstrumentator by configurations.creating {
+ isCanBeConsumed = false
+ isCanBeResolved = false
+ isCanBeDeclared = true
+ isVisible = false
+ defaultDependencies {
+ add(project.dependencies.create("com.jetbrains.intellij.java:java-compiler-ant-tasks:${rootProject.extra["versions.intellijSdk"]}"))
}
}
+
+ val javaInstrumentatorResolver by configurations.creating {
+ isCanBeConsumed = false
+ isCanBeResolved = true
+ isCanBeDeclared = false
+ isVisible = false
+ extendsFrom(javaInstrumentator)
+ }
+
+ sourceSets
+ .matching { it.name == SourceSet.MAIN_SOURCE_SET_NAME || it.name == SourceSet.TEST_SOURCE_SET_NAME }
+ .configureEach {
+ tasks.named(compileJavaTaskName, InstrumentJava(javaInstrumentator.incoming.files))
+ }
}
diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts
index 207f937..f2f441d 100644
--- a/test-instrumenter/build.gradle.kts
+++ b/test-instrumenter/build.gradle.kts
@@ -1,6 +1,7 @@
import org.gradle.jvm.tasks.Jar
plugins {
+ id("java-instrumentation")
java
kotlin("jvm")
}
@@ -23,4 +24,4 @@
attributes["PreMain-Class"] = "org.jetbrains.kotlin.testFramework.TestInstrumentationAgent"
}
}
-}
\ No newline at end of file
+}
diff --git a/wasm/wasm.config/build.gradle.kts b/wasm/wasm.config/build.gradle.kts
index d74faed..19598c5 100644
--- a/wasm/wasm.config/build.gradle.kts
+++ b/wasm/wasm.config/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
id("gradle-plugin-compiler-dependency-configuration")
}
diff --git a/wasm/wasm.debug.browsers/build.gradle.kts b/wasm/wasm.debug.browsers/build.gradle.kts
index e3cc205..44cbdca 100644
--- a/wasm/wasm.debug.browsers/build.gradle.kts
+++ b/wasm/wasm.debug.browsers/build.gradle.kts
@@ -3,6 +3,7 @@
description = "Simple Kotlin/Wasm devtools formatters"
plugins {
+ id("java-instrumentation")
id("base")
id("share-kotlin-wasm-custom-formatters")
alias(libs.plugins.gradle.node)
diff --git a/wasm/wasm.frontend/build.gradle.kts b/wasm/wasm.frontend/build.gradle.kts
index 3ec4ac26..d6638be 100644
--- a/wasm/wasm.frontend/build.gradle.kts
+++ b/wasm/wasm.frontend/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
}
diff --git a/wasm/wasm.ir/build.gradle.kts b/wasm/wasm.ir/build.gradle.kts
index 03342af..cb55053 100644
--- a/wasm/wasm.ir/build.gradle.kts
+++ b/wasm/wasm.ir/build.gradle.kts
@@ -3,6 +3,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
kotlin("plugin.serialization")
}
diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts
index 19447df..f208184 100644
--- a/wasm/wasm.tests/build.gradle.kts
+++ b/wasm/wasm.tests/build.gradle.kts
@@ -6,6 +6,7 @@
plugins {
kotlin("jvm")
+ id("java-instrumentation")
id("jps-compatible")
alias(libs.plugins.gradle.node)
}
