From 488260f7de2452480adad5e91a26c23bc7a75f41 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 30 May 2025 17:52:20 +0200 Subject: [PATCH] [jps build] don't add RuntimeModuleRepository from IDE's installation to JPS build classpath (IJPL-189949) It's now taken from 'devkit.runtime.module.repository.jps' library together with devkit-runtime-module-repository implementation which uses it. This is needed to allow using a newer version of RuntimeModuleRepository which will support a more efficient format. When compiling older branches where the library doesn't include this artifact, it'll be added to the classpath by MonorepoJpsBuildProcessParametersProvider. GitOrigin-RevId: 24612c87d38a3477bb80b83755cda86427e11a7a --- jps/jps-builders/BUILD.bazel | 1 - jps/jps-builders/intellij.platform.jps.build.iml | 1 - .../src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index 411960296b19..2713225bc40e 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -34,7 +34,6 @@ jvm_library( "@lib//:jps-javac-extension", "@rules_jvm//jps-builders-6:build-javac-rt", "//platform/tracing:tracing-rt", - "//platform/runtime/repository", "//platform/util/zip", "@rules_jvm//dependency-graph", "@lib//:caffeine", diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml index f14d51be51d8..083e54e563c7 100644 --- a/jps/jps-builders/intellij.platform.jps.build.iml +++ b/jps/jps-builders/intellij.platform.jps.build.iml @@ -64,7 +64,6 @@ - diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java index a72ea93aab25..a490b1a3dae6 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java @@ -12,7 +12,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.SystemInfoRt; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.Strings; -import com.intellij.platform.runtime.repository.RuntimeModuleRepository; import com.intellij.tracing.Tracer; import com.intellij.uiDesigner.compiler.AlienFormFileException; import com.intellij.uiDesigner.core.GridConstraints; @@ -174,7 +173,6 @@ public final class ClasspathBootstrap { addToClassPath(cp, ClassWriter.class); // asm addToClassPath(cp, ClassVisitor.class); // asm-commons - addToClassPath(cp, RuntimeModuleRepository.class); // intellij.platform.runtime.repository addToClassPath(cp, JpsModel.class); // intellij.platform.jps.model addToClassPath(cp, JpsModelImpl.class); // intellij.platform.jps.model.impl addToClassPath(cp, JpsProjectLoader.class); // intellij.platform.jps.model.serialization