[JPS] Add "installJps" task and update module exclusions

Introduce an "installJps" task to enhance the local publishing process. Update maven project configuration to exclude specific test modules for local JPS publication. Also, add documentation in jps/README.md on how to publish JPS locally for use in IntelliJ IDEA. #KT-73688 Fixed Merge-request: KT-MR-19228 Merged-by: Aleksei Cherepanov <[email protected]>
JetBrains · Dec 17, 2024 · 080e616 · 080e616
1 parent 00fa8a0
commit 080e616
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git 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<Exec>("installJps") {
+        val installTask = this
+        allprojects {
+            plugins.withType<MavenPublishPlugin> {
+                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
@@ -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
+```
diff --git a/libraries/pom.xml b/libraries/pom.xml
@@ -95,10 +95,6 @@
 
         <module>tools/kotlin-bom</module>
         <module>tools/kotlin-dist-for-jps-meta</module>
-
-        <module>tools/kotlin-maven-plugin-test</module>
-
-        <module>examples/kotlin-java-example</module>
     </modules>
 
     <dependencies>
@@ -425,5 +421,17 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>exclude-test-modules</id>
+            <activation>
+                <property>
+                    <name>!excludeTestModules</name>
+                </property>
+            </activation>
+            <modules>
+                <module>tools/kotlin-maven-plugin-test</module>
+                <module>examples/kotlin-java-example</module>
+            </modules>
+        </profile>
     </profiles>
 </project>
diff --git a/...artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-project/kotlin-project.pom b/...artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-project/kotlin-project.pom
@@ -95,10 +95,6 @@
 
         <module>tools/kotlin-bom</module>
         <module>tools/kotlin-dist-for-jps-meta</module>
-
-        <module>tools/kotlin-maven-plugin-test</module>
-
-        <module>examples/kotlin-java-example</module>
     </modules>
 
     <dependencies>
@@ -425,5 +421,17 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>exclude-test-modules</id>
+            <activation>
+                <property>
+                    <name>!excludeTestModules</name>
+                </property>
+            </activation>
+            <modules>
+                <module>tools/kotlin-maven-plugin-test</module>
+                <module>examples/kotlin-java-example</module>
+            </modules>
+        </profile>
     </profiles>
 </project>