diff options
| author | Albin <albin@mullvad.net> | 2025-10-30 15:24:06 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-10-30 15:24:06 +0100 |
| commit | c291bea599e41c891d2700ea5db4896c4780ec56 (patch) | |
| tree | f57a873b3b0d2eb794cce602d199f6918472b789 /android | |
| parent | a2887f2c0055440fcc5bc0479cf81e99d8f82843 (diff) | |
| parent | 82d7af3240708882ee4363001719850e01695ed4 (diff) | |
| download | mullvadvpn-c291bea599e41c891d2700ea5db4896c4780ec56.tar.xz mullvadvpn-c291bea599e41c891d2700ea5db4896c4780ec56.zip | |
Merge branch 'move-gradle-repos-to-settings'
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle.kts | 10 | ||||
| -rw-r--r-- | android/buildSrc/build.gradle.kts | 2 | ||||
| -rw-r--r-- | android/buildSrc/settings.gradle.kts | 1 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 15 |
4 files changed, 15 insertions, 13 deletions
diff --git a/android/build.gradle.kts b/android/build.gradle.kts index d34bb5fb8a..9451bc6744 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -21,11 +21,6 @@ plugins { } buildscript { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } dependencies { //noinspection UseTomlInstead // Dependency class paths are required for Gradle metadata verification to work properly, @@ -110,11 +105,6 @@ tasks.withType<DetektCreateBaselineTask>().configureEach { allprojects { apply(plugin = rootProject.libs.plugins.ktfmt.get().pluginId) - repositories { - google() - mavenCentral() - } - // Should be the same as ktfmt config in buildSrc/build.gradle.kts configure<com.ncorti.ktfmt.gradle.KtfmtExtension> { kotlinLangStyle() diff --git a/android/buildSrc/build.gradle.kts b/android/buildSrc/build.gradle.kts index cf2545b068..cbde75a47e 100644 --- a/android/buildSrc/build.gradle.kts +++ b/android/buildSrc/build.gradle.kts @@ -4,8 +4,6 @@ plugins { alias(libs.plugins.detekt) apply true } -repositories { maven("https://plugins.gradle.org/m2/") } - kotlin { jvmToolchain(17) } // Should be the same as ktfmt config in project root build.gradle.kts diff --git a/android/buildSrc/settings.gradle.kts b/android/buildSrc/settings.gradle.kts index a02ec485a5..300aafa606 100644 --- a/android/buildSrc/settings.gradle.kts +++ b/android/buildSrc/settings.gradle.kts @@ -2,4 +2,5 @@ rootProject.name = "buildSrc" dependencyResolutionManagement { versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } } + repositories { gradlePluginPortal() } } diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index b4897166d5..b5cd37b424 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -2,7 +2,20 @@ pluginManagement { repositories { google() mavenCentral() - gradlePluginPortal() + gradlePluginPortal() { + content { + // Exclude gRPC artifacts - they're only available in Maven Central + excludeGroup("io.grpc") + } + } + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() } } |
