Merge branch 'refs/heads/master' into 720-android-app-crashes-if-not-…

…using-ktor-platform-client # Conflicts: # ktorfit-lib/build.gradle.kts
Foso · Nov 10, 2024 · d426124 · d426124
2 parents fdcbbe1 + 4289868
commit d426124
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/ktorfit-lib-core/build.gradle.kts b/ktorfit-lib-core/build.gradle.kts
@@ -54,15 +54,7 @@ val enableSigning = project.hasProperty("signingInMemoryKey")
 mavenPublishing {
 
     val artifactId =
-        "ktorfit-lib-light" +
-            if (libs.versions.ktorVersion
-                    .get()
-                    .startsWith("3.")
-            ) {
-                "-ktor-" + libs.versions.ktorVersion.get()
-            } else {
-                ""
-            }
+        "ktorfit-lib-light"
     coordinates(
         libs.versions.groupId.get(),
         artifactId,
@@ -80,13 +72,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 }
 
 kotlin {
-    if (libs.versions.ktorVersion
-            .get()
-            .startsWith("3.")
-    ) {
-        @OptIn(ExperimentalWasmDsl::class)
-        wasmJs()
-    }
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+    wasmJs()
     explicitApi()
     jvm {
     }

diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts
@@ -18,7 +18,7 @@ licensee {
 val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
-    val artifactId = "ktorfit-lib"
+    val artifactId ="ktorfit-lib"
     coordinates(
         libs.versions.groupId.get(),
         artifactId,