Fixed kotlinx coroutines dependency resolution

Fraunhofer-AISEC · Nov 17, 2023 · f14fc05 · f14fc05
1 parent 48b821e
commit f14fc05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -69,6 +69,9 @@ subprojects {
             "org.jetbrains.kotlin" to mapOf(
                 "*" to versions.kotlin.get()
             ),
+            "org.jetbrains.kotlinx" to mapOf(
+                Regex("kotlinx-coroutines-.*") to versions.kotlinx.coroutines.get()
+            ),
             "com.google.guava" to mapOf(
                 "guava" to versions.guava.get()
             ),
@@ -92,7 +95,11 @@ subprojects {
                     } ?: pins[requested.name]?.let { pin ->
                         // Pin only for specific names given in map
                         useVersion(pin)
-                    }
+                    } ?: pins.entries.firstOrNull { e ->
+                        e.key.let {
+                            it is Regex && it.matches(requested.name)
+                        }
+                    }?.let { useVersion(it.value) }
                 }
             }
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ ktlint = "0.50.0"
 
 # Kotlin library/compiler version
 kotlin = "1.9.20"
-kotlinxCoroutines = "1.7.3"
+kotlinx-coroutines = "1.7.3"
 # HTTP client
 ktor = "2.3.5"
 
@@ -129,9 +129,9 @@ javax-activation = { group = "com.sun.activation", name = "javax.activation", ve
 mapdb = { group = "org.mapdb", name = "mapdb", version.ref = "mapdb" }
 
 # ids-webconsole
-kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
-kotlinx-reactive = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactive", version.ref = "kotlinxCoroutines" }
-kotlinx-reactor = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactor", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-reactive = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactive", version.ref = "kotlinx-coroutines" }
+kotlinx-reactor = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" }
 bouncycastle = { group = "org.bouncycastle", name = "bcprov-jdk15on", version.ref = "bouncyCastle" }
 bouncycastlePkix = { group = "org.bouncycastle", name = "bcpkix-jdk15to18", version.ref = "bouncyCastle" }
 jose4j = { group = "org.bitbucket.b_c", name = "jose4j", version.ref = "jose4j" }

diff --git a/ids-acme/src/main/kotlin/de/fhg/aisec/ids/acme/AcmeClientService.kt b/ids-acme/src/main/kotlin/de/fhg/aisec/ids/acme/AcmeClientService.kt
@@ -262,8 +262,7 @@ class AcmeClientService : AcmeClient, Runnable, SslContextFactoryReloadableRegis
                                                     "ids",
                                                     domainKeyPair.private,
                                                     "password".toCharArray(),
-                                                    certificate.certificateChain.toTypedArray<
-                                                        X509Certificate>()
+                                                    certificate.certificateChain.toTypedArray<X509Certificate>()
                                                 )
                                                 store.store(
                                                     ksOutputStream,