From c2243da08999b5d7789f5b196a15d065d2c7aab5 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpovich <a.n.karpovich@gmail.com>
Date: Tue, 21 Jan 2025 18:21:54 +0100
Subject: [PATCH] Lower mavenLocal priority in test projects of gradle-plugin
 (#5208)

mavenLocal as a top prirotiy in the list of library repositories causes
some cache issues on CI. And sometimes locally
---
 .../test/test-projects/application/defaultArgs/settings.gradle  | 2 +-
 .../application/defaultArgsOverride/settings.gradle             | 2 +-
 .../test/test-projects/application/javaLogger/settings.gradle   | 2 +-
 .../src/test/test-projects/application/jvm/settings.gradle      | 2 +-
 .../test/test-projects/application/jvmKotlinDsl/settings.gradle | 2 +-
 .../test/test-projects/application/macOptions/settings.gradle   | 2 +-
 .../src/test/test-projects/application/macSign/settings.gradle  | 2 +-
 .../test-projects/application/moduleClashCli/settings.gradle    | 2 +-
 .../src/test/test-projects/application/mpp/settings.gradle      | 2 +-
 .../test-projects/application/newAndroidTarget/settings.gradle  | 2 +-
 .../test-projects/application/optionsWithSpaces/settings.gradle | 2 +-
 .../src/test/test-projects/application/proguard/settings.gradle | 2 +-
 .../test/test-projects/application/resources/settings.gradle    | 2 +-
 .../test/test-projects/application/unpackSkiko/settings.gradle  | 2 +-
 .../beforeKotlin2/custom-compiler-args/settings.gradle          | 2 +-
 .../src/test/test-projects/beforeKotlin2/jsMpp/settings.gradle  | 2 +-
 .../src/test/test-projects/beforeKotlin2/mpp/settings.gradle    | 2 +-
 .../test-projects/misc/bundledKotlinPoet/settings.gradle.kts    | 2 +-
 .../test/test-projects/misc/commonResources/settings.gradle.kts | 2 +-
 .../test/test-projects/misc/emptyResources/settings.gradle.kts  | 2 +-
 .../test/test-projects/misc/iosResources/settings.gradle.kts    | 2 +-
 .../compose/src/test/test-projects/misc/jsMpp/settings.gradle   | 2 +-
 .../test-projects/misc/jvmOnlyResources/settings.gradle.kts     | 2 +-
 .../src/test/test-projects/misc/jvmPreview/settings.gradle      | 2 +-
 .../src/test/test-projects/misc/skikoWasm/settings.gradle       | 2 +-
 .../test/test-projects/misc/testResources/settings.gradle.kts   | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle
index f87e919ea29..ec73a975fed 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/defaultArgs/settings.gradle
@@ -16,11 +16,11 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle
index f87e919ea29..ec73a975fed 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/defaultArgsOverride/settings.gradle
@@ -16,11 +16,11 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle
index 78832dc01ac..8dbdff829e5 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/javaLogger/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "javaLogger"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle
index 6d72c984066..9428fbafab2 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "simple"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle
index 6d72c984066..9428fbafab2 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "simple"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle
index f87e919ea29..ec73a975fed 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/macOptions/settings.gradle
@@ -16,11 +16,11 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle
index f87e919ea29..ec73a975fed 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/macSign/settings.gradle
@@ -16,11 +16,11 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle
index 4e3e135f883..281c158a5b0 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/moduleClashCli/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 include ':lib1:utils', ':lib2:utils', ':app'
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle
index 96b75d539da..f56d133772d 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle
@@ -20,7 +20,6 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
@@ -29,6 +28,7 @@ dependencyResolutionManagement {
         maven {
             url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "mpp"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle
index 895eb5c107a..cfe1812436e 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/settings.gradle
@@ -17,12 +17,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "mpp"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle
index f87e919ea29..ec73a975fed 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/optionsWithSpaces/settings.gradle
@@ -16,11 +16,11 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle
index 6d72c984066..9428fbafab2 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/proguard/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "simple"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle
index 6d72c984066..9428fbafab2 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/resources/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "simple"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle b/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle
index 6d72c984066..9428fbafab2 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/unpackSkiko/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "simple"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/settings.gradle b/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/settings.gradle
index 083b143a651..78690551771 100644
--- a/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/settings.gradle
@@ -15,12 +15,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "simple"
diff --git a/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/jsMpp/settings.gradle b/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/jsMpp/settings.gradle
index afca8638e99..f7ad89b242a 100644
--- a/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/jsMpp/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/jsMpp/settings.gradle
@@ -15,12 +15,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "jsMpp"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/settings.gradle b/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/settings.gradle
index 0276bf4c39b..63b6efd24fb 100644
--- a/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/settings.gradle
@@ -19,7 +19,6 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
@@ -28,6 +27,7 @@ dependencyResolutionManagement {
         maven {
             url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "mpp"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/bundledKotlinPoet/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/bundledKotlinPoet/settings.gradle.kts
index 30b83634920..c4d642da8de 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/bundledKotlinPoet/settings.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/bundledKotlinPoet/settings.gradle.kts
@@ -16,10 +16,10 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
         gradlePluginPortal()
         google()
+        mavenLocal()
     }
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/settings.gradle.kts
index 30b9d60bc63..b2556043422 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/settings.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/settings.gradle.kts
@@ -15,10 +15,10 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
         gradlePluginPortal()
         google()
+        mavenLocal()
     }
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/emptyResources/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/emptyResources/settings.gradle.kts
index 65030c40e7b..866fc269705 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/emptyResources/settings.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/emptyResources/settings.gradle.kts
@@ -14,10 +14,10 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
         gradlePluginPortal()
         google()
+        mavenLocal()
     }
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle.kts
index af172cd475b..6ece2cc1153 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/iosResources/settings.gradle.kts
@@ -15,10 +15,10 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
         gradlePluginPortal()
         google()
+        mavenLocal()
     }
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle
index a7062f47ee7..a749850576e 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "jsMpp"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/settings.gradle.kts
index 379274b6cc5..1517f3e341d 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/settings.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/settings.gradle.kts
@@ -14,10 +14,10 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
         gradlePluginPortal()
         google()
+        mavenLocal()
     }
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle
index ceb7bfdecf3..b2a695a9a3a 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/settings.gradle
@@ -17,12 +17,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = 'jvmPreview'
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle
index 56a55d1288c..5f9e7ef28e8 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/settings.gradle
@@ -16,12 +16,12 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven {
             url 'https://maven.pkg.jetbrains.space/public/p/compose/dev'
         }
+        mavenLocal()
     }
 }
 rootProject.name = "skikoWasm"
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/testResources/settings.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/testResources/settings.gradle.kts
index 292f6220df3..59c6b748620 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/testResources/settings.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/testResources/settings.gradle.kts
@@ -15,10 +15,10 @@ pluginManagement {
 }
 dependencyResolutionManagement {
     repositories {
-        mavenLocal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
         gradlePluginPortal()
         google()
+        mavenLocal()
     }
 }