Merge pull request #315 from danwallach/upgradeDependencies

Upgrade depencencies
votingworks · Jul 3, 2023 · bf448da · bf448da
2 parents 45b6456 + 2829cdd
commit bf448da
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/egklib/build.gradle.kts b/egklib/build.gradle.kts
@@ -231,4 +231,10 @@ publishing {
     }
 }
 
- */
+ */
+
+tasks.register("showConfigurations") {
+    configurations.forEach {
+        println(it.name)
+    }
+}
diff --git a/egklib/src/commonMain/kotlin/electionguard/publish/ElectionRecordFactory.kt b/egklib/src/commonMain/kotlin/electionguard/publish/ElectionRecordFactory.kt
@@ -17,7 +17,7 @@ fun readElectionRecord(consumer: Consumer) : ElectionRecord {
     var tallyResult : TallyResult? = null
     var init : ElectionInitialized? = null
     var config : ElectionConfig? = null
-    var manifest : Manifest? = null
+    var manifest : Manifest?
     var stage : ElectionRecord.Stage? = null
 
     val decryption = consumer.readDecryptionResult()
@@ -64,7 +64,7 @@ fun readElectionRecord(consumer: Consumer) : ElectionRecord {
     if (stage == ElectionRecord.Stage.INIT && consumer.hasEncryptedBallots()) {
         stage = ElectionRecord.Stage.ENCRYPTED
     }
-    return ElectionRecordImpl(consumer, stage!!, decryptionResult, tallyResult, init, config!!, manifest!!)
+    return ElectionRecordImpl(consumer, stage!!, decryptionResult, tallyResult, init, config, manifest)
 }
 
 private class ElectionRecordImpl(val consumer: Consumer,

diff --git a/egklib/src/commonTest/kotlin/electionguard/core/KotestGenerators.kt b/egklib/src/commonTest/kotlin/electionguard/core/KotestGenerators.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalKotest::class)
+
 package electionguard.core
 
+import io.kotest.common.ExperimentalKotest
 import io.kotest.property.Arb
 import io.kotest.property.PropTestConfig
 import io.kotest.property.ShrinkingMode

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
         create("libs") {
             version("kotlin-version", providers.gradleProperty("kotlinVersion").get())
             version("coroutines-version", "1.6.4")
-            version("ktor-version", "2.2.2")
+            version("ktor-version", "2.3.1")
 
             plugin("ktor", "io.ktor.plugin").versionRef("ktor-version")
             plugin("serialization", "org.jetbrains.kotlin.plugin.serialization").versionRef("kotlin-version")
@@ -59,12 +59,12 @@ dependencyResolutionManagement {
             )
 
             // depends on kotlin-stdlib-common:1.6.20 -> 1.7.20
-            library("kotlin-result", "com.michael-bull.kotlin-result:kotlin-result:1.1.16")
+            library("kotlin-result", "com.michael-bull.kotlin-result:kotlin-result:1.1.18")
             // depends on kotlin 1.5.32 -> 1.7.20, coroutines 1.5.2, protoc 3.19.1
             library("pbandk", "pro.streem.pbandk:pbandk-runtime:0.14.2")
 
             //// logging
-            library("microutils-logging", "io.github.microutils:kotlin-logging:3.0.4")
+            library("microutils-logging", "io.github.microutils:kotlin-logging:3.0.5")
             library("logback-classic", "ch.qos.logback:logback-classic:1.3.4")
 
             library("kotlin-server-logging", "io.ktor", "ktor-server-call-logging").versionRef("ktor-version")