Refactor build scripts

teambtcmap · Jan 20, 2025 · 55ced93 · 55ced93
1 parent 65b92d8
commit 55ced93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     // this is necessary to avoid the plugins to be loaded multiple times
     // in each subproject's classloader
-    //alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.kotlinAndroid) apply false
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,13 +1,12 @@
 rootProject.name = "btc-map"
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
     repositories {
         google {
-            mavenContent {
-                includeGroupAndSubgroups("androidx")
-                includeGroupAndSubgroups("com.android")
-                includeGroupAndSubgroups("com.google")
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
             }
         }
         mavenCentral()
@@ -16,16 +15,10 @@ pluginManagement {
 }
 
 dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        google {
-            mavenContent {
-                includeGroupAndSubgroups("androidx")
-                includeGroupAndSubgroups("com.android")
-                includeGroupAndSubgroups("com.google")
-            }
-        }
+        google()
         mavenCentral()
-        // TODO get rid of it. It's still needed for charts
         maven("https://jitpack.io")
     }
 }