Merge pull request #76 from NordicSemiconductor/migration/version-cat…

…alog Migration to version catalog 1.1.3
NordicSemiconductor · Dec 16, 2022 · 8352e92 · 8352e92
2 parents 5919e65 + c2a420d
commit 8352e92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/blinky/ble/build.gradle.kts b/blinky/ble/build.gradle.kts
@@ -1,6 +1,8 @@
 plugins {
     // https://github.com/NordicSemiconductor/Android-Gradle-Plugins/blob/main/plugins/src/main/kotlin/AndroidLibraryConventionPlugin.kt
     alias(libs.plugins.nordic.library)
+    // https://github.com/NordicSemiconductor/Android-Gradle-Plugins/blob/main/plugins/src/main/kotlin/AndroidLKotlinConventionPlugin.kt
+    alias(libs.plugins.nordic.kotlin)
 }
 
 android {

diff --git a/blinky/spec/build.gradle.kts b/blinky/spec/build.gradle.kts
@@ -1,6 +1,8 @@
 plugins {
     // https://github.com/NordicSemiconductor/Android-Gradle-Plugins/blob/main/plugins/src/main/kotlin/AndroidLibraryConventionPlugin.kt
     alias(libs.plugins.nordic.library)
+    // https://github.com/NordicSemiconductor/Android-Gradle-Plugins/blob/main/plugins/src/main/kotlin/AndroidLKotlinConventionPlugin.kt
+    alias(libs.plugins.nordic.kotlin)
 }
 
 android {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,5 +9,6 @@ plugins {
     alias(libs.plugins.nordic.library) apply false
     alias(libs.plugins.nordic.library.compose) apply false
     alias(libs.plugins.nordic.feature) apply false
+    alias(libs.plugins.nordic.kotlin) apply false
     alias(libs.plugins.nordic.hilt) apply false
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:1.0.16")
+            from("no.nordicsemi.android.gradle:version-catalog:1.1.3")
         }
     }
 }
@@ -28,9 +28,9 @@ include(":blinky:spec")
 include(":blinky:ui")
 include(":blinky:ble")
 
-if (file("../Android-Common-Libraries").exists()) {
-    includeBuild("../Android-Common-Libraries")
-}
+//if (file("../Android-Common-Libraries").exists()) {
+//    includeBuild("../Android-Common-Libraries")
+//}
 //if (file("../Android-BLE-Library").exists()) {
 //    includeBuild("../Android-BLE-Library")
 //}