From fceed4e4fddc91f45f245001464429d1b317ad7c Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 18 May 2021 23:02:40 +0200 Subject: [PATCH] @JvmDefault warning resolve --- build.gradle | 2 +- .../plugins/pump/combo/ComboPlugin.java | 9 ++--- .../androidaps/interfaces/Constraints.kt | 34 +++++++++---------- .../nightscout/androidaps/interfaces/Pump.kt | 16 ++++----- 4 files changed, 27 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index da44327f45..901890e428 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,7 @@ allprojects { //Support @JvmDefault tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { - freeCompilerArgs = ['-Xjvm-default=enable'] //enable or compatibility + freeCompilerArgs = ['-Xjvm-default=all'] jvmTarget = "1.8" } } diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java index b48c49141f..a42bcaafde 100644 --- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java +++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java @@ -6,8 +6,6 @@ import android.os.SystemClock; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import info.nightscout.androidaps.extensions.PumpStateExtensionKt; - import org.joda.time.DateTime; import org.json.JSONObject; @@ -25,19 +23,19 @@ import javax.inject.Singleton; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.combo.R; import info.nightscout.androidaps.data.DetailedBolusInfo; -import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; +import info.nightscout.androidaps.extensions.PumpStateExtensionKt; import info.nightscout.androidaps.interfaces.CommandQueueProvider; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.Constraints; -import info.nightscout.androidaps.interfaces.DatabaseHelperInterface; import info.nightscout.androidaps.interfaces.PluginDescription; import info.nightscout.androidaps.interfaces.PluginType; +import info.nightscout.androidaps.interfaces.Profile; import info.nightscout.androidaps.interfaces.ProfileFunction; -import info.nightscout.androidaps.interfaces.PumpDescription; import info.nightscout.androidaps.interfaces.Pump; +import info.nightscout.androidaps.interfaces.PumpDescription; import info.nightscout.androidaps.interfaces.PumpPluginBase; import info.nightscout.androidaps.interfaces.PumpSync; import info.nightscout.androidaps.logging.AAPSLogger; @@ -154,7 +152,6 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints { SP sp, CommandQueueProvider commandQueue, Context context, - DatabaseHelperInterface databaseHelper, PumpSync pumpSync, DateUtil dateUtil ) { diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt index c759b31ea4..95a901f626 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt @@ -1,7 +1,5 @@ package info.nightscout.androidaps.interfaces -import info.nightscout.androidaps.interfaces.Profile - /** * Constraints interface * @@ -15,20 +13,20 @@ import info.nightscout.androidaps.interfaces.Profile */ interface Constraints { - @JvmDefault fun isLoopInvocationAllowed(value: Constraint): Constraint = value - @JvmDefault fun isClosedLoopAllowed(value: Constraint): Constraint = value - @JvmDefault fun isLgsAllowed(value: Constraint): Constraint = value - @JvmDefault fun isAutosensModeEnabled(value: Constraint): Constraint = value - @JvmDefault fun isAMAModeEnabled(value: Constraint): Constraint = value - @JvmDefault fun isSMBModeEnabled(value: Constraint): Constraint = value - @JvmDefault fun isUAMEnabled(value: Constraint): Constraint = value - @JvmDefault fun isAdvancedFilteringEnabled(value: Constraint): Constraint = value - @JvmDefault fun isSuperBolusEnabled(value: Constraint): Constraint = value - @JvmDefault fun applyBasalConstraints(absoluteRate: Constraint, profile: Profile): Constraint = absoluteRate - @JvmDefault fun applyBasalPercentConstraints(percentRate: Constraint, profile: Profile): Constraint = percentRate - @JvmDefault fun applyBolusConstraints(insulin: Constraint): Constraint = insulin - @JvmDefault fun applyExtendedBolusConstraints(insulin: Constraint): Constraint = insulin - @JvmDefault fun applyCarbsConstraints(carbs: Constraint): Constraint = carbs - @JvmDefault fun applyMaxIOBConstraints(maxIob: Constraint): Constraint = maxIob - @JvmDefault fun isAutomationEnabled(value: Constraint): Constraint = value + fun isLoopInvocationAllowed(value: Constraint): Constraint = value + fun isClosedLoopAllowed(value: Constraint): Constraint = value + fun isLgsAllowed(value: Constraint): Constraint = value + fun isAutosensModeEnabled(value: Constraint): Constraint = value + fun isAMAModeEnabled(value: Constraint): Constraint = value + fun isSMBModeEnabled(value: Constraint): Constraint = value + fun isUAMEnabled(value: Constraint): Constraint = value + fun isAdvancedFilteringEnabled(value: Constraint): Constraint = value + fun isSuperBolusEnabled(value: Constraint): Constraint = value + fun applyBasalConstraints(absoluteRate: Constraint, profile: Profile): Constraint = absoluteRate + fun applyBasalPercentConstraints(percentRate: Constraint, profile: Profile): Constraint = percentRate + fun applyBolusConstraints(insulin: Constraint): Constraint = insulin + fun applyExtendedBolusConstraints(insulin: Constraint): Constraint = insulin + fun applyCarbsConstraints(carbs: Constraint): Constraint = carbs + fun applyMaxIOBConstraints(maxIob: Constraint): Constraint = maxIob + fun isAutomationEnabled(value: Constraint): Constraint = value } \ No newline at end of file diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt index 43941f21ae..969c85163c 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt @@ -1,7 +1,6 @@ package info.nightscout.androidaps.interfaces import info.nightscout.androidaps.data.DetailedBolusInfo -import info.nightscout.androidaps.interfaces.Profile import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.plugins.common.ManufacturerType import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction @@ -52,7 +51,7 @@ interface Pump { /** * set initial handshake completed (moved to connected state) */ - @JvmDefault fun finishHandshaking() {} + fun finishHandshaking() {} /** * Perform BT connect, there is new command waiting in queue @@ -69,7 +68,7 @@ interface Pump { /** * @return # of second to wait before [disconnect] is send after last command */ - @JvmDefault fun waitForDisconnectionInSeconds(): Int = 5 + fun waitForDisconnectionInSeconds(): Int = 5 /** * Stop connection process @@ -244,14 +243,14 @@ interface Pump { * * @return list of custom actions */ - @JvmDefault fun getCustomActions(): List? = null + fun getCustomActions(): List? = null /** * Executes a custom action. Please note that these actions will not be queued * * @param customActionType action to be executed */ - @JvmDefault fun executeCustomAction(customActionType: CustomActionType) {} + fun executeCustomAction(customActionType: CustomActionType) {} /** * Executes a custom queued command @@ -260,22 +259,21 @@ interface Pump { * @param customCommand the custom command to be executed * @return PumpEnactResult that represents the command execution result */ - @JvmDefault fun executeCustomCommand(customCommand: CustomCommand): PumpEnactResult? = null + fun executeCustomCommand(customCommand: CustomCommand): PumpEnactResult? = null /** * This method will be called when time or Timezone changes, and pump driver can then do a specific action (for * example update clock on pump). */ - @JvmDefault fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {} + fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {} /** * Only used for pump types where hasCustomUnreachableAlertCheck=true */ - @JvmDefault fun isUnreachableAlertTimeoutExceeded(alertTimeoutMilliseconds: Long): Boolean = false /** * if true APS set 100% basal before full hour to avoid pump beeping */ - @JvmDefault fun setNeutralTempAtFullHour(): Boolean = false + fun setNeutralTempAtFullHour(): Boolean = false } \ No newline at end of file