updated for Android versions, Kotlin version, and typo fixes in readme

Author: biozal

readme.md

@@ -7,10 +7,10 @@ Full documentation can be found on the [Couchbase Developer Portal](https://deve
 ## Prerequisites
 To run this prebuilt project, you will need:
 - Familiarity with building Android Apps with <a target="_blank" rel="noopener noreferrer" href="https://developer.android.com/kotlin">Kotlin</a>, <a target="_blank" rel="noopener noreferrer"  href="https://developer.android.com/jetpack/compose/mental-model">JetPack Compose</a>, and Android Studio 
-- [Android Studio Chimpmuck or above](https://developer.android.com/studio)
-- Android SDK installed and setup (> v.33.0.0)
-- Android Build Tools (> v.33.0.0)
-- Android device or emulator running API level 24 or above
+- [Android Studio Chipmuck or above](https://developer.android.com/studio)
+- Android SDK installed and setup (> v.34.0.0)
+- Android Build Tools (> v.34.0.0)
+- Android device or emulator running API level 26 or above
 - JDK 11 (now embedded into Android Studio 4+)
 
 ### Installing Couchbase Lite Framework
@@ -35,7 +35,7 @@ Then add the following to the <a target="_blank" rel="noopener noreferrer" href=
 dependencies {
     ...
 
-    implementation "com.couchbase.lite:couchbase-lite-android-ktx:3.0.2"
+    implementation "com.couchbase.lite:couchbase-lite-android-ktx:3.1.8"
 }
 ```
 

src/app/build.gradle.kts

@@ -18,7 +18,7 @@ android {
         // The following argument makes the Android Test Orchestrator run its
         // "pm clear" command after each test invocation. This command ensures
         // that the app's state is completely cleared between tests.
-        testInstrumentationRunnerArguments(mapOf("clearPackageData" to "true"))
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
 
         vectorDrawables {
             useSupportLibrary = true
@@ -48,7 +48,12 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     buildFeatures {
@@ -138,19 +143,19 @@ dependencies {
     implementation("io.insert-koin:koin-androidx-compose:$koinVersion")
 
     //couchbase lite for kotlin
-    implementation("com.couchbase.lite:couchbase-lite-android-ktx:3.1.6")
+    implementation("com.couchbase.lite:couchbase-lite-android-ktx:$couchbaseLiteVersion")
 
     //required because some flow APIs are still experimental (Card's onclick and cblite flow)
     implementation("androidx.annotation:annotation-experimental:$annotationExperimentalVersion")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
-    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")
+    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")
+    androidTestImplementation("androidx.test.ext:junit:1.2.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.0")
     androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeUiVersion")
-    androidTestImplementation("androidx.test:runner:1.5.2")
-    androidTestUtil("androidx.test:orchestrator:1.4.2")
+    androidTestImplementation("androidx.test:runner:1.6.0")
+    androidTestUtil("androidx.test:orchestrator:1.5.0")
     debugImplementation("androidx.compose.ui:ui-tooling:$composeUiVersion")
     debugImplementation("androidx.compose.ui:ui-test-manifest:$composeUiVersion")
 }

src/app/src/androidTest/java/com/couchbase/learningpath/DatabaseIntegrationTests.kt

@@ -13,12 +13,16 @@ import com.couchbase.learningpath.data.warehouse.WarehouseRepositoryDb
 import com.couchbase.learningpath.models.*
 import com.couchbase.learningpath.services.MockAuthenticationService
 import com.couchbase.lite.CouchbaseLiteException
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.test.runTest
+import kotlinx.serialization.ExperimentalSerializationApi
 import org.junit.*
 import org.junit.Assert.*
 import org.junit.runner.RunWith
 
+@ExperimentalSerializationApi
+@ExperimentalCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 class DatabaseIntegrationTests {
 
@@ -30,6 +34,7 @@ class DatabaseIntegrationTests {
     private lateinit var authenticationService: MockAuthenticationService
 
     //setup repositories
+    @OptIn(ExperimentalCoroutinesApi::class)
     private lateinit var projectRepository: ProjectRepositoryDb
     private lateinit var warehouseRepository: WarehouseRepositoryDb
     private lateinit var auditRepository: AuditRepositoryDb
@@ -82,6 +87,7 @@ class DatabaseIntegrationTests {
 
             authenticationService = MockAuthenticationService()
             val isAuth = authenticationService.authenticatedUser(user1.username, user1.password)
+            assertTrue(isAuth)
 
             //arrange repositories
             auditRepository = AuditRepositoryDb(authenticationService, databaseManager)

src/app/src/main/java/com/couchbase/learningpath/InventoryNavGraph.kt

@@ -22,6 +22,7 @@ import com.couchbase.learningpath.ui.login.LoginViewModel
 import com.couchbase.learningpath.ui.profile.UserProfileView
 import com.couchbase.learningpath.ui.profile.UserProfileViewModel
 import com.couchbase.learningpath.ui.project.*
+import org.koin.androidx.compose.koinViewModel
 
 /*
     Destinations used in routing
@@ -75,7 +76,7 @@ fun InventoryNavGraph(
             LoginView(onSuccessLogin = {
                 actions.navigateToProjectsListView()
             },
-                viewModel = getViewModel<LoginViewModel>())
+                viewModel = koinViewModel<LoginViewModel>())
         }
 
         composable(MainDestinations.PROJECT_LIST_ROUTE) {
@@ -85,13 +86,13 @@ fun InventoryNavGraph(
                 scope = scope,
                 navigateToProjectEditor = actions.navigateToProjectEditor,
                 navigateToAuditListByProject = actions.navigateToAuditListByProject,
-                viewModel = getViewModel<ProjectListViewModel>())
+                viewModel = koinViewModel<ProjectListViewModel>())
         }
 
         composable(MainDestinations.AUDIT_LIST_ROUTE_PATH){ backstackEntry ->
             val projectJson = backstackEntry.arguments?.getString(MainDestinations.AUDIT_LIST_KEY_ID)
             projectJson?.let {
-                val viewModel = getViewModel<AuditListViewModel>()
+                val viewModel = koinViewModel<AuditListViewModel>()
                 viewModel.projectJson = it
                 viewModel.getAudits()
                 AuditListView(
@@ -106,7 +107,7 @@ fun InventoryNavGraph(
 
         composable(MainDestinations.PROJECT_EDITOR_ROUTE_PATH ) { backstackEntry ->
             val projectId = backstackEntry.arguments?.getString(MainDestinations.PROJECT_KEY_ID)
-            val viewModel = getViewModel<ProjectEditorViewModel>()
+            val viewModel = koinViewModel<ProjectEditorViewModel>()
             if (projectId == null){
                 viewModel.projectId(UUID.randomUUID().toString())
             }
@@ -133,7 +134,7 @@ fun InventoryNavGraph(
             argAuditId?.let {
                 auditId = it
             }
-            val viewModel = getViewModel<AuditEditorViewModel>()
+            val viewModel = koinViewModel<AuditEditorViewModel>()
                 viewModel.getAudit(projectId = projectId, auditId = auditId)
                 viewModel.navigateToListSelection = actions.navigateToStockItemListSelector
 
@@ -146,7 +147,7 @@ fun InventoryNavGraph(
         composable(MainDestinations.LOCATION_ROUTE_PATH) {  backstackEntry ->
             val projectId = backstackEntry.arguments?.getString(MainDestinations.LOCATION_LIST_KEY_ID)
             projectId?.let {
-                val viewModel = getViewModel<WarehouseSelectionViewModel>()
+                val viewModel = koinViewModel<WarehouseSelectionViewModel>()
                 viewModel.projectId(it)
                 WarehouseSelectionView(
                     viewModel = viewModel,
@@ -169,8 +170,8 @@ fun InventoryNavGraph(
                 auditId = it
             }
 
-            val viewModel = getViewModel<StockItemSelectionViewModel>()
-            val auditEditorViewModel = getViewModel<AuditEditorViewModel>()
+            val viewModel = koinViewModel<StockItemSelectionViewModel>()
+            val auditEditorViewModel = koinViewModel<AuditEditorViewModel>()
 
             viewModel.projectId(projectId)
             viewModel.auditId(auditId)
@@ -192,13 +193,13 @@ fun InventoryNavGraph(
             UserProfileView(
                 openDrawer = openDrawer,
                 scaffoldState = scaffoldState,
-                viewModel = getViewModel<UserProfileViewModel>())
+                viewModel = koinViewModel<UserProfileViewModel>())
         }
 
         composable(MainDestinations.DEVELOPER_ROUTE){
             DeveloperView(
                 scaffoldState = scaffoldState,
-                viewModel = getViewModel<DeveloperViewModel>(),
+                viewModel = koinViewModel<DeveloperViewModel>(),
                 openDrawer = openDrawer,
                 navigateToDatabaseInfoView = actions.navigateToDeveloperDatabaseInfo)
         }
@@ -207,12 +208,12 @@ fun InventoryNavGraph(
             DevDatabaseInfoView(
                 scaffoldState = scaffoldState,
                 navigateUp = actions.upPress,
-                viewModel = getViewModel<DevDatabaseInfoViewModel>())
+                viewModel = koinViewModel<DevDatabaseInfoViewModel>())
         }
 
         composable(MainDestinations.REPLICATOR_ROUTE){
             ReplicatorView(
-                viewModel = getViewModel<ReplicatorViewModel>(),
+                viewModel = koinViewModel<ReplicatorViewModel>(),
                 openDrawer = openDrawer,
                 replicatorConfigNav = actions.navigateToReplicatorConfig,
                 scaffoldState = scaffoldState
@@ -221,7 +222,7 @@ fun InventoryNavGraph(
 
         composable(MainDestinations.REPLICATOR_SETTINGS_ROUTE){
             ReplicatorConfigView(
-                viewModel = getViewModel<ReplicatorConfigViewModel>(),
+                viewModel = koinViewModel<ReplicatorConfigViewModel>(),
                 navigateUp = actions.upPress,
                 scaffoldState = scaffoldState
             )

src/build.gradle.kts

@@ -2,37 +2,37 @@ buildscript {
     //Gradle docs on Extra properties
     //https://docs.gradle.org/current/userguide/kotlin_dsl.html#extra_properties
     val kotlinVersion by extra("1.9.22")
-    val coreKtx by extra("1.12.0")
+    val coreKtx by extra("1.13.1")
     val composeVersion by extra("1.3.1")
-    val composeUiVersion by extra("1.6.1")
-    val activityComposeVersion by extra("1.8.2")
-    val lifestyleRuntimeKtVersion by extra("2.7.0")
-    val koinVersion by extra("3.5.3")
-    val androidMaterialDesignVersion by extra("1.11.0")
-    val androidxNavigationComposeVersion by extra("2.5.0")
+    val composeUiVersion by extra("1.6.8")
+    val activityComposeVersion by extra("1.9.0")
+    val lifestyleRuntimeKtVersion by extra("2.8.2")
+    val koinVersion by extra("3.5.6")
+    val androidMaterialDesignVersion by extra("1.12.0")
+    val androidxNavigationComposeVersion by extra("2.7.7")
     val googleAccompanistVersion by extra("0.23.1")
-    val kotlinxSerializationJson by extra("1.6.2")
+    val kotlinxSerializationJson by extra("1.6.3")
     val constraintsComposeVersion by extra("1.0.1")
-    val annotationExperimentalVersion by extra("1.4.0")
+    val annotationExperimentalVersion by extra("1.4.1")
     val coroutinesTestsVersion by extra("1.6.3")
 
     //couchbase
-    val couchbaseLiteVersion by extra("3.1.3")
+    val couchbaseLiteVersion by extra("3.1.8")
 
 
     repositories {
-        maven(url = "https://mobile.maven.couchbase.com/maven2/dev/")
         google()
         mavenCentral()
+        maven(url = "https://mobile.maven.couchbase.com/maven2/dev/")
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}")
     }
 } // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id("com.android.application") version "8.3.0" apply false
-    id("com.android.library") version "8.3.0" apply false
+    id("com.android.application") version "8.4.2" apply false
+    id("com.android.library") version "8.4.2" apply false
     id("org.jetbrains.kotlin.android") version "1.9.22" apply false
     id("org.jetbrains.kotlin.jvm") version "1.9.22" apply false
     id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22"

src/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Apr 15 09:52:37 EDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME