Tighten down dependency resolution (#1903)

3 files changed, 55 insertions, 18 deletions

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 144cd7f7..2e9d12b3 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -8,7 +8,23 @@ rootProject.name = "build-logic"
 
 dependencyResolutionManagement {
   repositories {
-    google()
+    exclusiveContent {
+      forRepository(::google)
+      filter {
+        includeGroup("androidx.databinding")
+        includeGroup("com.android")
+        includeGroup("com.android.tools")
+        includeGroup("com.android.tools.analytics-library")
+        includeGroup("com.android.tools.build")
+        includeGroup("com.android.tools.build.jetifier")
+        includeGroup("com.android.databinding")
+        includeGroup("com.android.tools.ddms")
+        includeGroup("com.android.tools.layoutlib")
+        includeGroup("com.android.tools.lint")
+        includeGroup("com.android.tools.utp")
+        includeGroup("com.google.testing.platform")
+      }
+    }
     mavenCentral()
   }
   versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
diff --git a/build.gradle.kts b/build.gradle.kts
index 59d68591..5a278514 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,16 +4,6 @@
  */
 @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
 
-buildscript {
-  repositories {
-    maven("https://storage.googleapis.com/r8-releases/raw") {
-      name = "R8 dev releases"
-      content { includeModule("com.android.tools", "r8") }
-    }
-  }
-  dependencies { classpath(libs.build.r8) }
-}
-
 plugins {
   id("com.github.android-password-store.kotlin-common")
   id("com.github.android-password-store.binary-compatibility")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b002cffc..3c1c1817 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,24 +10,55 @@ rootProject.name = "APS"
 pluginManagement {
   repositories {
     includeBuild("build-logic")
-    google()
+    exclusiveContent {
+      forRepository(::google)
+      filter {
+        includeGroup("androidx.databinding")
+        includeGroup("com.android")
+        includeGroup("com.android.tools")
+        includeGroup("com.android.tools.analytics-library")
+        includeGroup("com.android.tools.build")
+        includeGroup("com.android.tools.build.jetifier")
+        includeGroup("com.android.databinding")
+        includeGroup("com.android.tools.ddms")
+        includeGroup("com.android.tools.layoutlib")
+        includeGroup("com.android.tools.lint")
+        includeGroup("com.android.tools.utp")
+        includeGroup("com.google.testing.platform")
+      }
+    }
     mavenCentral()
-    gradlePluginPortal()
   }
 }
 
 dependencyResolutionManagement {
   repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
   repositories {
-    mavenCentral()
-    google()
-    maven("https://jitpack.io") {
-      name = "JitPack"
-      content {
+    exclusiveContent {
+      forRepository(::google)
+      filter {
+        includeGroup("com.android")
+        includeGroup("com.android.tools")
+        includeGroup("com.android.tools.analytics-library")
+        includeGroup("com.android.tools.build")
+        includeGroup("com.android.tools.ddms")
+        includeGroup("com.android.tools.external.com-intellij")
+        includeGroup("com.android.tools.external.org-jetbrains")
+        includeGroup("com.android.tools.layoutlib")
+        includeGroup("com.android.tools.lint")
+        includeGroup("com.google.android.gms")
+        includeModule("com.google.android.material", "material")
+        includeGroupByRegex("androidx.*")
+      }
+    }
+    exclusiveContent {
+      forRepository { maven("https://jitpack.io") }
+      filter {
         includeModule("com.github.haroldadmin", "WhatTheStack")
         includeModule("com.github.open-keychain.open-keychain", "sshauthentication-api")
       }
     }
+    mavenCentral()
   }
 }