diff --git a/app/build.gradle b/app/build.gradle index 11556394cd..d94df5f5f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -181,7 +181,7 @@ dependencies { implementation project(':core:graphview') implementation project(':core:interfaces') implementation project(':core:libraries') - implementation project(':core:ns-sdk') + implementation project(':core:nssdk') implementation project(':core:utils') implementation project(':core:ui') implementation project(':core:validators') diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt deleted file mode 100644 index c2d26f81e2..0000000000 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt +++ /dev/null @@ -1,6 +0,0 @@ -package info.nightscout.sdk.mapper - -import info.nightscout.sdk.localmodel.Storage -import info.nightscout.sdk.remotemodel.RemoteStorage - -internal fun RemoteStorage.toLocal() = Storage(storage = storage, version = version) diff --git a/core/ns-sdk/.gitignore b/core/nssdk/.gitignore similarity index 100% rename from core/ns-sdk/.gitignore rename to core/nssdk/.gitignore diff --git a/core/ns-sdk/build.gradle b/core/nssdk/build.gradle similarity index 97% rename from core/ns-sdk/build.gradle rename to core/nssdk/build.gradle index 7678df7245..1a9d40e8db 100644 --- a/core/ns-sdk/build.gradle +++ b/core/nssdk/build.gradle @@ -10,7 +10,7 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" android { - namespace 'info.nightscout.sdk' + namespace 'app.aaps.core.nssdk' } dependencies { diff --git a/core/ns-sdk/proguard-rules.pro b/core/nssdk/proguard-rules.pro similarity index 100% rename from core/ns-sdk/proguard-rules.pro rename to core/nssdk/proguard-rules.pro diff --git a/core/ns-sdk/src/main/AndroidManifest.xml b/core/nssdk/src/main/AndroidManifest.xml similarity index 100% rename from core/ns-sdk/src/main/AndroidManifest.xml rename to core/nssdk/src/main/AndroidManifest.xml diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidCallbackClientImpl.kt similarity index 80% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidCallbackClientImpl.kt index 1da0a47e9b..e971cd57e2 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidCallbackClientImpl.kt @@ -1,8 +1,8 @@ -package info.nightscout.sdk +package app.aaps.core.nssdk -import info.nightscout.sdk.interfaces.NSAndroidCallbackClient -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.localmodel.Status +import app.aaps.core.nssdk.interfaces.NSAndroidCallbackClient +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.localmodel.Status import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidClientImpl.kt similarity index 93% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidClientImpl.kt index 1f07e76a17..6c28f19b63 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidClientImpl.kt @@ -1,37 +1,37 @@ -package info.nightscout.sdk +package app.aaps.core.nssdk import android.content.Context import com.google.gson.JsonParser -import info.nightscout.sdk.exceptions.DateHeaderOutOfToleranceException -import info.nightscout.sdk.exceptions.InvalidAccessTokenException -import info.nightscout.sdk.exceptions.InvalidFormatNightscoutException -import info.nightscout.sdk.exceptions.InvalidParameterNightscoutException -import info.nightscout.sdk.exceptions.UnknownResponseNightscoutException -import info.nightscout.sdk.exceptions.UnsuccessfullNightscoutException -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.localmodel.Status -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus -import info.nightscout.sdk.localmodel.entry.NSSgvV3 -import info.nightscout.sdk.localmodel.food.NSFood -import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse -import info.nightscout.sdk.localmodel.treatment.NSTreatment -import info.nightscout.sdk.mapper.toLocal -import info.nightscout.sdk.mapper.toNSDeviceStatus -import info.nightscout.sdk.mapper.toNSFood -import info.nightscout.sdk.mapper.toRemoteDeviceStatus -import info.nightscout.sdk.mapper.toRemoteEntry -import info.nightscout.sdk.mapper.toRemoteFood -import info.nightscout.sdk.mapper.toRemoteTreatment -import info.nightscout.sdk.mapper.toSgv -import info.nightscout.sdk.mapper.toTreatment -import info.nightscout.sdk.networking.NetworkStackBuilder -import info.nightscout.sdk.remotemodel.LastModified -import info.nightscout.sdk.remotemodel.RemoteDeviceStatus -import info.nightscout.sdk.remotemodel.RemoteEntry -import info.nightscout.sdk.remotemodel.RemoteFood -import info.nightscout.sdk.remotemodel.RemoteTreatment -import info.nightscout.sdk.utils.retry -import info.nightscout.sdk.utils.toNotNull +import app.aaps.core.nssdk.exceptions.DateHeaderOutOfToleranceException +import app.aaps.core.nssdk.exceptions.InvalidAccessTokenException +import app.aaps.core.nssdk.exceptions.InvalidFormatNightscoutException +import app.aaps.core.nssdk.exceptions.InvalidParameterNightscoutException +import app.aaps.core.nssdk.exceptions.UnknownResponseNightscoutException +import app.aaps.core.nssdk.exceptions.UnsuccessfullNightscoutException +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.localmodel.Status +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.localmodel.food.NSFood +import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment +import app.aaps.core.nssdk.mapper.toLocal +import app.aaps.core.nssdk.mapper.toNSDeviceStatus +import app.aaps.core.nssdk.mapper.toNSFood +import app.aaps.core.nssdk.mapper.toRemoteDeviceStatus +import app.aaps.core.nssdk.mapper.toRemoteEntry +import app.aaps.core.nssdk.mapper.toRemoteFood +import app.aaps.core.nssdk.mapper.toRemoteTreatment +import app.aaps.core.nssdk.mapper.toSgv +import app.aaps.core.nssdk.mapper.toTreatment +import app.aaps.core.nssdk.networking.NetworkStackBuilder +import app.aaps.core.nssdk.remotemodel.LastModified +import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus +import app.aaps.core.nssdk.remotemodel.RemoteEntry +import app.aaps.core.nssdk.remotemodel.RemoteFood +import app.aaps.core.nssdk.remotemodel.RemoteTreatment +import app.aaps.core.nssdk.utils.retry +import app.aaps.core.nssdk.utils.toNotNull import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidRxClientImpl.kt similarity index 64% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidRxClientImpl.kt index 617af7d803..57f8ae0568 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/NSAndroidRxClientImpl.kt @@ -1,9 +1,9 @@ -package info.nightscout.sdk +package app.aaps.core.nssdk -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.interfaces.NSAndroidRxClient -import info.nightscout.sdk.localmodel.Status -import info.nightscout.sdk.remotemodel.LastModified +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.interfaces.NSAndroidRxClient +import app.aaps.core.nssdk.localmodel.Status +import app.aaps.core.nssdk.remotemodel.LastModified import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.rx3.rxSingle diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/DateHeaderOutOfToleranceException.kt similarity index 87% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/DateHeaderOutOfToleranceException.kt index 2cfcdc1bf6..3682dd65be 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/DateHeaderOutOfToleranceException.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions /** * Will be thrown if the server responds with 401 UNAUTHORIZED due to the Date Header being off diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidAccessTokenException.kt similarity index 60% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidAccessTokenException.kt index 6ae3735741..2fc0ccd4ca 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidAccessTokenException.kt @@ -1,3 +1,3 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions class InvalidAccessTokenException : NightscoutException() diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidFormatNightscoutException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidFormatNightscoutException.kt similarity index 88% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidFormatNightscoutException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidFormatNightscoutException.kt index f59a7ae4e6..bf9d55c28a 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidFormatNightscoutException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidFormatNightscoutException.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions @Suppress("unused") class InvalidFormatNightscoutException : NightscoutException { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidParameterNightscoutException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidParameterNightscoutException.kt similarity index 88% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidParameterNightscoutException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidParameterNightscoutException.kt index de8e25b8f0..155530aaad 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidParameterNightscoutException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/InvalidParameterNightscoutException.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions @Suppress("unused") class InvalidParameterNightscoutException : NightscoutException { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/NightscoutException.kt similarity index 87% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/NightscoutException.kt index ff7817e277..3975fa2ce6 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/NightscoutException.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions import java.io.IOException diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnknownResponseNightscoutException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnknownResponseNightscoutException.kt similarity index 62% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnknownResponseNightscoutException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnknownResponseNightscoutException.kt index f706d499b9..f676bdaec6 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnknownResponseNightscoutException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnknownResponseNightscoutException.kt @@ -1,3 +1,3 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions class UnknownResponseNightscoutException : NightscoutException() diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnsuccessfullNightscoutException.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnsuccessfullNightscoutException.kt similarity index 87% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnsuccessfullNightscoutException.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnsuccessfullNightscoutException.kt index 4ed4be646e..b342c109c5 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnsuccessfullNightscoutException.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/exceptions/UnsuccessfullNightscoutException.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.exceptions +package app.aaps.core.nssdk.exceptions class UnsuccessfullNightscoutException : NightscoutException { constructor() : super() diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidCallbackClient.kt similarity index 83% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidCallbackClient.kt index a21b12e964..68bd78c994 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidCallbackClient.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.interfaces +package app.aaps.core.nssdk.interfaces -import info.nightscout.sdk.localmodel.Status +import app.aaps.core.nssdk.localmodel.Status import kotlinx.coroutines.Job interface NSAndroidCallbackClient { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidClient.kt similarity index 80% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidClient.kt index d61519452b..4473073490 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidClient.kt @@ -1,12 +1,12 @@ -package info.nightscout.sdk.interfaces +package app.aaps.core.nssdk.interfaces -import info.nightscout.sdk.localmodel.Status -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus -import info.nightscout.sdk.localmodel.entry.NSSgvV3 -import info.nightscout.sdk.localmodel.food.NSFood -import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse -import info.nightscout.sdk.localmodel.treatment.NSTreatment -import info.nightscout.sdk.remotemodel.LastModified +import app.aaps.core.nssdk.localmodel.Status +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.localmodel.food.NSFood +import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment +import app.aaps.core.nssdk.remotemodel.LastModified import org.json.JSONObject interface NSAndroidClient { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidRxClient.kt similarity index 59% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidRxClient.kt index 503fa9f09d..94ae49f1d6 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/NSAndroidRxClient.kt @@ -1,7 +1,7 @@ -package info.nightscout.sdk.interfaces +package app.aaps.core.nssdk.interfaces -import info.nightscout.sdk.localmodel.Status -import info.nightscout.sdk.remotemodel.LastModified +import app.aaps.core.nssdk.localmodel.Status +import app.aaps.core.nssdk.remotemodel.LastModified import io.reactivex.rxjava3.core.Single interface NSAndroidRxClient { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/RunningConfiguration.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/RunningConfiguration.kt similarity index 69% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/RunningConfiguration.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/RunningConfiguration.kt index cc5600a7d9..15f021bdae 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/RunningConfiguration.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/interfaces/RunningConfiguration.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.interfaces +package app.aaps.core.nssdk.interfaces -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import org.json.JSONObject interface RunningConfiguration { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermission.kt similarity index 85% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermission.kt index e84e3f3faf..df83ecb989 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermission.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel +package app.aaps.core.nssdk.localmodel data class ApiPermission( val create: Boolean, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermissions.kt similarity index 92% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermissions.kt index 5eaa012fde..84266d0155 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/ApiPermissions.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel +package app.aaps.core.nssdk.localmodel data class ApiPermissions( val deviceStatus: ApiPermission, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Status.kt similarity index 80% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Status.kt index 12a497a5d1..c7f1c064f0 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Status.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel +package app.aaps.core.nssdk.localmodel data class Status( val version: String, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Storage.kt similarity index 61% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Storage.kt index f8b6ce2224..ec14dc1d58 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/Storage.kt @@ -1,3 +1,3 @@ -package info.nightscout.sdk.localmodel +package app.aaps.core.nssdk.localmodel data class Storage(val storage: String, val version: String) diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/devicestatus/NSDeviceStatus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/devicestatus/NSDeviceStatus.kt similarity index 98% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/devicestatus/NSDeviceStatus.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/devicestatus/NSDeviceStatus.kt index 6079b772c8..c2d2631c9d 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/devicestatus/NSDeviceStatus.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/devicestatus/NSDeviceStatus.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.devicestatus +package app.aaps.core.nssdk.localmodel.devicestatus import com.google.gson.annotations.SerializedName import kotlinx.serialization.Contextual diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/Direction.kt similarity index 97% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/Direction.kt index 9a02ac5f17..bd49d990b2 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/Direction.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.entry +package app.aaps.core.nssdk.localmodel.entry enum class Direction(val nsName: String, val txtIcon: String) { TRIPLE_DOWN("TripleDown", "\u290B"), // ⤋ diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NSSgvV3.kt similarity index 92% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NSSgvV3.kt index 48ad23ff9a..f78a1d9df3 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NSSgvV3.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.entry +package app.aaps.core.nssdk.localmodel.entry data class NSSgvV3( var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NsUnits.kt similarity index 82% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NsUnits.kt index 8498c390ac..527bbb091b 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/entry/NsUnits.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.entry +package app.aaps.core.nssdk.localmodel.entry enum class NsUnits(val value: String) { MG_DL("mg/dl"), diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/food/NSFood.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/food/NSFood.kt similarity index 89% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/food/NSFood.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/food/NSFood.kt index f663786088..79cd19c5a1 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/food/NSFood.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/food/NSFood.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.food +package app.aaps.core.nssdk.localmodel.food -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSFood( val date: Long, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/CreateUpdateResponse.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/CreateUpdateResponse.kt similarity index 83% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/CreateUpdateResponse.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/CreateUpdateResponse.kt index 7d8e3039a9..661e7b9a90 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/CreateUpdateResponse.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/CreateUpdateResponse.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment class CreateUpdateResponse( val response: Int, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/EventType.kt similarity index 97% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/EventType.kt index f5b912ada0..75235ef784 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/EventType.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment import com.google.gson.annotations.SerializedName diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/GlucoseType.kt similarity index 79% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/GlucoseType.kt index bec75d0161..4189439090 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/GlucoseType.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment import com.google.gson.annotations.SerializedName diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt similarity index 90% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt index 82a76fac3c..c826ecb728 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSBolus( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt similarity index 88% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt index 134fd59782..5c2f29bfca 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSBolusWizard( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt similarity index 87% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt index 35a81c8f2d..daff965aeb 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSCarbs( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt similarity index 90% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt index 06ab7191ac..873fcf3ae2 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits import org.json.JSONObject data class NSEffectiveProfileSwitch( diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt similarity index 88% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt index cd0880276d..dd61d62778 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSExtendedBolus( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSOfflineEvent.kt similarity index 91% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSOfflineEvent.kt index 9ac1847562..8c535c6b22 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSOfflineEvent.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSOfflineEvent( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSProfileSwitch.kt similarity index 90% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSProfileSwitch.kt index 7c2497bfd8..1ba00b5689 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSProfileSwitch.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits import org.json.JSONObject data class NSProfileSwitch( diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryBasal.kt similarity index 93% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryBasal.kt index 3192006e3a..97b8b0859f 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryBasal.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSTemporaryBasal( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryTarget.kt similarity index 92% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryTarget.kt index a82ae6bf13..511f979a9c 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTemporaryTarget.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSTemporaryTarget( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTherapyEvent.kt similarity index 92% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTherapyEvent.kt index 124fac99a1..256213283b 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTherapyEvent.kt @@ -1,7 +1,7 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment import com.google.gson.annotations.SerializedName -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits data class NSTherapyEvent( override var date: Long?, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt similarity index 85% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt index 55793ba02d..661f1dec53 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.localmodel.treatment +package app.aaps.core.nssdk.localmodel.treatment -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.NsUnits interface NSTreatment { var date: Long? diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/ApiPermissionMapper.kt similarity index 72% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/ApiPermissionMapper.kt index b407cb1763..e13c787735 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/ApiPermissionMapper.kt @@ -1,10 +1,10 @@ -package info.nightscout.sdk.mapper +package app.aaps.core.nssdk.mapper -import info.nightscout.sdk.localmodel.ApiPermission -import info.nightscout.sdk.localmodel.ApiPermissions -import info.nightscout.sdk.remotemodel.RemoteApiPermission -import info.nightscout.sdk.remotemodel.RemoteApiPermissions -import info.nightscout.sdk.remotemodel.read +import app.aaps.core.nssdk.localmodel.ApiPermission +import app.aaps.core.nssdk.localmodel.ApiPermissions +import app.aaps.core.nssdk.remotemodel.RemoteApiPermission +import app.aaps.core.nssdk.remotemodel.RemoteApiPermissions +import app.aaps.core.nssdk.remotemodel.read internal fun RemoteApiPermissions.toLocal(): ApiPermissions = ApiPermissions( diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/DeviceStatusMapper.kt similarity index 96% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/DeviceStatusMapper.kt index a5948af9c1..75c66e3638 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/DeviceStatusMapper.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/DeviceStatusMapper.kt @@ -1,9 +1,9 @@ -package info.nightscout.sdk.mapper +package app.aaps.core.nssdk.mapper import com.google.gson.Gson import com.google.gson.JsonParser -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus -import info.nightscout.sdk.remotemodel.RemoteDeviceStatus +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus import org.json.JSONObject fun NSDeviceStatus.convertToRemoteAndBack(): NSDeviceStatus = diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/FoodMapper.kt similarity index 92% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/FoodMapper.kt index 49ebe6456c..9c1b8678ea 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/FoodMapper.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/FoodMapper.kt @@ -1,8 +1,8 @@ -package info.nightscout.sdk.mapper +package app.aaps.core.nssdk.mapper import com.google.gson.Gson -import info.nightscout.sdk.localmodel.food.NSFood -import info.nightscout.sdk.remotemodel.RemoteFood +import app.aaps.core.nssdk.localmodel.food.NSFood +import app.aaps.core.nssdk.remotemodel.RemoteFood /** * Convert to [RemoteFood] and back to [NSFood] diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StatusResponseMapper.kt similarity index 60% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StatusResponseMapper.kt index 1c9f5b419a..84de574330 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StatusResponseMapper.kt @@ -1,7 +1,7 @@ -package info.nightscout.sdk.mapper +package app.aaps.core.nssdk.mapper -import info.nightscout.sdk.localmodel.Status -import info.nightscout.sdk.remotemodel.RemoteStatusResponse +import app.aaps.core.nssdk.localmodel.Status +import app.aaps.core.nssdk.remotemodel.RemoteStatusResponse internal fun RemoteStatusResponse.toLocal() = Status( version = version, diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StorageMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StorageMapper.kt new file mode 100644 index 0000000000..dd0f45566b --- /dev/null +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/StorageMapper.kt @@ -0,0 +1,6 @@ +package app.aaps.core.nssdk.mapper + +import app.aaps.core.nssdk.localmodel.Storage +import app.aaps.core.nssdk.remotemodel.RemoteStorage + +internal fun RemoteStorage.toLocal() = Storage(storage = storage, version = version) diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/SvgMapper.kt similarity index 87% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/SvgMapper.kt index bc08e4e6f2..d83d6e0c28 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/SvgMapper.kt @@ -1,10 +1,10 @@ -package info.nightscout.sdk.mapper +package app.aaps.core.nssdk.mapper import com.google.gson.Gson -import info.nightscout.sdk.localmodel.entry.Direction -import info.nightscout.sdk.localmodel.entry.NSSgvV3 -import info.nightscout.sdk.localmodel.entry.NsUnits -import info.nightscout.sdk.remotemodel.RemoteEntry +import app.aaps.core.nssdk.localmodel.entry.Direction +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.remotemodel.RemoteEntry fun NSSgvV3.convertToRemoteAndBack(): NSSgvV3? = toRemoteEntry().toSgv() diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/TreatmentMapper.kt similarity index 96% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/TreatmentMapper.kt index cb3edf420f..fa102acdaf 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/TreatmentMapper.kt @@ -1,20 +1,20 @@ -package info.nightscout.sdk.mapper +package app.aaps.core.nssdk.mapper import com.google.gson.Gson -import info.nightscout.sdk.localmodel.entry.NsUnits -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSBolus -import info.nightscout.sdk.localmodel.treatment.NSBolusWizard -import info.nightscout.sdk.localmodel.treatment.NSCarbs -import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch -import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus -import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent -import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch -import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal -import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget -import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent -import info.nightscout.sdk.localmodel.treatment.NSTreatment -import info.nightscout.sdk.remotemodel.RemoteTreatment +import app.aaps.core.nssdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSBolus +import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard +import app.aaps.core.nssdk.localmodel.treatment.NSCarbs +import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus +import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent +import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget +import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment +import app.aaps.core.nssdk.remotemodel.RemoteTreatment import org.json.JSONObject import java.util.concurrent.TimeUnit @@ -33,7 +33,7 @@ fun String.toNSTreatment(): NSTreatment? = internal fun RemoteTreatment.toTreatment(): NSTreatment? { val treatmentTimestamp = timestamp() when { - insulin != null && insulin > 0 -> + insulin != null && insulin > 0 -> return NSBolus( date = treatmentTimestamp, device = this.device, diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NSAuthInterceptor.kt similarity index 88% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NSAuthInterceptor.kt index a5dd72d87b..781321a4ea 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NSAuthInterceptor.kt @@ -1,9 +1,9 @@ -package info.nightscout.sdk.networking +package app.aaps.core.nssdk.networking -import info.nightscout.sdk.exceptions.DateHeaderOutOfToleranceException -import info.nightscout.sdk.exceptions.InvalidAccessTokenException -import info.nightscout.sdk.networking.Status.MESSAGE_DATE_HEADER_OUT_OF_TOLERANCE -import info.nightscout.sdk.remotemodel.RemoteAuthResponse +import app.aaps.core.nssdk.exceptions.DateHeaderOutOfToleranceException +import app.aaps.core.nssdk.exceptions.InvalidAccessTokenException +import app.aaps.core.nssdk.networking.Status.MESSAGE_DATE_HEADER_OUT_OF_TOLERANCE +import app.aaps.core.nssdk.remotemodel.RemoteAuthResponse import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NetworkStackBuilder.kt similarity index 98% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NetworkStackBuilder.kt index 801dab4b9a..32378507c2 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NetworkStackBuilder.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.networking +package app.aaps.core.nssdk.networking import android.content.Context import com.google.gson.Gson diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutAuthRefreshService.kt similarity index 76% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutAuthRefreshService.kt index 373de8e6a7..7d0b88ab36 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutAuthRefreshService.kt @@ -1,6 +1,6 @@ -package info.nightscout.sdk.networking +package app.aaps.core.nssdk.networking -import info.nightscout.sdk.remotemodel.RemoteAuthResponse +import app.aaps.core.nssdk.remotemodel.RemoteAuthResponse import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutRemoteService.kt similarity index 89% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutRemoteService.kt index a4bdc4ffff..806ce6573b 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/NightscoutRemoteService.kt @@ -1,14 +1,14 @@ -package info.nightscout.sdk.networking +package app.aaps.core.nssdk.networking import com.google.gson.JsonObject -import info.nightscout.sdk.remotemodel.LastModified -import info.nightscout.sdk.remotemodel.NSResponse -import info.nightscout.sdk.remotemodel.RemoteCreateUpdateResponse -import info.nightscout.sdk.remotemodel.RemoteDeviceStatus -import info.nightscout.sdk.remotemodel.RemoteEntry -import info.nightscout.sdk.remotemodel.RemoteFood -import info.nightscout.sdk.remotemodel.RemoteStatusResponse -import info.nightscout.sdk.remotemodel.RemoteTreatment +import app.aaps.core.nssdk.remotemodel.LastModified +import app.aaps.core.nssdk.remotemodel.NSResponse +import app.aaps.core.nssdk.remotemodel.RemoteCreateUpdateResponse +import app.aaps.core.nssdk.remotemodel.RemoteDeviceStatus +import app.aaps.core.nssdk.remotemodel.RemoteEntry +import app.aaps.core.nssdk.remotemodel.RemoteFood +import app.aaps.core.nssdk.remotemodel.RemoteStatusResponse +import app.aaps.core.nssdk.remotemodel.RemoteTreatment import org.json.JSONObject import retrofit2.Response import retrofit2.http.Body diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/Status.kt similarity index 74% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/Status.kt index d153d37931..e4c2572e8b 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/networking/Status.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.networking +package app.aaps.core.nssdk.networking internal object Status { diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/LastModified.kt similarity index 97% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/LastModified.kt index 4d48a5f46d..c15f2722e2 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/LastModified.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.annotations.SerializedName import kotlinx.serialization.Serializable diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteAuthResponse.kt similarity index 68% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteAuthResponse.kt index 5e8a9fdb9c..a50a27b272 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteAuthResponse.kt @@ -1,3 +1,3 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel internal data class RemoteAuthResponse(val token: String, val iat: Long, val exp: Long) diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteDeviceStatus.kt similarity index 99% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteDeviceStatus.kt index 4f666a4ae1..8437adde43 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteDeviceStatus.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.JsonObject import com.google.gson.annotations.SerializedName diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteEntry.kt similarity index 98% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteEntry.kt index d206f1e936..560b0e7f7d 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteEntry.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.annotations.SerializedName diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteFood.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteFood.kt similarity index 98% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteFood.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteFood.kt index 7382d5ca03..5021c82ddd 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteFood.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteFood.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.annotations.SerializedName diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteProfileStore.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteProfileStore.kt similarity index 98% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteProfileStore.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteProfileStore.kt index 4f2c0289d5..3d69125537 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteProfileStore.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteProfileStore.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.annotations.SerializedName import kotlinx.serialization.Contextual diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteStatusResponse.kt similarity index 97% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteStatusResponse.kt index be313118ba..b9cc33544e 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteStatusResponse.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.annotations.SerializedName diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteTreatment.kt similarity index 99% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteTreatment.kt index 356a7acb6f..3d1d59a375 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/RemoteTreatment.kt @@ -1,7 +1,7 @@ -package info.nightscout.sdk.remotemodel +package app.aaps.core.nssdk.remotemodel import com.google.gson.annotations.SerializedName -import info.nightscout.sdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.EventType import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/examples.json b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/examples.json similarity index 100% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/examples.json rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/remotemodel/examples.json diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/CoroutineUtils.kt similarity index 94% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/CoroutineUtils.kt index 9b6b777f13..d94a928920 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/CoroutineUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.utils +package app.aaps.core.nssdk.utils import kotlinx.coroutines.delay import kotlin.reflect.KClass diff --git a/core/ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/ListUtils.kt similarity index 74% rename from core/ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt rename to core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/ListUtils.kt index 12e326db36..ebef730e44 100644 --- a/core/ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt +++ b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/utils/ListUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.sdk.utils +package app.aaps.core.nssdk.utils @JvmSynthetic internal fun List?.toNotNull(): List = this?.filterNotNull() ?: listOf() diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle index 0d17072266..bbde7e504b 100644 --- a/plugins/aps/build.gradle +++ b/plugins/aps/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation project(':database:impl') implementation project(':core:main') implementation project(':core:interfaces') - implementation project(':core:ns-sdk') + implementation project(':core:nssdk') implementation project(':core:utils') implementation project(':core:ui') implementation project(':core:validators') diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt index 42d6f0edea..e4547ac345 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt @@ -75,7 +75,7 @@ import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncement import info.nightscout.plugins.aps.R import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui import info.nightscout.plugins.aps.loop.extensions.json -import info.nightscout.sdk.interfaces.RunningConfiguration +import app.aaps.core.nssdk.interfaces.RunningConfiguration import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONObject diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt index 4460c92113..34186c0a10 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt +++ b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt @@ -24,7 +24,7 @@ import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.pump.virtual.VirtualPumpPlugin -import info.nightscout.sdk.interfaces.RunningConfiguration +import app.aaps.core.nssdk.interfaces.RunningConfiguration import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle index 3c22f50515..b2ce9b4cae 100644 --- a/plugins/configuration/build.gradle +++ b/plugins/configuration/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation project(':database:entities') implementation project(':core:interfaces') implementation project(':core:main') - implementation project(':core:ns-sdk') + implementation project(':core:nssdk') implementation project(':core:utils') implementation project(':core:ui') implementation project(':core:validators') diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt index 2e671054f8..fb7d9f7d8e 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt @@ -18,8 +18,8 @@ import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.smoothing.Smoothing import app.aaps.core.interfaces.ui.UiInteraction -import info.nightscout.sdk.interfaces.RunningConfiguration -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.interfaces.RunningConfiguration +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt index 7fe64f6486..b320df72ae 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt @@ -19,7 +19,7 @@ import app.aaps.core.interfaces.maintenance.PrefFileListProvider import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector -import info.nightscout.sdk.interfaces.RunningConfiguration +import app.aaps.core.nssdk.interfaces.RunningConfiguration @Module( includes = [ diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle index 6368a3ed8d..efa697e097 100644 --- a/plugins/main/build.gradle +++ b/plugins/main/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation project(':core:graphview') implementation project(':core:interfaces') implementation project(':core:main') - implementation project(':core:ns-sdk') + implementation project(':core:nssdk') implementation project(':core:ui') implementation project(':core:utils') implementation project(':core:validators') diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle index 943840c1a0..ff926fa02d 100644 --- a/plugins/source/build.gradle +++ b/plugins/source/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation project(':database:impl') implementation project(':core:interfaces') implementation project(':core:main') - implementation project(':core:ns-sdk') + implementation project(':core:nssdk') implementation project(':core:ui') implementation project(':core:utils') diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle index d2696c0045..1cd5f62376 100644 --- a/plugins/sync/build.gradle +++ b/plugins/sync/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation project(':database:impl') implementation project(':core:main') implementation project(':core:interfaces') - implementation project(':core:ns-sdk') + implementation project(':core:nssdk') implementation project(':core:ui') implementation project(':core:utils') implementation project(':core:validators') diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt index 98c8d4c13b..ff5f036f25 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt @@ -35,19 +35,19 @@ import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryBasal import info.nightscout.plugins.sync.nsclientV3.extensions.toTemporaryTarget import info.nightscout.plugins.sync.nsclientV3.extensions.toTherapyEvent import info.nightscout.plugins.sync.nsclientV3.extensions.toTransactionGlucoseValue -import info.nightscout.sdk.localmodel.entry.NSSgvV3 -import info.nightscout.sdk.localmodel.food.NSFood -import info.nightscout.sdk.localmodel.treatment.NSBolus -import info.nightscout.sdk.localmodel.treatment.NSBolusWizard -import info.nightscout.sdk.localmodel.treatment.NSCarbs -import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch -import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus -import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent -import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch -import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal -import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget -import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent -import info.nightscout.sdk.localmodel.treatment.NSTreatment +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.localmodel.food.NSFood +import app.aaps.core.nssdk.localmodel.treatment.NSBolus +import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard +import app.aaps.core.nssdk.localmodel.treatment.NSCarbs +import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus +import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent +import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget +import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment import org.json.JSONArray import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt index feb3eef282..e224611d92 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt @@ -7,8 +7,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.core.utils.HtmlHelper import info.nightscout.core.utils.JsonHelper -import info.nightscout.sdk.interfaces.RunningConfiguration -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.interfaces.RunningConfiguration +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt index 9d015efdbd..c7400c0efe 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt @@ -51,7 +51,7 @@ import info.nightscout.plugins.sync.nsclient.data.AlarmAck import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclient.workers.NSClientAddUpdateWorker import info.nightscout.plugins.sync.nsclient.workers.NSClientMbgWorker -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import io.socket.client.IO diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt index 70921b2c11..ae8edca077 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -84,13 +84,13 @@ import info.nightscout.plugins.sync.nsclientV3.workers.LoadLastModificationWorke import info.nightscout.plugins.sync.nsclientV3.workers.LoadProfileStoreWorker import info.nightscout.plugins.sync.nsclientV3.workers.LoadStatusWorker import info.nightscout.plugins.sync.nsclientV3.workers.LoadTreatmentsWorker -import info.nightscout.sdk.NSAndroidClientImpl -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.mapper.toNSDeviceStatus -import info.nightscout.sdk.mapper.toNSFood -import info.nightscout.sdk.mapper.toNSSgvV3 -import info.nightscout.sdk.mapper.toNSTreatment -import info.nightscout.sdk.remotemodel.LastModified +import app.aaps.core.nssdk.NSAndroidClientImpl +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.mapper.toNSDeviceStatus +import app.aaps.core.nssdk.mapper.toNSFood +import app.aaps.core.nssdk.mapper.toNSSgvV3 +import app.aaps.core.nssdk.mapper.toNSTreatment +import app.aaps.core.nssdk.remotemodel.LastModified import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import io.socket.client.Ack diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt index 3f6ef7cc30..40b2b56a14 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt @@ -4,9 +4,9 @@ import app.aaps.core.interfaces.utils.T import com.google.gson.Gson import com.google.gson.JsonSyntaxException import info.nightscout.database.entities.BolusCalculatorResult -import info.nightscout.sdk.localmodel.entry.NsUnits -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSBolusWizard +import app.aaps.core.nssdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard fun NSBolusWizard.toBolusCalculatorResult(): BolusCalculatorResult? = try { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt index e8cd662eb1..86b9b74060 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSBolus +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSBolus import java.security.InvalidParameterException fun NSBolus.toBolus(): Bolus = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt index 8c26692e7f..7ec6824c63 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSCarbs +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSCarbs import java.security.InvalidParameterException fun NSCarbs.toCarbs(): Carbs = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtension.kt index c957de9dc3..36bb5e7b44 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtension.kt @@ -3,7 +3,7 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import com.google.gson.GsonBuilder import com.google.gson.JsonDeserializer import info.nightscout.database.entities.DeviceStatus -import info.nightscout.sdk.localmodel.devicestatus.NSDeviceStatus +import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import org.json.JSONObject fun DeviceStatus.toNSDeviceStatus(): NSDeviceStatus { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt index 7dcfe21e7f..a3c5a3ced2 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt @@ -7,8 +7,8 @@ import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.plugins.sync.nsclient.extensions.fromConstant -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch import java.security.InvalidParameterException fun NSEffectiveProfileSwitch.toEffectiveProfileSwitch(dateUtil: DateUtil): EffectiveProfileSwitch? { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt index 206ce4afe1..bc8e43354d 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt @@ -5,9 +5,9 @@ import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus -import info.nightscout.sdk.localmodel.treatment.NSTreatment +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment import java.security.InvalidParameterException fun NSExtendedBolus.toExtendedBolus(): ExtendedBolus = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtension.kt index 2cd4ff466b..d5ecc06945 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtension.kt @@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import info.nightscout.database.entities.Food import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.food.NSFood +import app.aaps.core.nssdk.localmodel.food.NSFood fun NSFood.toFood(): Food = Food( diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt index e6fa298ec4..d63129351d 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtension.kt @@ -3,9 +3,9 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.transactions.TransactionGlucoseValue -import info.nightscout.sdk.localmodel.entry.Direction -import info.nightscout.sdk.localmodel.entry.NSSgvV3 -import info.nightscout.sdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.entry.Direction +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.localmodel.entry.NsUnits import java.security.InvalidParameterException fun NSSgvV3.toTransactionGlucoseValue(): TransactionGlucoseValue { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt index d3aa0bfccf..aa8815a87c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent import java.security.InvalidParameterException fun NSOfflineEvent.toOfflineEvent(): OfflineEvent = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt index 9516f490d7..f29274a689 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt @@ -10,8 +10,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch import java.security.InvalidParameterException fun NSProfileSwitch.toProfileSwitch(activePlugin: ActivePlugin, dateUtil: DateUtil): ProfileSwitch? { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt index 76952badea..68b067b5ed 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt @@ -5,8 +5,8 @@ import app.aaps.core.interfaces.profile.Profile import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal import java.security.InvalidParameterException fun NSTemporaryBasal.toTemporaryBasal(): TemporaryBasal = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt index a0052c3cc3..5cead33db1 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt @@ -3,9 +3,9 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.entry.NsUnits -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget +import app.aaps.core.nssdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget import java.security.InvalidParameterException fun NSTemporaryTarget.toTemporaryTarget(): TemporaryTarget = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt index 2234825340..3790ca3e60 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt @@ -3,9 +3,9 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import app.aaps.core.interfaces.utils.T import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.entry.NsUnits -import info.nightscout.sdk.localmodel.treatment.EventType -import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent +import app.aaps.core.nssdk.localmodel.entry.NsUnits +import app.aaps.core.nssdk.localmodel.treatment.EventType +import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent import java.security.InvalidParameterException fun NSTherapyEvent.toTherapyEvent(): TherapyEvent = diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt index 75f0410047..f618aa64b4 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt @@ -14,8 +14,8 @@ import app.aaps.core.interfaces.sync.NsClient import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.localmodel.entry.NSSgvV3 +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.localmodel.entry.NSSgvV3 import kotlinx.coroutines.Dispatchers import javax.inject.Inject import kotlin.math.max diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt index 2b11af9af9..74e488ab61 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt @@ -11,7 +11,7 @@ import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin -import info.nightscout.sdk.localmodel.food.NSFood +import app.aaps.core.nssdk.localmodel.food.NSFood import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt index 026a4938c2..9a62091922 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt @@ -13,7 +13,7 @@ import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.receivers.DataWorkerStorage import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin -import info.nightscout.sdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.interfaces.NSAndroidClient import kotlinx.coroutines.Dispatchers import org.json.JSONObject import javax.inject.Inject diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt index 26c6025c31..2758da2b5e 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt @@ -12,8 +12,8 @@ import app.aaps.core.interfaces.sync.NsClient import app.aaps.core.interfaces.utils.DateUtil import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.localmodel.treatment.NSTreatment +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.localmodel.treatment.NSTreatment import kotlinx.coroutines.Dispatchers import javax.inject.Inject import kotlin.math.max diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt index c4cf2f5be5..4b6352e376 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt @@ -34,8 +34,8 @@ import info.nightscout.plugins.sync.nsShared.StoreDataForDbImpl import info.nightscout.plugins.sync.nsclient.ReceiverDelegate import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclient.extensions.fromConstant -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.localmodel.treatment.CreateUpdateResponse +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.localmodel.treatment.CreateUpdateResponse import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtensionKtTest.kt index be4415c765..800584fac4 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtensionKtTest.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSBolusWizard -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSBolusWizard +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtensionKtTest.kt index 532aa1d7f7..5ac924568a 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtensionKtTest.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSBolus -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSBolus +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtensionKtTest.kt index 5414a13989..a4e3cefdf0 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtensionKtTest.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.Carbs import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSCarbs -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSCarbs +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt index 2c83ae2510..aec496d91d 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/DeviceStatusExtensionKtTest.kt @@ -11,8 +11,8 @@ import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.DeviceStatus import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusDataImpl -import info.nightscout.sdk.interfaces.RunningConfiguration -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.interfaces.RunningConfiguration +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt index f066496e95..a05a0ea490 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtensionKtTest.kt @@ -7,8 +7,8 @@ import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.entities.embedments.InsulinConfiguration import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.plugins.sync.nsclient.extensions.fromConstant -import info.nightscout.sdk.localmodel.treatment.NSEffectiveProfileSwitch -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSEffectiveProfileSwitch +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt index 49a7d4a019..1aba0a9694 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt @@ -4,9 +4,9 @@ import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSExtendedBolus -import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtensionKtTest.kt index cf26988f9f..d789f9caac 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/FoodExtensionKtTest.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.Food import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.food.NSFood -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.food.NSFood +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtensionKtTest.kt index c611a0734d..70a7bf1e42 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/GlucoseValueExtensionKtTest.kt @@ -4,7 +4,7 @@ import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test internal class GlucoseValueExtensionKtTest : TestBaseWithProfile() { diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtensionKtTest.kt index f7d8862c20..f171e81a8d 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtensionKtTest.kt @@ -3,8 +3,8 @@ package info.nightscout.plugins.sync.nsclientV3.extensions import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSOfflineEvent -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSOfflineEvent +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt index 9c19a86934..dec3d6993f 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt @@ -7,8 +7,8 @@ import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.ProfileSwitch import info.nightscout.database.entities.embedments.InsulinConfiguration import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSProfileSwitch -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSProfileSwitch +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtensionKtTest.kt index fb72277b60..11e8f6bb40 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtensionKtTest.kt @@ -4,8 +4,8 @@ import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSTemporaryBasal -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtensionKtTest.kt index 49aef9daba..8e5d88c0df 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtensionKtTest.kt @@ -4,8 +4,8 @@ import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSTemporaryTarget -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtensionKtTest.kt index 68ab4f36b9..d943a7d455 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtensionKtTest.kt @@ -4,8 +4,8 @@ import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.embedments.InterfaceIDs -import info.nightscout.sdk.localmodel.treatment.NSTherapyEvent -import info.nightscout.sdk.mapper.convertToRemoteAndBack +import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent +import app.aaps.core.nssdk.mapper.convertToRemoteAndBack import org.junit.jupiter.api.Test @Suppress("SpellCheckingInspection") diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt index 722bbe7272..e536dba43f 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt @@ -31,8 +31,8 @@ import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3 -import info.nightscout.sdk.interfaces.NSAndroidClient -import info.nightscout.sdk.remotemodel.LastModified +import app.aaps.core.nssdk.interfaces.NSAndroidClient +import app.aaps.core.nssdk.remotemodel.LastModified import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/settings.gradle b/settings.gradle index 86bc9c0a2e..7ad8716f55 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ include ':core:main' include ':core:graphview' include ':core:interfaces' include ':core:libraries' -include ':core:ns-sdk' +include ':core:nssdk' include ':core:utils' include ':core:ui' include ':core:validators'