From a241a77dd335b76c9424bcb75064390154ef56e8 Mon Sep 17 00:00:00 2001 From: "Andrei.Salavei" Date: Thu, 7 Dec 2023 18:42:22 +0100 Subject: [PATCH 1/3] Decrease maven local repo priority to fix CI builds --- buildSrc/repos.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/repos.gradle b/buildSrc/repos.gradle index 5f1f440ab9f39..9969d5d365500 100644 --- a/buildSrc/repos.gradle +++ b/buildSrc/repos.gradle @@ -59,8 +59,8 @@ def addMavenRepositories(RepositoryHandler handler) { } def isJBFork = true if (isJBFork) { - handler.mavenLocal() handler.mavenCentral() + handler.mavenLocal() handler.google() handler.gradlePluginPortal() handler.maven { From 21d545e3dfaa7f6d3aef92c836df979c7afcab26 Mon Sep 17 00:00:00 2001 From: "Andrei.Salavei" Date: Thu, 7 Dec 2023 18:48:05 +0100 Subject: [PATCH 2/3] Move maven local repo to the last position --- buildSrc/repos.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/repos.gradle b/buildSrc/repos.gradle index 9969d5d365500..d8607f4f23c35 100644 --- a/buildSrc/repos.gradle +++ b/buildSrc/repos.gradle @@ -60,7 +60,6 @@ def addMavenRepositories(RepositoryHandler handler) { def isJBFork = true if (isJBFork) { handler.mavenCentral() - handler.mavenLocal() handler.google() handler.gradlePluginPortal() handler.maven { @@ -76,6 +75,7 @@ def addMavenRepositories(RepositoryHandler handler) { includeModule("com.android.tools", "r8") } } + handler.mavenLocal() } // Ordering appears to be important: b/229733266 def androidPluginRepoOverride = System.getenv("GRADLE_PLUGIN_REPO") From c81e838a6becaf3280ef51b12e9fa1434277fbda Mon Sep 17 00:00:00 2001 From: "Andrei.Salavei" Date: Thu, 7 Dec 2023 19:11:45 +0100 Subject: [PATCH 3/3] Update maven local repo priority --- buildSrc/repos.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/repos.gradle b/buildSrc/repos.gradle index d8607f4f23c35..6912a50de9e8b 100644 --- a/buildSrc/repos.gradle +++ b/buildSrc/repos.gradle @@ -60,6 +60,8 @@ def addMavenRepositories(RepositoryHandler handler) { def isJBFork = true if (isJBFork) { handler.mavenCentral() + // Keep mavenLocal() repository below mavenCentral to avoid issues with stdlib imports + handler.mavenLocal() handler.google() handler.gradlePluginPortal() handler.maven { @@ -75,7 +77,6 @@ def addMavenRepositories(RepositoryHandler handler) { includeModule("com.android.tools", "r8") } } - handler.mavenLocal() } // Ordering appears to be important: b/229733266 def androidPluginRepoOverride = System.getenv("GRADLE_PLUGIN_REPO")