diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt index 6a2bbf0fe8..84c96499ae 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt @@ -27,9 +27,9 @@ import ca.uhn.fhir.rest.gclient.ReferenceClientParam import ca.uhn.fhir.rest.gclient.StringClientParam import ca.uhn.fhir.rest.gclient.TokenClientParam import com.google.android.fhir.FhirEngine +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.db.ResourceNotFoundException import com.google.android.fhir.get -import com.google.android.fhir.logicalId import com.google.android.fhir.search.Search import com.google.android.fhir.search.filter.ReferenceParamFilterCriterion import com.google.android.fhir.search.filter.TokenParamFilterCriterion diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDao.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDao.kt index 363aec0f37..24270c0215 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDao.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDao.kt @@ -17,7 +17,7 @@ package org.smartregister.fhircore.engine.p2p.dao import com.google.android.fhir.FhirEngine -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import java.util.TreeSet import javax.inject.Inject import kotlinx.coroutines.runBlocking diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDao.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDao.kt index dadd0af146..f6a0c18123 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDao.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDao.kt @@ -17,7 +17,7 @@ package org.smartregister.fhircore.engine.p2p.dao import com.google.android.fhir.FhirEngine -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import java.util.TreeSet import javax.inject.Inject import kotlinx.coroutines.runBlocking diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/ResourceDataRulesExecutor.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/ResourceDataRulesExecutor.kt index b078f4c9c7..fce7444a95 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/ResourceDataRulesExecutor.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/ResourceDataRulesExecutor.kt @@ -19,7 +19,7 @@ package org.smartregister.fhircore.engine.rulesengine import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.snapshots.SnapshotStateList import androidx.compose.runtime.snapshots.SnapshotStateMap -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import javax.inject.Inject import org.hl7.fhir.r4.model.Resource import org.jeasy.rules.api.Facts diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt index 94ac19d590..f9171eec35 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt @@ -17,7 +17,7 @@ package org.smartregister.fhircore.engine.rulesengine import android.content.Context -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.search.Order import dagger.hilt.android.qualifiers.ApplicationContext import java.math.BigDecimal diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt index 50655152d2..f81fc7b332 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt @@ -21,8 +21,8 @@ import androidx.annotation.VisibleForTesting import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.util.TerserUtil import com.google.android.fhir.FhirEngine +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.get -import com.google.android.fhir.logicalId import com.google.android.fhir.search.search import dagger.hilt.android.qualifiers.ApplicationContext import java.util.Date diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt index 30db2d7b83..57228e3153 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt @@ -18,8 +18,8 @@ package org.smartregister.fhircore.engine.task import android.content.Context import ca.uhn.fhir.rest.param.ParamPrefixEnum +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.get -import com.google.android.fhir.logicalId import com.google.android.fhir.search.filter.TokenParamFilterCriterion import com.google.android.fhir.search.search import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt index 69892106ed..8530d6dc6f 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt @@ -17,8 +17,8 @@ package org.smartregister.fhircore.engine.util.extension import com.google.android.fhir.datacapture.extensions.asStringValue +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.datacapture.extensions.targetStructureMap -import com.google.android.fhir.logicalId import java.util.Locale import org.hl7.fhir.r4.model.BooleanType import org.hl7.fhir.r4.model.Bundle diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt index b4414a662c..7b195477f0 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt @@ -21,8 +21,8 @@ import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.parser.IParser import ca.uhn.fhir.rest.gclient.ReferenceClientParam import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.get -import com.google.android.fhir.logicalId import com.google.android.fhir.search.search import java.time.Duration import java.time.temporal.ChronoUnit diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/FhirExtractionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/FhirExtractionTest.kt index 1de24932db..79cc9d7842 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/FhirExtractionTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/FhirExtractionTest.kt @@ -19,10 +19,10 @@ package org.smartregister.fhircore.engine import androidx.work.WorkManager import androidx.work.WorkRequest import com.google.android.fhir.FhirEngine +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.datacapture.mapping.ResourceMapper import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext import com.google.android.fhir.get -import com.google.android.fhir.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import io.mockk.coEvery diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt index 9a74923aa6..8e55966a5c 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt @@ -22,8 +22,8 @@ import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.parser.IParser import com.google.android.fhir.FhirEngine import com.google.android.fhir.SearchResult +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.db.ResourceNotFoundException -import com.google.android.fhir.logicalId import com.google.android.fhir.search.Search import com.google.common.reflect.TypeToken import dagger.hilt.android.testing.HiltAndroidRule diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt index 2611105857..3de2d89ca7 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt @@ -22,9 +22,9 @@ import ca.uhn.fhir.parser.IParser import ca.uhn.fhir.rest.param.ParamPrefixEnum import com.google.android.fhir.FhirEngine import com.google.android.fhir.SearchResult +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.db.ResourceNotFoundException import com.google.android.fhir.get -import com.google.android.fhir.logicalId import com.google.gson.Gson import dagger.hilt.android.testing.BindValue import dagger.hilt.android.testing.HiltAndroidRule diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt index b30981020a..f9e14adde6 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.state.ToggleableState import androidx.test.core.app.ApplicationProvider import ca.uhn.fhir.parser.IParser import com.google.android.fhir.FhirEngine -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.search.Search import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/remote/shared/FhirResourceConverterTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/remote/shared/FhirResourceConverterTest.kt index dadf2e8968..ae42d5598e 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/remote/shared/FhirResourceConverterTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/remote/shared/FhirResourceConverterTest.kt @@ -18,7 +18,7 @@ package org.smartregister.fhircore.engine.data.remote.shared import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.context.FhirVersionEnum -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import io.mockk.MockKAnnotations import io.mockk.impl.annotations.MockK import java.lang.reflect.Type diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDaoTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDaoTest.kt index f4fca47547..bd6352b2cc 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDaoTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PReceiverTransferDaoTest.kt @@ -20,7 +20,7 @@ import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.context.FhirVersionEnum import ca.uhn.fhir.parser.IParser import com.google.android.fhir.FhirEngine -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import io.mockk.coEvery import io.mockk.coVerify import io.mockk.just diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDaoTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDaoTest.kt index 544c0c71a2..ec2dde0629 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDaoTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/P2PSenderTransferDaoTest.kt @@ -21,7 +21,7 @@ import ca.uhn.fhir.context.FhirVersionEnum import ca.uhn.fhir.parser.IParser import com.google.android.fhir.FhirEngine import com.google.android.fhir.SearchResult -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import io.mockk.coEvery import io.mockk.coVerify import io.mockk.mockk diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt index cbbe276f3f..0048d0330d 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt @@ -17,7 +17,7 @@ package org.smartregister.fhircore.engine.rulesengine import androidx.test.core.app.ApplicationProvider -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import io.mockk.every diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt index eae4077596..6b6a4a1e2d 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt @@ -24,9 +24,9 @@ import ca.uhn.fhir.parser.IParser import ca.uhn.fhir.rest.gclient.ReferenceClientParam import com.google.android.fhir.FhirEngine import com.google.android.fhir.SearchResult +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.get import com.google.android.fhir.knowledge.KnowledgeManager -import com.google.android.fhir.logicalId import com.google.android.fhir.search.Search import com.google.android.fhir.search.search import com.google.android.fhir.workflow.FhirOperator diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/multiselect/TreeBuilderTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/multiselect/TreeBuilderTest.kt index ed724f3101..04f0cc6b8c 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/multiselect/TreeBuilderTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/multiselect/TreeBuilderTest.kt @@ -19,7 +19,7 @@ package org.smartregister.fhircore.engine.ui.multiselect import android.app.Application import androidx.test.core.app.ApplicationProvider import ca.uhn.fhir.context.FhirContext -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import javax.inject.Inject diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtensionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtensionTest.kt index b11f94f4cd..1061fd6d80 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtensionTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtensionTest.kt @@ -21,8 +21,8 @@ import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.context.FhirVersionEnum import com.google.android.fhir.FhirEngine import com.google.android.fhir.SearchResult +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.knowledge.KnowledgeManager -import com.google.android.fhir.logicalId import com.google.android.fhir.workflow.FhirOperator import io.mockk.coEvery import io.mockk.coVerify diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/MeasureExtensionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/MeasureExtensionTest.kt index e1af5b6a20..c8681835c5 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/MeasureExtensionTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/MeasureExtensionTest.kt @@ -17,7 +17,7 @@ package org.smartregister.fhircore.engine.util.extension import com.google.android.fhir.FhirEngine -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import io.mockk.coEvery diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt index d5a1032d2f..748b4e02ec 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt @@ -21,7 +21,7 @@ import androidx.test.core.app.ApplicationProvider import ca.uhn.fhir.context.FhirContext import ca.uhn.fhir.context.FhirVersionEnum import ca.uhn.fhir.parser.IParser -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import io.mockk.coEvery diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 552f6126ca..d7e6eb8574 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -16,14 +16,14 @@ android-x-test= "1.5.2" core-testing = "2.2.0" coverallsGradlePlugin = "2.12.0" cqfFhirCr = "3.0.0-PRE9" -data-capture = "1.1.0-preview8-SNAPSHOT" +data-capture = "1.1.0-preview10-SNAPSHOT" datastore = "1.0.0" desugar-jdk-libs = "2.0.4" dokkaBase = "1.8.20" easy-rules-jexl = "4.1.0" espresso-core = "3.5.1" fhir-common-utils = "1.0.0-SNAPSHOT" -fhir-engine = "1.0.0-preview7.1-SNAPSHOT" +fhir-engine = "1.0.0-preview9-SNAPSHOT" foundation = "1.6.3" fragment-ktx = "1.6.2" glide = "4.16.0" diff --git a/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/Faker.kt b/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/Faker.kt index a110197a3b..1350636997 100644 --- a/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/Faker.kt +++ b/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/Faker.kt @@ -23,9 +23,9 @@ import com.google.android.fhir.LocalChange import com.google.android.fhir.SearchResult import com.google.android.fhir.search.Search import com.google.android.fhir.sync.ConflictResolver -import com.google.android.fhir.sync.upload.LocalChangesFetchMode import com.google.android.fhir.sync.upload.SyncUploadProgress import com.google.android.fhir.sync.upload.UploadRequestResult +import com.google.android.fhir.sync.upload.UploadStrategy import com.google.gson.Gson import dagger.hilt.android.testing.HiltTestApplication import java.time.OffsetDateTime @@ -102,7 +102,7 @@ object Faker { } override suspend fun syncUpload( - localChangesFetchMode: LocalChangesFetchMode, + uploadStrategy: UploadStrategy, upload: suspend (List) -> Flow, ): Flow { return flowOf() diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/data/report/measure/MeasureReportRepository.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/data/report/measure/MeasureReportRepository.kt index de5361c601..a50b491869 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/data/report/measure/MeasureReportRepository.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/data/report/measure/MeasureReportRepository.kt @@ -19,8 +19,8 @@ package org.smartregister.fhircore.quest.data.report.measure import android.content.Context import ca.uhn.fhir.parser.IParser import com.google.android.fhir.FhirEngine +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.knowledge.KnowledgeManager -import com.google.android.fhir.logicalId import com.google.android.fhir.search.search import com.google.android.fhir.workflow.FhirOperator import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/multiselect/MultiSelectViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/multiselect/MultiSelectViewModel.kt index 279aa8bbc5..cec786c901 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/multiselect/MultiSelectViewModel.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/multiselect/MultiSelectViewModel.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.state.ToggleableState import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.lifecycle.HiltViewModel import java.util.LinkedList import javax.inject.Inject diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModel.kt index d5bd1d4f62..680094ebb7 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModel.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModel.kt @@ -22,8 +22,8 @@ import androidx.compose.runtime.snapshots.SnapshotStateList import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.db.ResourceNotFoundException -import com.google.android.fhir.logicalId import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt index 1b397db53f..dd5a10c2ad 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt @@ -23,13 +23,13 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import ca.uhn.fhir.context.FhirContext +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.datacapture.mapping.ResourceMapper import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext import com.google.android.fhir.datacapture.validation.NotValidated import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator import com.google.android.fhir.datacapture.validation.Valid import com.google.android.fhir.db.ResourceNotFoundException -import com.google.android.fhir.logicalId import com.google.android.fhir.search.Search import com.google.android.fhir.search.filter.TokenParamFilterCriterion import com.google.android.fhir.search.search diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/data/DataMigrationTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/data/DataMigrationTest.kt index db0eb41797..1aafa14d4f 100644 --- a/android/quest/src/test/java/org/smartregister/fhircore/quest/data/DataMigrationTest.kt +++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/data/DataMigrationTest.kt @@ -16,7 +16,7 @@ package org.smartregister.fhircore.quest.data -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import java.util.Date diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModelTest.kt index 69421858fd..9c63ea2390 100644 --- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModelTest.kt +++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/profile/ProfileViewModelTest.kt @@ -23,7 +23,7 @@ import androidx.navigation.NavController import androidx.test.core.app.ApplicationProvider import androidx.test.platform.app.InstrumentationRegistry import ca.uhn.fhir.parser.IParser -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import io.mockk.coEvery diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt index 28d147f2a5..0a86a419fa 100644 --- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt +++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt @@ -21,10 +21,10 @@ import androidx.test.core.app.ApplicationProvider import ca.uhn.fhir.parser.IParser import com.google.android.fhir.FhirEngine import com.google.android.fhir.SearchResult +import com.google.android.fhir.datacapture.extensions.logicalId import com.google.android.fhir.datacapture.mapping.ResourceMapper import com.google.android.fhir.db.ResourceNotFoundException import com.google.android.fhir.get -import com.google.android.fhir.logicalId import com.google.android.fhir.search.Search import com.google.android.fhir.workflow.FhirOperator import dagger.hilt.android.testing.HiltAndroidRule diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt index 5a6c03fcd2..99aece97f0 100644 --- a/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt +++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt @@ -25,7 +25,7 @@ import android.widget.Toast import androidx.navigation.NavController import androidx.navigation.NavDestination import androidx.navigation.NavOptions -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import io.mockk.every diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/util/mappers/MeasureReportPatientViewDataMapperTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/util/mappers/MeasureReportPatientViewDataMapperTest.kt index 12a5100186..10b8bd462d 100644 --- a/android/quest/src/test/java/org/smartregister/fhircore/quest/util/mappers/MeasureReportPatientViewDataMapperTest.kt +++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/util/mappers/MeasureReportPatientViewDataMapperTest.kt @@ -16,7 +16,7 @@ package org.smartregister.fhircore.quest.util.mappers -import com.google.android.fhir.logicalId +import com.google.android.fhir.datacapture.extensions.logicalId import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import javax.inject.Inject