merge: Update build and runtime dependencies (#107)

This pull request updates the build and runtime dependencies used by OpenDC to their latest 
version compatible with the project.

## Implementation Notes :hammer_and_pick:

* Update simulator dependency versions
* Remove unused distribution conventions
* Update next version to 3.0
* Eliminate use of wildcard imports
* Switch to Spotless for formatting

4 files changed, 7 insertions, 4 deletions

diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt
index d977042e..3b4200c8 100644
--- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt
+++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt
@@ -32,7 +32,7 @@ import org.opendc.faas.simulator.delay.ColdStartModel
 import org.opendc.faas.simulator.delay.StochasticDelayInjector
 import org.opendc.faas.simulator.delay.ZeroDelayInjector
 import org.opendc.simulator.compute.model.MachineModel
-import java.util.*
+import java.util.Random
 
 /**
  * A [ProvisioningStep] implementation for a [FaaSService].
@@ -51,10 +51,11 @@ public class FaaSServiceProvisioningStep internal constructor(
     private val coldStartModel: ColdStartModel?
 ) : ProvisioningStep {
     override fun apply(ctx: ProvisioningContext): AutoCloseable {
-        val delayInjector = if (coldStartModel != null)
+        val delayInjector = if (coldStartModel != null) {
             StochasticDelayInjector(coldStartModel, Random(ctx.seeder.nextLong()))
-        else
+        } else {
             ZeroDelayInjector
+        }
         val deployer = SimFunctionDeployer(ctx.coroutineContext, ctx.clock, machineModel, delayInjector)
         val service = FaaSService(
             ctx.coroutineContext,
diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt
index 40e5627b..53cd9c3e 100644
--- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt
+++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSSteps.kt
@@ -21,6 +21,7 @@
  */
 
 @file:JvmName("FaaSSteps")
+
 package org.opendc.experiments.faas
 
 import org.opendc.experiments.provisioner.ProvisioningContext
diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt
index cf278606..c4001e2e 100644
--- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt
+++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt
@@ -21,6 +21,7 @@
  */
 
 @file:JvmName("TraceHelpers")
+
 package org.opendc.experiments.faas
 
 import kotlinx.coroutines.coroutineScope
diff --git a/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt b/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt
index 6f212825..2342c3f6 100644
--- a/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt
+++ b/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt
@@ -70,7 +70,7 @@ class FaaSExperiment {
             assertAll(
                 { assertEquals(14, stats.totalInvocations) },
                 { assertEquals(2, stats.timelyInvocations) },
-                { assertEquals(12, stats.delayedInvocations) },
+                { assertEquals(12, stats.delayedInvocations) }
             )
         }
     }