Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change artifactId #733

Merged
merged 1 commit into from
Nov 10, 2024
Merged

Change artifactId #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions ktorfit-lib-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 {
}
Expand Down
23 changes: 5 additions & 18 deletions ktorfit-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("multiplatform")
Expand All @@ -18,16 +19,7 @@ licensee {
val enableSigning = project.hasProperty("signingInMemoryKey")

mavenPublishing {
val artifactId =
"ktorfit-lib" +
if (libs.versions.ktorVersion
.get()
.startsWith("3.")
) {
"-ktor-" + libs.versions.ktorVersion.get()
} else {
""
}
val artifactId ="ktorfit-lib"
coordinates(
libs.versions.groupId.get(),
artifactId,
Expand All @@ -40,19 +32,14 @@ mavenPublishing {
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}

kotlin {
explicitApi()
if (libs.versions.ktorVersion
.get()
.startsWith("3.")
) {
@OptIn(ExperimentalWasmDsl::class)
wasmJs()
}
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs()
jvm {
}
js(IR) {
Expand Down
Loading