Skip to content

Commit d426124

Browse files
committed
Merge branch 'refs/heads/master' into 720-android-app-crashes-if-not-using-ktor-platform-client
# Conflicts: # ktorfit-lib/build.gradle.kts
2 parents fdcbbe1 + 4289868 commit d426124

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

ktorfit-lib-core/build.gradle.kts

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,7 @@ val enableSigning = project.hasProperty("signingInMemoryKey")
5454
mavenPublishing {
5555

5656
val artifactId =
57-
"ktorfit-lib-light" +
58-
if (libs.versions.ktorVersion
59-
.get()
60-
.startsWith("3.")
61-
) {
62-
"-ktor-" + libs.versions.ktorVersion.get()
63-
} else {
64-
""
65-
}
57+
"ktorfit-lib-light"
6658
coordinates(
6759
libs.versions.groupId.get(),
6860
artifactId,
@@ -80,13 +72,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
8072
}
8173

8274
kotlin {
83-
if (libs.versions.ktorVersion
84-
.get()
85-
.startsWith("3.")
86-
) {
87-
@OptIn(ExperimentalWasmDsl::class)
88-
wasmJs()
89-
}
75+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
76+
wasmJs()
9077
explicitApi()
9178
jvm {
9279
}

ktorfit-lib/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ licensee {
1818
val enableSigning = project.hasProperty("signingInMemoryKey")
1919

2020
mavenPublishing {
21-
val artifactId = "ktorfit-lib"
21+
val artifactId ="ktorfit-lib"
2222
coordinates(
2323
libs.versions.groupId.get(),
2424
artifactId,

0 commit comments

Comments
 (0)