Migration to Version Catalog

app/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
     implementation(project(":permissions-notification"))
     implementation(project(":scanner-ble"))
 
-    implementation(libs.nordic.blek.client.android)
+    implementation(nordic.blek.client.android)
 
     implementation(libs.androidx.compose.material.iconsExtended)
 

gradle/nordic.versions.toml

@@ -0,0 +1,13 @@
+# Versions of Nordic libraries used in this project.
+
+# This is a subset of the Version Catalog available at https://github.com/NordicSemiconductor/Android-Version-Catalog
+# The version catalog can be updated independently of this project after the release of this library.
+
+[versions]
+log = "2.5.0"
+blek = "2.0.0-alpha08"
+
+[libraries]
+log = { group = "no.nordicsemi.android", name = "log", version.ref = "log" }
+blek-client-core-android = { group = "no.nordicsemi.kotlin.ble", name = "client-core-android", version.ref = "blek" }
+blek-client-android = { group = "no.nordicsemi.kotlin.ble", name = "client-android", version.ref = "blek" }

logger/build.gradle.kts

@@ -60,5 +60,5 @@ dokka {
 dependencies {
     implementation(project(":ui"))
 
-    api(libs.nordic.log)
+    api(nordic.log)
 }

scanner-ble/build.gradle.kts

@@ -56,5 +56,5 @@ dependencies {
     implementation(project(":ui"))
     implementation(libs.androidx.compose.material.iconsExtended)
 
-    api(libs.nordic.blek.client.core.android)
+    api(nordic.blek.client.core.android)
 }

settings.gradle.kts

@@ -32,19 +32,51 @@
 pluginManagement {
     repositories {
         mavenLocal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
-        gradlePluginPortal()
+        gradlePluginPortal {
+            content {
+                includeGroupByRegex("com\\.gradle.*")
+                includeGroupByRegex("no\\.nordicsemi.*")
+                includeGroupByRegex("org\\.jetbrains")
+            }
+        }
     }
 }
 
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         mavenLocal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
     }
+    versionCatalogs {
+        // Use Nordic Gradle Version Catalog with common external libraries versions.
+        create("libs") {
+            from("no.nordicsemi.android.gradle:version-catalog:2.10-1")
+        }
+        // Fixed versions for Nordic libraries.
+        create("nordic") {
+            from(files("gradle/nordic.versions.toml"))
+        }
+        // Nordic Version Catalog is released after library releases, so cannot be used internally in libs.
+        // create("nordic") {
+        //    from("no.nordicsemi.android:version-catalog:2025.10.00")
+        // }
+    }
 }
 rootProject.name = "Common Libraries"