From b79d653be283e706cb8b0d74bea29bd9b95a60ab Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 26 Sep 2023 16:24:49 +0200 Subject: [PATCH] :plugins:smoothing cleanup --- app/src/main/kotlin/app/aaps/di/PluginsListModule.kt | 6 +++--- plugins/smoothing/build.gradle | 3 ++- .../app/aaps/plugins}/smoothing/AvgSmoothingPlugin.kt | 2 +- .../aaps/plugins}/smoothing/ExponentialSmoothingPlugin.kt | 2 +- .../app/aaps/plugins}/smoothing/NoSmoothingPlugin.kt | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename plugins/smoothing/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/smoothing/AvgSmoothingPlugin.kt (98%) rename plugins/smoothing/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/smoothing/ExponentialSmoothingPlugin.kt (99%) rename plugins/smoothing/src/main/{java/info/nightscout => kotlin/app/aaps/plugins}/smoothing/NoSmoothingPlugin.kt (97%) diff --git a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt index 1b12a56e97..b2b9eab5cc 100644 --- a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt +++ b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt @@ -55,9 +55,9 @@ import info.nightscout.pump.combov2.ComboV2Plugin import info.nightscout.pump.diaconn.DiaconnG8Plugin import info.nightscout.pump.medtrum.MedtrumPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin -import info.nightscout.smoothing.AvgSmoothingPlugin -import info.nightscout.smoothing.ExponentialSmoothingPlugin -import info.nightscout.smoothing.NoSmoothingPlugin +import app.aaps.plugins.smoothing.AvgSmoothingPlugin +import app.aaps.plugins.smoothing.ExponentialSmoothingPlugin +import app.aaps.plugins.smoothing.NoSmoothingPlugin import info.nightscout.source.AidexPlugin import info.nightscout.source.DexcomPlugin import info.nightscout.source.GlimpPlugin diff --git a/plugins/smoothing/build.gradle b/plugins/smoothing/build.gradle index aab84d1216..c910ef3dbd 100644 --- a/plugins/smoothing/build.gradle +++ b/plugins/smoothing/build.gradle @@ -10,8 +10,9 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" + android { - namespace 'info.nightscout.smoothing' + namespace 'app.aaps.plugins.smoothing' } diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt b/plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/AvgSmoothingPlugin.kt similarity index 98% rename from plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt rename to plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/AvgSmoothingPlugin.kt index 136ff5012c..2527edf1dc 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/AvgSmoothingPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.smoothing +package app.aaps.plugins.smoothing import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.iob.InMemoryGlucoseValue diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt b/plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/ExponentialSmoothingPlugin.kt similarity index 99% rename from plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt rename to plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/ExponentialSmoothingPlugin.kt index 53aebb3394..4c083937d6 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/ExponentialSmoothingPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.smoothing +package app.aaps.plugins.smoothing import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.iob.InMemoryGlucoseValue diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt b/plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/NoSmoothingPlugin.kt similarity index 97% rename from plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt rename to plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/NoSmoothingPlugin.kt index 6efcd8beda..f461b7ab9f 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/kotlin/app/aaps/plugins/smoothing/NoSmoothingPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.smoothing +package app.aaps.plugins.smoothing import app.aaps.annotations.OpenForTesting import app.aaps.core.interfaces.iob.InMemoryGlucoseValue