diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 2546e6bdaea..5810bfb46a3 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -37,6 +37,7 @@ fun Task.dependsOnKotlinPluginInstall() { ":kotlin-noarg:install", ":kotlin-sam-with-receiver:install", ":kotlin-android-extensions:install", + ":kotlin-parcelize-compiler:install", ":kotlin-build-common:install", ":kotlin-compiler-embeddable:install", ":native:kotlin-native-utils:install", diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index b8dfbfed09e..064bbc21a9e 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -145,6 +145,8 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } + testRuntime(project(":plugins:parcelize:parcelize-compiler")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler-impl")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 4a3cc33405c..ac0aa2f8a32 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -49,6 +49,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(intellijPluginDep("android")) diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index b2230df7327..3aa6bc3f859 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(project(":kotlinx-serialization-ide-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency Platform[192].orHigher { diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 3b7d5870080..8df45803a49 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -64,6 +64,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(project(":kotlin-gradle-statistics")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 1734548649a..7b0e1cb7509 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -64,6 +64,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) diff --git a/idea/idea-new-project-wizard/build.gradle.kts b/idea/idea-new-project-wizard/build.gradle.kts index cd7ec1bf86b..27dce10a09c 100644 --- a/idea/idea-new-project-wizard/build.gradle.kts +++ b/idea/idea-new-project-wizard/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { testRuntimeOnly(project(":plugins:annotation-based-compiler-plugins-ide-support")) testRuntimeOnly(project(":kotlin-gradle-statistics")) testRuntimeOnly(project(":kotlin-scripting-idea")) + testRuntimeOnly(project(":plugins:parcelize:parcelize-ide")) testRuntimeOnly(intellijRuntimeAnnotations()) diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts index e9ff13bca8a..fc716e444b7 100644 --- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(intellijDep()) testRuntime(intellijRuntimeAnnotations()) diff --git a/idea/performanceTests/build.gradle.kts b/idea/performanceTests/build.gradle.kts index b2f043bdb55..252d848bc94 100644 --- a/idea/performanceTests/build.gradle.kts +++ b/idea/performanceTests/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { testRuntimeOnly(project(":allopen-ide-plugin")) testRuntimeOnly(project(":kotlin-scripting-idea")) testRuntimeOnly(project(":kotlinx-serialization-ide-plugin")) + testRuntimeOnly(project(":plugins:parcelize:parcelize-ide")) testRuntimeOnly(project(":nj2k:nj2k-services")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":idea:kotlin-gradle-tooling")) diff --git a/idea/scripting-support/build.gradle.kts b/idea/scripting-support/build.gradle.kts index 8ea0e1daebb..1e294281714 100644 --- a/idea/scripting-support/build.gradle.kts +++ b/idea/scripting-support/build.gradle.kts @@ -26,6 +26,8 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } + testRuntime(project(":plugins:parcelize:parcelize-compiler")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 4fdcfc8c969..cbb700c369b 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -44,6 +44,7 @@ dependencies { testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) 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 de66239e973..6ee3ff41cbc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { testCompile(kotlinStdlib("jdk8")) testCompile(project(":kotlin-reflect")) testCompile(project(":kotlin-android-extensions")) + testCompile(project(":kotlin-parcelize-compiler")) testCompile(commonDep("org.jetbrains.intellij.deps", "trove4j")) testCompile(gradleApi()) diff --git a/nj2k/build.gradle.kts b/nj2k/build.gradle.kts index 216b586aba6..e902d3af696 100644 --- a/nj2k/build.gradle.kts +++ b/nj2k/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlinx-serialization-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) } sourceSets { diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 61561cd8972..24a776b5581 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -47,6 +47,7 @@ dependencies { testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) testRuntime(project(":plugins:lint")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) testRuntime(intellijPluginDep("properties")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 03a0fddf8f5..b4581ad99ca 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":kotlinx-serialization-ide-plugin")) + testRuntime(project(":plugins:parcelize:parcelize-ide")) testRuntime(intellijDep()) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("gradle"))