Fix publication config

ktorio · Nov 6, 2023 · 4d00349 · 4d00349
1 parent 8daecf7
commit 4d00349
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/buildSrc/src/main/kotlin/Publication.kt b/buildSrc/src/main/kotlin/Publication.kt
@@ -185,4 +185,16 @@ fun Project.configurePublication() {
             }
         }
     }
+
+    val publishLinuxX64PublicationToMavenRepository = tasks.findByName("publishLinuxX64PublicationToMavenRepository")
+    val signLinuxArm64Publication = tasks.findByName("signLinuxArm64Publication")
+    if (publishLinuxX64PublicationToMavenRepository != null && signLinuxArm64Publication != null) {
+        publishLinuxX64PublicationToMavenRepository.dependsOn(signLinuxArm64Publication)
+    }
+
+    val publishLinuxArm64PublicationToMavenRepository = tasks.findByName("publishLinuxArm64PublicationToMavenRepository")
+    val signLinuxX64Publication = tasks.findByName("signLinuxX64Publication")
+    if (publishLinuxArm64PublicationToMavenRepository != null && signLinuxX64Publication != null) {
+        publishLinuxArm64PublicationToMavenRepository.dependsOn(signLinuxX64Publication)
+    }
 }
diff --git a/ktor-utils/js/src/io/ktor/util/logging/KtorSimpleLoggerJs.kt b/ktor-utils/js/src/io/ktor/util/logging/KtorSimpleLoggerJs.kt
@@ -9,10 +9,11 @@ import io.ktor.util.*
 @Suppress("FunctionName")
 public actual fun KtorSimpleLogger(name: String): Logger = object : Logger {
 
+    @OptIn(kotlin.ExperimentalStdlibApi::class)
     override val level: LogLevel = when (PlatformUtils.IS_NODE) {
         true -> runCatching { js("process.env.KTOR_LOG_LEVEL") as String? }
             .getOrNull()
-            ?.let { rawLevel: String -> LogLevel.entries.firstOrNull { it.name == rawLevel } }
+            ?.let { rawLevel: String -> LogLevel.values().firstOrNull { it.name == rawLevel } }
             ?: LogLevel.INFO
 
         false -> LogLevel.TRACE