diff --git a/build.gradle.kts b/build.gradle.kts index 6e02974c1ed..e5780179dbc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -88,7 +88,6 @@ val commonLocalDataDir = "$rootDir/local" val ideaSandboxDir = "$commonLocalDataDir/ideaSandbox" val ideaUltimateSandboxDir = "$commonLocalDataDir/ideaUltimateSandbox" val ideaPluginDir = "$distDir/artifacts/ideaPlugin/Kotlin" -val serialPluginDir = "$distDir/artifacts/Serialization" val ideaUltimatePluginDir = "$distDir/artifacts/ideaUltimatePlugin/Kotlin" val cidrPluginDir = "$distDir/artifacts/cidrPlugin/Kotlin" @@ -99,7 +98,6 @@ extra["commonLocalDataDir"] = project.file(commonLocalDataDir) extra["ideaSandboxDir"] = project.file(ideaSandboxDir) extra["ideaUltimateSandboxDir"] = project.file(ideaUltimateSandboxDir) extra["ideaPluginDir"] = project.file(ideaPluginDir) -extra["serialPluginDir"] = project.file(serialPluginDir) extra["ideaUltimatePluginDir"] = project.file(ideaUltimatePluginDir) extra["cidrPluginDir"] = project.file(cidrPluginDir) extra["isSonatypeRelease"] = false diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts index 96a7b9c1542..be7bfa48925 100644 --- a/idea-runner/build.gradle.kts +++ b/idea-runner/build.gradle.kts @@ -17,9 +17,7 @@ dependencies { val ideaPluginDir: File by rootProject.extra val ideaSandboxDir: File by rootProject.extra -val serialPluginDir: File by rootProject.extra -runIdeTask("runIde", ideaPluginDir, ideaSandboxDir, serialPluginDir) { - // TODO: add serialization plugin to pluginDir - dependsOn(":dist", ":ideaPlugin", ":kotlinx-serialization-compiler-plugin:dist") +runIdeTask("runIde", ideaPluginDir, ideaSandboxDir) { + dependsOn(":dist", ":ideaPlugin") } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 290cf4cec84..36075821ef6 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -78,6 +78,7 @@ dependencies { testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173 index 45b7d1c3e1c..17c2ad69c5e 100644 --- a/idea/build.gradle.kts.173 +++ b/idea/build.gradle.kts.173 @@ -78,6 +78,7 @@ dependencies { testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31 index e29f501e32e..17e7cd1592e 100644 --- a/idea/build.gradle.kts.as31 +++ b/idea/build.gradle.kts.as31 @@ -78,6 +78,7 @@ dependencies { testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32 index 1b45989d587..365b82cb17a 100644 --- a/idea/build.gradle.kts.as32 +++ b/idea/build.gradle.kts.as32 @@ -78,6 +78,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/idea/build.gradle.kts.as33 b/idea/build.gradle.kts.as33 index 875eb8ba5f6..e4023b69821 100644 --- a/idea/build.gradle.kts.as33 +++ b/idea/build.gradle.kts.as33 @@ -78,6 +78,7 @@ dependencies { testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 69801d502b9..83809c0b1b5 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -46,6 +46,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-android/build.gradle.kts.173 b/idea/idea-android/build.gradle.kts.173 index 789dbc65f6d..9a667689bdb 100644 --- a/idea/idea-android/build.gradle.kts.173 +++ b/idea/idea-android/build.gradle.kts.173 @@ -46,6 +46,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("copyright")) diff --git a/idea/idea-android/build.gradle.kts.as31 b/idea/idea-android/build.gradle.kts.as31 index 93fb59bc520..30efcac9eae 100644 --- a/idea/idea-android/build.gradle.kts.as31 +++ b/idea/idea-android/build.gradle.kts.as31 @@ -46,6 +46,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-android/build.gradle.kts.as32 b/idea/idea-android/build.gradle.kts.as32 index 93fb59bc520..30efcac9eae 100644 --- a/idea/idea-android/build.gradle.kts.as32 +++ b/idea/idea-android/build.gradle.kts.as32 @@ -46,6 +46,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-android/build.gradle.kts.as33 b/idea/idea-android/build.gradle.kts.as33 index d9528df27ac..d506ccdc09c 100644 --- a/idea/idea-android/build.gradle.kts.as33 +++ b/idea/idea-android/build.gradle.kts.as33 @@ -46,6 +46,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 1699022b3f8..3a3769b92b9 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -39,6 +39,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.173 b/idea/idea-gradle/build.gradle.kts.173 index 3bb1936ac85..b129281ed7b 100644 --- a/idea/idea-gradle/build.gradle.kts.173 +++ b/idea/idea-gradle/build.gradle.kts.173 @@ -39,6 +39,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.as31 b/idea/idea-gradle/build.gradle.kts.as31 index ff8b0d6f9b2..0dab2ba8f77 100644 --- a/idea/idea-gradle/build.gradle.kts.as31 +++ b/idea/idea-gradle/build.gradle.kts.as31 @@ -39,6 +39,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.as32 b/idea/idea-gradle/build.gradle.kts.as32 index ff8b0d6f9b2..0dab2ba8f77 100644 --- a/idea/idea-gradle/build.gradle.kts.as32 +++ b/idea/idea-gradle/build.gradle.kts.as32 @@ -39,6 +39,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.as33 b/idea/idea-gradle/build.gradle.kts.as33 index ff8b0d6f9b2..0dab2ba8f77 100644 --- a/idea/idea-gradle/build.gradle.kts.as33 +++ b/idea/idea-gradle/build.gradle.kts.as33 @@ -39,6 +39,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 72400784259..dc40cc971d0 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.173 b/idea/idea-maven/build.gradle.kts.173 index b58bb1a063f..87aa9358100 100644 --- a/idea/idea-maven/build.gradle.kts.173 +++ b/idea/idea-maven/build.gradle.kts.173 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.as31 b/idea/idea-maven/build.gradle.kts.as31 index 233f74877ea..f88eabd3cac 100644 --- a/idea/idea-maven/build.gradle.kts.as31 +++ b/idea/idea-maven/build.gradle.kts.as31 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.as32 b/idea/idea-maven/build.gradle.kts.as32 index 233f74877ea..f88eabd3cac 100644 --- a/idea/idea-maven/build.gradle.kts.as32 +++ b/idea/idea-maven/build.gradle.kts.as32 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.as33 b/idea/idea-maven/build.gradle.kts.as33 index 22b187f1d0b..8f424208035 100644 --- a/idea/idea-maven/build.gradle.kts.as33 +++ b/idea/idea-maven/build.gradle.kts.as33 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/src/META-INF/gradle-java.xml b/idea/src/META-INF/gradle-java.xml index ed8eec3d664..5936460b1a9 100644 --- a/idea/src/META-INF/gradle-java.xml +++ b/idea/src/META-INF/gradle-java.xml @@ -71,6 +71,7 @@ + diff --git a/idea/src/META-INF/gradle-java.xml.as33 b/idea/src/META-INF/gradle-java.xml.as33 index d293c4fe948..6a7accc698c 100644 --- a/idea/src/META-INF/gradle-java.xml.as33 +++ b/idea/src/META-INF/gradle-java.xml.as33 @@ -69,6 +69,7 @@ + diff --git a/idea/src/META-INF/gradle-java.xml.as33c4 b/idea/src/META-INF/gradle-java.xml.as33c4 index 5183c33c08d..c7654f0644e 100644 --- a/idea/src/META-INF/gradle-java.xml.as33c4 +++ b/idea/src/META-INF/gradle-java.xml.as33c4 @@ -60,6 +60,7 @@ + diff --git a/idea/src/META-INF/gradle.xml.181 b/idea/src/META-INF/gradle.xml.181 index 319622a5e49..8f275e70720 100644 --- a/idea/src/META-INF/gradle.xml.181 +++ b/idea/src/META-INF/gradle.xml.181 @@ -79,6 +79,7 @@ + diff --git a/idea/src/META-INF/kotlinx-serialization.xml b/idea/src/META-INF/kotlinx-serialization.xml new file mode 100644 index 00000000000..7ceed70f675 --- /dev/null +++ b/idea/src/META-INF/kotlinx-serialization.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml index 34e623f2d02..cb94ddcb0a7 100644 --- a/idea/src/META-INF/maven.xml +++ b/idea/src/META-INF/maven.xml @@ -11,6 +11,7 @@ + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index de91cac9b56..5535341d22c 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -3101,6 +3101,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. + + diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index a6ede32a5c4..2ce8d42437a 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index ddd8acf4fc7..6a8d98a8891 100644 --- a/j2k/build.gradle.kts.173 +++ b/j2k/build.gradle.kts.173 @@ -28,6 +28,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index fe291ea7e61..d77ea3b2d40 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -28,6 +28,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index d4468337383..44487701b26 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -29,6 +29,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.as33 b/j2k/build.gradle.kts.as33 index 8f36b6d55bb..a451bf19268 100644 --- a/j2k/build.gradle.kts.as33 +++ b/j2k/build.gradle.kts.as33 @@ -29,6 +29,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/libraries/ReadMe.md b/libraries/ReadMe.md index 3762ed9db15..e95486c48e5 100644 --- a/libraries/ReadMe.md +++ b/libraries/ReadMe.md @@ -42,31 +42,3 @@ If your maven build is failing with Out-Of-Memory errors, set JVM options for ma MAVEN_OPTS="-Xmx2G" - - -## Kotlin serialization Gradle Plugin - -First, build all the above. Then run `./gradlew :kotlinx-gradle-serialization-plugin:publishToMavenLocal` to install it to your local maven repository. - -When it is installed in local maven repository, you can add it as a dependency in buildscript classpath and apply it: - -``` -buildscript { - - repositories { - mavenLocal() - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" - classpath "org.jetbrains.kotlinx:kotlinx-gradle-serialization-plugin:0.1" - } -} - -apply plugin: 'kotlin' -apply plugin: 'kotlinx-serialization' - -``` - -You can also obtain it from bintray: https://bintray.com/kotlin/kotlinx/kotlinx.serialization.plugin \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml index e3938da28fb..615870792b4 100755 --- a/libraries/tools/kotlin-maven-serialization/pom.xml +++ b/libraries/tools/kotlin-maven-serialization/pom.xml @@ -16,10 +16,16 @@ 1.2-SNAPSHOT - org.jetbrains.kotlinx + + org.jetbrains.kotlin + kotlin-project + 1.3-SNAPSHOT + ../../pom.xml + + kotlinx-maven-serialization-plugin jar - 0.7.0-eap-1 + Serialization plugin for Maven @@ -138,14 +144,4 @@ - - - - - bintray-repo - https://api.bintray.com/maven/kotlin/kotlinx/kotlinx.serialization.plugin/ - - - - diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle index eb5123b5ed0..7439ac112f0 100644 --- a/libraries/tools/kotlin-serialization-unshaded/build.gradle +++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle @@ -3,9 +3,6 @@ apply plugin: 'kotlin' configureJvmProject(project) configurePublishing(project) -group = 'org.jetbrains.kotlinx' -version = project(':kotlinx-gradle-serialization-plugin').version - compileJava { sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -23,15 +20,10 @@ dependencies { compileOnly project(':kotlin-stdlib') compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar') - compileOnly project(':kotlin-allopen-compiler-plugin') compileOnly 'org.jetbrains.kotlin:gradle-api:1.6' } -processResources { - expand(project.properties) -} - evaluationDependsOn(":kotlinx-serialization-compiler-plugin") jar { @@ -40,6 +32,8 @@ jar { manifestAttributes(manifest, project) } +ArtifactsKt.runtimeJar(project, jar, {}) + artifacts { archives sourcesJar archives javadocJar diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle index b5213dd9999..7f5295cfb78 100644 --- a/libraries/tools/kotlin-serialization/build.gradle +++ b/libraries/tools/kotlin-serialization/build.gradle @@ -1,18 +1,8 @@ -plugins { - id "com.jfrog.bintray" version "1.7.3" -} - apply plugin: 'kotlin' configureJvmProject(project) configurePublishing(project) -group = 'org.jetbrains.kotlinx' -version = '0.7.0' -if (!project.hasProperty("deploy")) { - version = "$version-eap-1" -} - compileJava { sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -37,10 +27,6 @@ dependencies { evaluationDependsOn(":kotlinx-serialization-compiler-plugin") -processResources { - expand(project.properties) -} - jar { from(project(":kotlinx-serialization-compiler-plugin").sourceSets.main.output.classesDirs) from(project(":kotlinx-serialization-compiler-plugin").sourceSets.main.output.resourcesDir) @@ -53,26 +39,3 @@ artifacts { archives sourcesJar archives javadocJar } - -bintray { - user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') - key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') - configurations = ['archives'] - if (!project.hasProperty("deploy")) { - dryRun = true - } - pkg { - repo = 'kotlinx' - name = 'kotlinx.serialization.plugin' - userOrg = 'kotlin' - licenses = ['Apache-2.0'] - vcsUrl = 'https://github.com/JetBrains/kotlin/tree/rr/kotlinx.serialization/libraries' - websiteUrl = 'https://github.com/Kotlin/kotlinx.serialization' - issueTrackerUrl = 'https://github.com/Kotlin/kotlinx.serialization/issues' - - githubRepo = 'JetBrains/kotlin' - version { - name = project.version - } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt index de038194438..eccaefbc6da 100644 --- a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt +++ b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt @@ -18,17 +18,12 @@ package org.jetbrains.kotlinx.serialization.gradle import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.logging.Logger -import org.gradle.api.logging.Logging -import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact import org.jetbrains.kotlin.gradle.plugin.SubpluginOption import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile -import java.io.FileNotFoundException -import java.util.* class SerializationGradleSubplugin : Plugin { companion object { @@ -42,13 +37,11 @@ class SerializationGradleSubplugin : Plugin { class SerializationKotlinGradleSubplugin : KotlinGradleSubplugin { companion object { - const val SERIALIZATION_GROUP_NAME = "org.jetbrains.kotlinx" + const val SERIALIZATION_GROUP_NAME = "org.jetbrains.kotlin" const val SERIALIZATION_ARTIFACT_NAME = "kotlinx-gradle-serialization-plugin" const val SERIALIZATION_ARTIFACT_UNSHADED_NAME = "kotlinx-gradle-serialization-plugin-unshaded" } - private val log = Logging.getLogger(this.javaClass) - private val pluginVersion = "0.7.0-eap-1" private var useUnshaded = false override fun isApplicable(project: Project, task: AbstractCompile): Boolean { @@ -65,36 +58,15 @@ class SerializationKotlinGradleSubplugin : KotlinGradleSubplugin { + ): List { return emptyList() } override fun getPluginArtifact(): SubpluginArtifact { val artifact = if (useUnshaded) SERIALIZATION_ARTIFACT_UNSHADED_NAME else SERIALIZATION_ARTIFACT_NAME - return SubpluginArtifact(SERIALIZATION_GROUP_NAME, artifact, pluginVersion) + return SubpluginArtifact(SERIALIZATION_GROUP_NAME, artifact) } override fun getCompilerPluginId() = "org.jetbrains.kotlinx.serialization" } - -// taken from KotlinPluginWrapper.kt -internal fun Logger.kotlinDebug(message: String) { - this.debug("[KOTLIN] $message") -} - -private fun Any.findPluginVersion(log: Logger): String { - log.kotlinDebug("Loading version information about kotlinx.serialization") - val props = Properties() - val propFileName = "plugin.properties" - val loader = javaClass.classLoader!! - val inputStream = loader.getResourceAsStream(propFileName) - ?: throw FileNotFoundException("property file '$propFileName' not found in the classpath") - - props.load(inputStream) - - val pluginVersion = props["plugin.version"] as String - log.kotlinDebug("Found plugin version [$pluginVersion]") - return pluginVersion -} \ No newline at end of file diff --git a/libraries/tools/kotlin-serialization/src/main/resources/plugin.properties b/libraries/tools/kotlin-serialization/src/main/resources/plugin.properties deleted file mode 100644 index ef6a967bf62..00000000000 --- a/libraries/tools/kotlin-serialization/src/main/resources/plugin.properties +++ /dev/null @@ -1 +0,0 @@ -plugin.version=${project.version} \ No newline at end of file diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 32c9135a419..9b744e3001b 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 index 530574bad99..b9f0b07c6a6 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 index 1b57bd5d719..a8b3c41af97 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 index 1b57bd5d719..a8b3c41af97 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 index 4795856d5dc..dcb65979eb1 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":kotlin-scripting-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 1543ceb1cc4..e080e317a66 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -5,12 +5,13 @@ plugins { kotlin("jvm") id("jps-compatible") } + +jvmTarget = "1.6" + dependencies { -// val compileOnly by configurations -// val runtime by configurations compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) - compileOnly(intellijPluginDep("maven")) + excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) } compileOnly(project(":jps-plugin")) compileOnly(project(":compiler:plugin-api")) compileOnly(project(":compiler:frontend")) @@ -35,10 +36,8 @@ val jar = runtimeJar { from(fileTree("$projectDir/src")) { include("META-INF/**") } } -val serialPluginDir: File by rootProject.extra -dist(targetDir = File(serialPluginDir,"lib"), targetName = the().archivesBaseName.removePrefix("kotlin-") + ".jar") +dist(targetName = the().archivesBaseName + ".jar") -ideaPlugin { - from(jar) - rename("^kotlin-", "") -} +runtimeJar() + +ideaPlugin() \ No newline at end of file diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/META-INF/plugin.xml b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/META-INF/plugin.xml deleted file mode 100644 index 00a1b5373c3..00000000000 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/META-INF/plugin.xml +++ /dev/null @@ -1,23 +0,0 @@ - - Kotlin-serialization - org.jetbrains.kotlinx.serialization - 0.5.2-SNAPSHOT - - org.jetbrains.kotlin - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt new file mode 100644 index 00000000000..b1303d863c7 --- /dev/null +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt @@ -0,0 +1,24 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlinx.serialization.idea + +import com.intellij.openapi.externalSystem.model.DataNode +import com.intellij.openapi.externalSystem.model.project.ModuleData +import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler +import org.jetbrains.kotlin.idea.facet.KotlinFacet +import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData + +class KotlinSerializationGradleImportHandler : GradleProjectImportHandler { + override fun importBySourceSet(facet: KotlinFacet, sourceSetNode: DataNode) { + KotlinSerializationImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR) + } + + override fun importByModule(facet: KotlinFacet, moduleNode: DataNode) { + KotlinSerializationImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR) + } + + private val PLUGIN_GRADLE_JAR = "kotlinx-gradle-serialization-plugin" +} \ No newline at end of file diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt index 9430b3ecaf7..f6e320832ed 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt @@ -16,38 +16,11 @@ package org.jetbrains.kotlinx.serialization.idea -import com.intellij.openapi.externalSystem.model.DataNode -import com.intellij.openapi.externalSystem.model.project.ModuleData import com.intellij.util.PathUtil -import org.jetbrains.idea.maven.project.MavenProject import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler import org.jetbrains.kotlin.idea.facet.KotlinFacet -import org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler -import org.jetbrains.kotlinx.serialization.idea.KotlinSerializationImportHandler.modifyCompilerArguments -import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData import java.io.File -class KotlinSerializationGradleImportHandler : GradleProjectImportHandler { - override fun importBySourceSet(facet: KotlinFacet, sourceSetNode: DataNode) { - modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR) - } - - override fun importByModule(facet: KotlinFacet, moduleNode: DataNode) { - modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR) - } - - private val PLUGIN_GRADLE_JAR = "kotlinx-gradle-serialization-plugin" -} - -class KotlinSerializationMavenImportHandler: MavenProjectImportHandler { - override fun invoke(facet: KotlinFacet, mavenProject: MavenProject) { - modifyCompilerArguments(facet, PLUGIN_MAVEN_JAR) - } - - private val PLUGIN_MAVEN_JAR = "kotlinx-maven-serialization-plugin" -} - internal object KotlinSerializationImportHandler { private val PLUGIN_JPS_JAR :String get() = File(PathUtil.getJarPathForClass(this::class.java)).absolutePath diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt new file mode 100644 index 00000000000..00e2183abe1 --- /dev/null +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt @@ -0,0 +1,18 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlinx.serialization.idea + +import org.jetbrains.idea.maven.project.MavenProject +import org.jetbrains.kotlin.idea.facet.KotlinFacet +import org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler + +class KotlinSerializationMavenImportHandler: MavenProjectImportHandler { + override fun invoke(facet: KotlinFacet, mavenProject: MavenProject) { + KotlinSerializationImportHandler.modifyCompilerArguments(facet, PLUGIN_MAVEN_JAR) + } + + private val PLUGIN_MAVEN_JAR = "kotlinx-maven-serialization-plugin" +} \ No newline at end of file diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt.as31 b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt.as31 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt.as32 b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt.as32 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt.as33 b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationMavenImportHandler.kt.as33 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index b6e6bbf0f97..7f39056785e 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("gradle")) diff --git a/plugins/uast-kotlin/build.gradle.kts.173 b/plugins/uast-kotlin/build.gradle.kts.173 index 698e4620866..e5a6fab1aef 100644 --- a/plugins/uast-kotlin/build.gradle.kts.173 +++ b/plugins/uast-kotlin/build.gradle.kts.173 @@ -32,6 +32,7 @@ dependencies { testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) + testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(intellijDep()) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("gradle")) diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 4820f8e7d65..9519e64f5c5 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -88,6 +88,7 @@ dependencies { testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) testRuntime(project(":plugins:uast-kotlin-idea")) diff --git a/ultimate/build.gradle.kts.173 b/ultimate/build.gradle.kts.173 index a1cfb6c611d..3fe114a4596 100644 --- a/ultimate/build.gradle.kts.173 +++ b/ultimate/build.gradle.kts.173 @@ -88,6 +88,7 @@ dependencies { testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) testRuntime(project(":plugins:uast-kotlin-idea")) diff --git a/ultimate/build.gradle.kts.as31 b/ultimate/build.gradle.kts.as31 index 00011afbe74..28a81527806 100644 --- a/ultimate/build.gradle.kts.as31 +++ b/ultimate/build.gradle.kts.as31 @@ -88,6 +88,7 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } diff --git a/ultimate/build.gradle.kts.as32 b/ultimate/build.gradle.kts.as32 index 589edd7f5f3..83019ffc423 100644 --- a/ultimate/build.gradle.kts.as32 +++ b/ultimate/build.gradle.kts.as32 @@ -89,6 +89,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/ultimate/ultimate-runner/build.gradle.kts b/ultimate/ultimate-runner/build.gradle.kts index bf6c48ffea4..7eb921f8f83 100644 --- a/ultimate/ultimate-runner/build.gradle.kts +++ b/ultimate/ultimate-runner/build.gradle.kts @@ -17,10 +17,9 @@ val intellijUltimateEnabled : Boolean by rootProject.extra val ideaUltimatePluginDir: File by rootProject.extra val ideaUltimateSandboxDir: File by rootProject.extra -val serialPluginDir: File by rootProject.extra if (intellijUltimateEnabled) { - runIdeTask("runUltimate", ideaUltimatePluginDir, ideaUltimateSandboxDir, serialPluginDir) { + runIdeTask("runUltimate", ideaUltimatePluginDir, ideaUltimateSandboxDir) { dependsOn(":dist", ":ideaPlugin", ":ultimate:ideaUltimatePlugin") } }