diff --git a/build.gradle.kts b/build.gradle.kts index c25918017edc5..99ffcf71bd151 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,7 @@ import org.gradle.crypto.checksum.Checksum import org.gradle.plugins.ide.idea.model.IdeaModel import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask +import plugins.KotlinBuildPublishingPlugin buildscript { // a workaround for kotlin compiler classpath in kotlin project: sometimes gradle substitutes @@ -1082,6 +1083,22 @@ tasks { environment("JDK_1_8", getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8).get()) } } + + register("installJps") { + val installTask = this + allprojects { + plugins.withType { + installTask.dependsOn(tasks.named("publishToMavenLocal")) + } + } + group = "publishing" + workingDir = rootProject.projectDir.resolve("libraries") + commandLine = getMvnwCmd() + listOf("clean", "install", "-DskipTests", "-DexcludeTestModules=true") + val jdk8Home = getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8) + doFirst { + environment("JDK_1_8", jdk8Home.get()) + } + } } val zipCompiler by tasks.registering(Zip::class) { diff --git a/jps/README.md b/jps/README.md new file mode 100644 index 0000000000000..bfbe9d4f451b2 --- /dev/null +++ b/jps/README.md @@ -0,0 +1,8 @@ +# How to publish JPS locally to consume it in Intellij Idea + +You can use `installJps` task or run: +```shell +cd .. +./gradlew installJps && \ +echo Finished successfully +``` \ No newline at end of file diff --git a/libraries/pom.xml b/libraries/pom.xml index 27d455e1019ca..e26fee8e75735 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -95,10 +95,6 @@ tools/kotlin-bom tools/kotlin-dist-for-jps-meta - - tools/kotlin-maven-plugin-test - - examples/kotlin-java-example @@ -425,5 +421,17 @@ + + exclude-test-modules + + + !excludeTestModules + + + + tools/kotlin-maven-plugin-test + examples/kotlin-java-example + + diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-project/kotlin-project.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-project/kotlin-project.pom index c4970837a0bc2..d37f4efb53c20 100644 --- a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-project/kotlin-project.pom +++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-project/kotlin-project.pom @@ -95,10 +95,6 @@ tools/kotlin-bom tools/kotlin-dist-for-jps-meta - - tools/kotlin-maven-plugin-test - - examples/kotlin-java-example @@ -425,5 +421,17 @@ + + exclude-test-modules + + + !excludeTestModules + + + + tools/kotlin-maven-plugin-test + examples/kotlin-java-example + +