[MWCore] Add Resource Tagging

android/build.gradle

@@ -8,8 +8,8 @@ buildscript {
 
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10'
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.10"
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.22"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.45'
         classpath deps.spotless
         classpath deps.kotlin_coveralls_plugin

android/deps.gradle

@@ -4,7 +4,7 @@
 // Entries in each section of this file should be sorted alphabetically.
 def sdk_versions = [:]
 sdk_versions.compile_sdk = 33
-sdk_versions.min_sdk = 24
+sdk_versions.min_sdk = 26
 sdk_versions.target_sdk = 33
 ext.sdk_versions = sdk_versions
 
@@ -15,14 +15,14 @@ def versions = [:]
 versions.activity = '1.2.1'
 versions.android_gradle_plugin = '7.1.2'
 versions.appcompat = '1.4.1'
-versions.atsl_core = '1.4.1-alpha04'
-versions.atsl_expresso = '3.5.0'
-versions.atsl_junit = '1.1.3'
-versions.atsl_rules = '1.4.0'
-versions.atsl_runner = '1.4.0'
+versions.atsl_core = '1.5.0'
+versions.atsl_expresso = '3.5.1'
+versions.atsl_junit = '1.1.5'
+versions.atsl_rules = '1.5.0'
+versions.atsl_runner = '1.5.2'
 versions.caffeine = '2.9.0'
 versions.constraint_layout = '1.1.3'
-versions.coroutines = '1.6.4'
+versions.coroutines = '1.7.3'
 versions.core = '1.7.0'
 versions.cql_engine = '1.3.14-SNAPSHOT'
 versions.desugar = '1.1.5'
@@ -31,13 +31,13 @@ versions.fhir_protos = '0.6.1'
 versions.guava = '28.2-android'
 versions.hapi_r4 = '5.3.0'
 versions.junit5_api = '5.9.3'
-versions.kotlin = '1.8.10'
+versions.kotlin = '1.8.22'
 versions.lifecycle = '2.2.0'
 versions.material = '1.5.0'
 versions.okhttp_logging_interceptor = '4.0.0'
 versions.recyclerview = '1.1.0'
 versions.retrofit = '2.7.2'
-versions.robolectric = '4.9-alpha-1'
+versions.robolectric = '4.9.2'
 versions.room = '2.4.2'
 versions.spotless = '5.11.0'
 versions.truth = '1.0.1'
@@ -48,11 +48,11 @@ versions.jacoco_tool = '0.8.7'
 versions.ktlint = '0.41.0'
 versions.joda_time = '2.10.5'
 versions.timber = '4.7.1'
-versions.mockk = '1.12.4'
+versions.mockk = '1.13.5'
 versions.dokka = '1.5.0'
-versions.androidx_test = '2.1.0'
+versions.androidx_test = '2.2.0'
 versions.accompanist_swiperefresh = '0.26.4-beta'
-versions.compose = '1.3.3'
+versions.compose = '1.4.3'
 ext.versions = versions
 
 def deps = [:]

android/engine/build.gradle

@@ -48,7 +48,7 @@ android {
         viewBinding true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.2'
+        kotlinCompilerExtensionVersion '1.4.8'
     }
 
     //CQL
@@ -87,6 +87,23 @@ android {
             includeAndroidResources = true
             returnDefaultValues = true
             all {
+                testLogging {
+                    // set options for log level LIFECYCLE
+                    events "failed"
+                    exceptionFormat "full"
+
+                    // set options for log level DEBUG
+                    debug {
+                        events "started", "skipped", "failed"
+                        exceptionFormat "full"
+                    }
+
+
+                    // remove standard output/error logging from --info builds
+                    // by assigning only 'failed' and 'skipped' events
+                    info.events = ["failed", "skipped"]
+                }
+
                 minHeapSize = "4608m"
                 maxHeapSize = "4608m"
                 beforeTest { testDescriptor ->
@@ -183,7 +200,7 @@ dependencies {
     api("androidx.work:work-runtime-ktx:2.8.0")
     testApi 'androidx.work:work-testing:2.8.0'
 
-    def coroutineVersion = '1.6.4'
+    def coroutineVersion = '1.7.3'
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion")
     api("org.smartregister:contrib-barcode:0.1.0-beta3-preview5-SNAPSHOT"){
@@ -218,7 +235,7 @@ dependencies {
         exclude group: 'com.google.android.fhir', module: 'common'
     }
 
-    api 'com.google.code.gson:gson:2.9.0'
+    api 'com.google.code.gson:gson:2.9.1'
     api 'com.jakewharton.timber:timber:5.0.1'
 
     def retrofitVersion = '2.9.0'
@@ -243,6 +260,7 @@ dependencies {
     testRuntimeOnly deps.junit5_engine
     testRuntimeOnly deps.junit5_engine_vintage
     testImplementation deps.robolectric
+    testImplementation deps.atsl.core
     testImplementation deps.atsl.ext_junit
     testImplementation deps.atsl.ext_junit_ktx
     testImplementation deps.coroutines.test
@@ -254,7 +272,7 @@ dependencies {
     androidTestImplementation deps.atsl.ext_junit
     androidTestImplementation deps.atsl.espresso
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation deps.atsl.ext_junit
     androidTestImplementation "androidx.test.espresso:espresso-core:$versions.atsl_expresso"
     implementation deps.work.runtime
     testImplementation group: 'org.json', name: 'json', version: '20210307'
@@ -269,4 +287,4 @@ kapt {
 
 hilt {
     enableAggregatingTask = true
-}
+}

android/engine/src/main/AndroidManifest.xml

@@ -4,19 +4,12 @@
     package="org.smartregister.fhircore.engine">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission
-        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-        android:maxSdkVersion="21" />
-    <uses-permission
-        android:name="android.permission.GET_ACCOUNTS"
-        android:maxSdkVersion="21" />
-    <uses-permission
-        android:name="android.permission.MANAGE_ACCOUNTS"
-        android:maxSdkVersion="21" />
-    <uses-permission
-        android:name="android.permission.USE_CREDENTIALS"
-        android:maxSdkVersion="21" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
 

android/engine/src/main/assets/configs/default/config_application.json

@@ -8,5 +8,6 @@
   ],
   "applicationName": "Sample App",
   "appLogoIconResourceFile": "ic_launcher",
-  "count": "100"
+  "count": "100",
+  "syncStrategies": ["Organization", "Location", "CareTeam", "Practitioner"]
 }