Revert prefixing local groups with "com.jetbrains.localhost-only" bec…

…ause group names are hardcoded in the IDE https://github.com/JetBrains/intellij-community/blob/c8ba8401f73488f966b5ed5b5c5afaa38a9bcbdf/plugins/devkit/intellij.devkit.gradle/src/IntelliJPlatformAttachSourcesProvider.kt#L64-L67
JetBrains · Oct 8, 2024 · cfd2cdb · cfd2cdb
1 parent 3e01a1a
commit cfd2cdb
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@
 ### Changed
 
 - Improved build performance by pre-creating Ivy XML files in the extracted IDE location.
-- Improved build performance by making the local Ivy repository first in the list and prefixing all "fake" artifact groups with "com.jetbrains.localhost-only" and excluding that group from already declared remote repositories.
+- Improved build performance by making the local Ivy repository first in the list and making it an exclusive Gradle repository.
 
 ### Fixed
 

diff --git a/api/IntelliJPlatformGradlePlugin.api b/api/IntelliJPlatformGradlePlugin.api
@@ -76,7 +76,6 @@ public final class org/jetbrains/intellij/platform/gradle/Constants$Configuratio
 	public static final field BUNDLED_MODULE_GROUP Ljava/lang/String;
 	public static final field BUNDLED_PLUGIN_GROUP Ljava/lang/String;
 	public static final field INSTANCE Lorg/jetbrains/intellij/platform/gradle/Constants$Configurations$Dependencies;
-	public static final field JB_LOCAL_PREFIX Ljava/lang/String;
 	public static final field LOCAL_IDE_GROUP Ljava/lang/String;
 	public static final field LOCAL_JETBRAINS_RUNTIME_GROUP Ljava/lang/String;
 	public static final field LOCAL_PLUGIN_GROUP Ljava/lang/String;

diff --git a/src/integrationTest/resources/dependency-locking-and-verification/build.gradle.kts b/src/integrationTest/resources/dependency-locking-and-verification/build.gradle.kts
@@ -21,8 +21,8 @@ buildscript {
         lockAllConfigurations()
         lockFile = file("gradle/locks/root/gradle-buildscript.lockfile")
         lockMode.set(LockMode.DEFAULT)
-        //ignoredDependencies.add("com.jetbrains.localhost-only.bundledModule:*")
-        //ignoredDependencies.add("com.jetbrains.localhost-only.bundledPlugin:*")
+        //ignoredDependencies.add("bundledModule:*")
+        //ignoredDependencies.add("bundledPlugin:*")
     }
 }
 // https://docs.gradle.org/current/userguide/dependency_locking.html

diff --git a/src/integrationTest/resources/dependency-locking/build.gradle.kts b/src/integrationTest/resources/dependency-locking/build.gradle.kts
@@ -22,8 +22,8 @@ buildscript {
         lockAllConfigurations()
         lockFile = file("gradle/locks/root/gradle-buildscript.lockfile")
         lockMode.set(LockMode.DEFAULT)
-        //ignoredDependencies.add("com.jetbrains.localhost-only.bundledModule:*")
-        //ignoredDependencies.add("com.jetbrains.localhost-only.bundledPlugin:*")
+        //ignoredDependencies.add("bundledModule:*")
+        //ignoredDependencies.add("bundledPlugin:*")
     }
 }
 // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1778

diff --git a/...onTest/resources/dependency-verification-ignore-intellij/gradle/verification-metadata.xml b/...onTest/resources/dependency-verification-ignore-intellij/gradle/verification-metadata.xml
@@ -13,8 +13,8 @@
          <key-server uri="https://keys.openpgp.org/"/>
       </key-servers>
       <trusted-artifacts>
-         <trust group="com.jetbrains.localhost-only.bundledModule" reason="Testing"/>
-         <trust group="com.jetbrains.localhost-only.bundledPlugin" reason="Testing"/>
+         <trust group="bundledModule" reason="Testing"/>
+         <trust group="bundledPlugin" reason="Testing"/>
       </trusted-artifacts>
    </configuration>
 </verification-metadata>
diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt
@@ -123,13 +123,11 @@ object Constants {
         }
 
         object Dependencies {
-            /** This group does not exist in any public repository, it is just a prefix for our local repo. */
-            const val JB_LOCAL_PREFIX = "com.jetbrains.localhost-only"
-            const val LOCAL_IDE_GROUP = "$JB_LOCAL_PREFIX.ide"
-            const val LOCAL_PLUGIN_GROUP = "$JB_LOCAL_PREFIX.plugin"
-            const val LOCAL_JETBRAINS_RUNTIME_GROUP = "$JB_LOCAL_PREFIX.jetBrainsRuntime"
-            const val BUNDLED_MODULE_GROUP = "$JB_LOCAL_PREFIX.bundledModule"
-            const val BUNDLED_PLUGIN_GROUP = "$JB_LOCAL_PREFIX.bundledPlugin"
+            const val LOCAL_IDE_GROUP = "localIde"
+            const val LOCAL_PLUGIN_GROUP = "localPlugin"
+            const val LOCAL_JETBRAINS_RUNTIME_GROUP = "localJetBrainsRuntime"
+            const val BUNDLED_MODULE_GROUP = "bundledModule"
+            const val BUNDLED_PLUGIN_GROUP = "bundledPlugin"
             const val MARKETPLACE_GROUP = "com.jetbrains.plugins"
         }
 

diff --git a/...n/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformDependenciesHelper.kt b/...n/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformDependenciesHelper.kt
@@ -413,6 +413,13 @@ class IntelliJPlatformDependenciesHelper(
             }
         }
 
+        // It would be better to make it createExclusiveIvyRepository.
+        // However, since we are creating it lazily, by this time some already registered repositories could have been
+        // "used". That creates an error, because an exclusive repository tries to add constraints on already existing
+        // repositories, which is not allowed for "used". To make it exclusive, it should be created with empty artifact
+        // & ivy paths in
+        // org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformRepositoriesExtension.defaultRepositories
+        // then the paths should be updated here once they are known.
         IntelliJPlatformRepositoriesHelper.createIvyArtifactRepository(
             repositoryName,
             repositories,

diff --git a/...n/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformRepositoriesHelper.kt b/...n/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformRepositoriesHelper.kt
@@ -286,7 +286,7 @@ class IntelliJPlatformRepositoriesHelper(
                 //
                 //       - Artifact name may also come up in Gradle errors, e.g. if for some reason the artifact is not
                 //         resolved. In that case the artifact coordinates may look very weird like:
-                //         com.jetbrains.localhost-only.bundledPlugin:/some/path/more/path/some.jar:123.456.789
+                //         bundledPlugin:/some/path/more/path/some.jar:123.456.789
                 //         For the same reason file extension is also stored in "ext".
                 //
                 // - "artifact" (IvyModule#name) is mandatory and contains the second part of the path, which is file