Skip to content

Commit 2ba3a6b

Browse files
Merge pull request #57 from NordicPlayground/mock_fix
Mock fix
2 parents 2c6f449 + 358a5ee commit 2ba3a6b

File tree

16 files changed

+21
-287
lines changed

16 files changed

+21
-287
lines changed

.github/workflows/deploy-to-nexus.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@ jobs:
3131
echo "${{ secrets.GPG_FILE }}" > sec.gpg.asc
3232
gpg -d --passphrase "${{ secrets.GPG_FILE_PSWD }}" --batch sec.gpg.asc > sec.gpg
3333
fastlane deployNexus
34+
- name: Nexus release
35+
uses: Propromp/nexus-release@1
36+
with:
37+
groupId: "no.nordicsemi.android.common" # Group id of the repository
38+
nexusUsername: ${{ secrets.OSSR_USERNAME }} # User name of the nexus repository manager
39+
nexusPassword: ${{ secrets.OSSR_PASSWORD }} # Password of the nexus repository manager

navigation/src/main/java/no/nordicsemi/android/common/navigation/di/NavigationModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import no.nordicsemi.android.common.navigation.internal.NavigationManager
4242

4343
@Module
4444
@InstallIn(ActivityRetainedComponent::class)
45-
internal interface NavigationModule {
45+
interface NavigationModule {
4646

4747
@Binds
4848
fun bindNavigator(navigator: NavigationManager): Navigator

navigation/src/main/java/no/nordicsemi/android/common/navigation/internal/NavigationManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import javax.inject.Inject
5959
* result.
6060
*/
6161
@ActivityRetainedScoped
62-
internal class NavigationManager @Inject constructor(
62+
class NavigationManager @Inject constructor(
6363
@ApplicationContext private val context: Context,
6464
) : Navigator {
6565
/** The navigation events class. */

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencyResolutionManagement {
4949
}
5050
versionCatalogs {
5151
create("libs") {
52-
from("no.nordicsemi.android.gradle:version-catalog:1.5.10")
52+
from("no.nordicsemi.android.gradle:version-catalog:1.6.5")
5353
}
5454
}
5555
}

uilogger/src/main/java/no/nordicsemi/android/common/logger/LoggerLauncher.kt

Lines changed: 0 additions & 69 deletions
This file was deleted.

uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicBlekLogger.kt

Lines changed: 0 additions & 59 deletions
This file was deleted.

uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicLogger.kt

Lines changed: 0 additions & 89 deletions
This file was deleted.

uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicLoggerFactory.kt

Lines changed: 0 additions & 54 deletions
This file was deleted.

uilogger/src/main/java/no/nordicsemi/android/common/logger/view/LoggerAppBarIcon.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ fun LoggerAppBarIcon(
4646
contentDescription = stringResource(id = R.string.open_logger),
4747
onClick = onClick
4848
)
49-
}
49+
}

uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import androidx.compose.runtime.setValue
4040
import androidx.compose.ui.res.stringResource
4141
import no.nordicsemi.android.common.ui.scanner.main.DeviceListItem
4242
import no.nordicsemi.android.common.ui.scanner.view.ScannerAppBar
43-
import no.nordicsemi.android.kotlin.ble.scanner.data.BleScanResults
43+
import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
4444

4545
@Composable
4646
fun ScannerScreen(

0 commit comments

Comments
 (0)