Add intellijRepository to the beginning of the repositories list wh…

…en resolving dependencies #615
JetBrains · May 16, 2022 · 1232366 · 1232366
1 parent ae70e23
commit 1232366
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -13,6 +13,7 @@
 - Set `-Djdk.module.illegalAccess.silent=true` flag by default to mute `WARNING: An illegal reflective access operation has occurred`
 - `instrumentCode` task – incremental instrumentation [#459](../../issues/459)
 - Release `plugin.xml` file after reading it [IDEA-291836](https://youtrack.jetbrains.com/issue/IDEA-291836)
+- Add `intellijRepository` to the beginning of the repositories list when resolving dependencies [#615](../../issues/615)
 
 ## 1.5.3
 - Updated dependencies marked as vulnerable

diff --git a/src/main/kotlin/org/jetbrains/intellij/dependency/MavenPluginsRepository.kt b/src/main/kotlin/org/jetbrains/intellij/dependency/MavenPluginsRepository.kt
@@ -26,7 +26,7 @@ interface MavenRepository : PluginsRepository {
 
     fun postResolve(project: Project, func: () -> Unit) {
         if (resolvedDependency) {
-            return func.invoke()
+            return func()
         }
     }
 }

diff --git a/src/main/kotlin/org/jetbrains/intellij/utils/DependenciesDownloader.kt b/src/main/kotlin/org/jetbrains/intellij/utils/DependenciesDownloader.kt
@@ -33,8 +33,15 @@ open class DependenciesDownloader @Inject constructor(
         repositoriesBlock: RepositoryHandler.() -> List<ArtifactRepository>,
         silent: Boolean = false,
     ): List<File> {
-        val dependency = dependenciesBlock.invoke(dependencyHandler)
-        val repositories = repositoriesBlock.invoke(repositoryHandler) + repositoryHandler.mavenCentral()
+        val dependency = dependenciesBlock(dependencyHandler)
+        val baseRepositories = with (repositoryHandler) {
+            toList().also {
+                clear()
+                repositoriesBlock(this)
+                mavenCentral()
+                addAll(it)
+            }
+        }
 
         try {
             return configurationContainer.detachedConfiguration(dependency).files.toList()
@@ -44,7 +51,10 @@ open class DependenciesDownloader @Inject constructor(
             }
             throw e
         } finally {
-            repositoryHandler.removeAll(repositories.toSet())
+            with (repositoryHandler) {
+                clear()
+                addAll(baseRepositories)
+            }
         }
     }
 }