Merge pull request #89 from NordicSemiconductor/migration/dependencies

Migration to latest dependencies
NordicSemiconductor · Dec 2, 2024 · 720472a · 720472a
2 parents 506cabe + 879f2c6
commit 720472a
Show file tree

Hide file tree

Showing 27 changed files with 425 additions and 335 deletions.
diff --git a/blinky/ble/build.gradle.kts b/blinky/ble/build.gradle.kts
@@ -2,7 +2,7 @@ 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/AndroidKotlinConventionPlugin.kt
-    alias(libs.plugins.nordic.kotlin)
+    alias(libs.plugins.nordic.kotlin.android)
 }
 
 android {

diff --git a/blinky/spec/build.gradle.kts b/blinky/spec/build.gradle.kts
@@ -2,7 +2,7 @@ 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/AndroidKotlinConventionPlugin.kt
-    alias(libs.plugins.nordic.kotlin)
+    alias(libs.plugins.nordic.kotlin.android)
 }
 
 android {

diff --git a/blinky/ui/build.gradle.kts b/blinky/ui/build.gradle.kts
@@ -13,9 +13,8 @@ dependencies {
     implementation(project(":blinky:spec"))
     implementation(project(":scanner"))
 
-    implementation(libs.nordic.theme)
+    implementation(libs.nordic.ui)
     implementation(libs.nordic.logger)
-    implementation(libs.nordic.uilogger)
     implementation(libs.nordic.navigation)
     implementation(libs.nordic.permissions.ble)
     implementation(libs.nordic.log.timber)

diff --git a/...y/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/repository/BlinkyRepository.kt b/...y/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/repository/BlinkyRepository.kt
@@ -1,11 +1,11 @@
 package no.nordicsemi.android.blinky.ui.control.repository
 
 import android.content.Context
-import android.net.Uri
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.onEach
 import no.nordicsemi.android.blinky.spec.Blinky
+import no.nordicsemi.android.log.ILogSession
 import no.nordicsemi.android.log.LogContract
 import no.nordicsemi.android.log.timber.nRFLoggerTree
 import timber.log.Timber
@@ -28,14 +28,14 @@ class BlinkyRepository @Inject constructor(
     /** Timber tree that logs to nRF Logger. */
     private val tree: Timber.Tree
 
-    /** If the nRF Logger is installed, this URI will allow to open the session. */
-    internal val sessionUri: Uri?
+    /** If the nRF Logger is installed, this will allow to open the session. */
+    internal val logSession: ILogSession?
 
     init {
         // Plant a new Tree that logs to nRF Logger.
         tree = nRFLoggerTree(context, null, deviceId, deviceName)
             .also { Timber.plant(it) }
-            .also { sessionUri = it.session?.sessionUri }
+            .also { logSession = it.session }
     }
 
     val loggedLedState: Flow<Boolean>

diff --git a/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/BlinkyControlView.kt b/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/BlinkyControlView.kt
@@ -7,7 +7,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import no.nordicsemi.android.common.theme.NordicTheme
 
 @Composable
 internal fun BlinkyControlView(
@@ -34,12 +33,10 @@ internal fun BlinkyControlView(
 @Preview
 @Composable
 private fun BlinkyControlViewPreview() {
-    NordicTheme {
-        BlinkyControlView(
-            ledState = true,
-            buttonState = true,
-            onStateChanged = {},
-            modifier = Modifier.padding(16.dp),
-        )
-    }
+    BlinkyControlView(
+        ledState = true,
+        buttonState = true,
+        onStateChanged = {},
+        modifier = Modifier.padding(16.dp),
+    )
 }
diff --git a/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/BlinkyScreen.kt b/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/BlinkyScreen.kt
@@ -16,15 +16,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import no.nordicsemi.android.blinky.spec.Blinky
 import no.nordicsemi.android.blinky.ui.R
 import no.nordicsemi.android.blinky.ui.control.viewmodel.BlinkyViewModel
-import no.nordicsemi.android.blinky.spec.Blinky
+import no.nordicsemi.android.common.logger.view.LoggerAppBarIcon
+import no.nordicsemi.android.common.permissions.ble.RequireBluetooth
+import no.nordicsemi.android.common.ui.view.NordicAppBar
 import no.nordicsemi.android.scanner.view.DeviceConnectingView
 import no.nordicsemi.android.scanner.view.DeviceDisconnectedView
 import no.nordicsemi.android.scanner.view.Reason
-import no.nordicsemi.android.common.logger.view.LoggerAppBarIcon
-import no.nordicsemi.android.common.permissions.ble.RequireBluetooth
-import no.nordicsemi.android.common.theme.view.NordicAppBar
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -38,7 +38,7 @@ internal fun BlinkyScreen(
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         NordicAppBar(
-            text = viewModel.deviceName,
+            title = { Text(text = viewModel.deviceName) },
             onNavigationButtonClick = onNavigateUp,
             actions = {
                 LoggerAppBarIcon(onClick = { viewModel.openLogger() })

diff --git a/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/ButtonControlView.kt b/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/ButtonControlView.kt
@@ -18,7 +18,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.blinky.ui.R
-import no.nordicsemi.android.common.theme.NordicTheme
 
 @Composable
 internal fun ButtonControlView(
@@ -69,10 +68,8 @@ internal fun ButtonControlView(
 @Composable
 @Preview
 private fun ButtonControlViewPreview() {
-    NordicTheme {
-        ButtonControlView(
-            state = true,
-            modifier = Modifier.padding(16.dp),
-        )
-    }
+    ButtonControlView(
+        state = true,
+        modifier = Modifier.padding(16.dp),
+    )
 }
diff --git a/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/LedControlView.kt b/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/view/LedControlView.kt
@@ -2,7 +2,10 @@ package no.nordicsemi.android.blinky.ui.control.view
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Lightbulb
 import androidx.compose.material3.MaterialTheme
@@ -17,7 +20,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.blinky.ui.R
-import no.nordicsemi.android.common.theme.NordicTheme
 
 @Composable
 internal fun LedControlView(
@@ -67,11 +69,9 @@ internal fun LedControlView(
 @Composable
 @Preview
 private fun LecControlViewPreview() {
-    NordicTheme {
-        LedControlView(
-            state = true,
-            onStateChanged = {},
-            modifier = Modifier.padding(16.dp),
-        )
-    }
+    LedControlView(
+        state = true,
+        onStateChanged = {},
+        modifier = Modifier.padding(16.dp),
+    )
 }
diff --git a/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/viewmodel/BlinkyViewModel.kt b/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/control/viewmodel/BlinkyViewModel.kt
@@ -73,7 +73,7 @@ class BlinkyViewModel @Inject constructor(
      * Opens nRF Logger app with the log or Google Play if the app is not installed.
      */
     fun openLogger() {
-        LoggerLauncher.launch(getApplication(), repository.sessionUri)
+        LoggerLauncher.launch(getApplication(), repository.logSession)
     }
 
     override fun onCleared() {

diff --git a/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/scanner/view/BlinkyScanner.kt b/blinky/ui/src/main/java/no/nordicsemi/android/blinky/ui/scanner/view/BlinkyScanner.kt
@@ -2,19 +2,20 @@ package no.nordicsemi.android.blinky.ui.scanner.view
 
 import android.bluetooth.BluetoothDevice
 import android.os.ParcelUuid
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import no.nordicsemi.android.blinky.spec.BlinkySpec
 import no.nordicsemi.android.blinky.ui.R
 import no.nordicsemi.android.scanner.DeviceSelected
 import no.nordicsemi.android.scanner.ScannerScreen
-import no.nordicsemi.android.blinky.spec.BlinkySpec
 
 @Composable
 fun BlinkyScanner(
     onDeviceSelected: (BluetoothDevice, String?) -> Unit,
 ) {
     ScannerScreen(
-        title = stringResource(id = R.string.scanner_title),
+        title = { Text(stringResource(id = R.string.scanner_title)) },
         uuid = ParcelUuid(BlinkySpec.BLINKY_SERVICE_UUID),
         cancellable = false,
         onResult = { result ->

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,11 +3,12 @@ plugins {
     alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.compose.compiler) apply false
 
     // Nordic plugins are defined in /~https://github.com/NordicSemiconductor/Android-Gradle-Plugins
     alias(libs.plugins.nordic.application.compose) apply false
     alias(libs.plugins.nordic.library) apply false
     alias(libs.plugins.nordic.feature) apply false
-    alias(libs.plugins.nordic.kotlin) apply false
+    alias(libs.plugins.nordic.kotlin.android) apply false
     alias(libs.plugins.nordic.hilt) apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Thu Sep 28 13:02:20 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists