Merge branch 'refs/heads/master' into ktor3

Foso · Aug 12, 2024 · e9abe1c · e9abe1c
2 parents 678a93a + d9ffe4e
commit e9abe1c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/ktorfit-converters/call/build.gradle.kts b/ktorfit-converters/call/build.gradle.kts
@@ -21,10 +21,19 @@ licensee {
 val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
-
+    val artifactId =
+        "ktorfit-converters-call" +
+            if (libs.versions.ktorVersion
+                    .get()
+                    .startsWith("3.")
+            ) {
+                "-ktor-" + libs.versions.ktorVersion.get()
+            } else {
+                ""
+            }
     coordinates(
         libs.versions.groupId.get(),
-        "ktorfit-converters-call",
+        artifactId,
         libs.versions.ktorfitCallConverter.get(),
     )
     publishToMavenCentral()

diff --git a/ktorfit-converters/flow/build.gradle.kts b/ktorfit-converters/flow/build.gradle.kts
@@ -22,10 +22,19 @@ licensee {
 val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
-
+    val artifactId =
+        "ktorfit-converters-flow" +
+            if (libs.versions.ktorVersion
+                    .get()
+                    .startsWith("3.")
+            ) {
+                "-ktor-" + libs.versions.ktorVersion.get()
+            } else {
+                ""
+            }
     coordinates(
         libs.versions.groupId.get(),
-        "ktorfit-converters-flow",
+        artifactId,
         libs.versions.ktorfitFlowConverter.get(),
     )
     publishToMavenCentral()

diff --git a/ktorfit-converters/response/build.gradle.kts b/ktorfit-converters/response/build.gradle.kts
@@ -22,10 +22,19 @@ licensee {
 val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
-
+    val artifactId =
+        "ktorfit-converters-response" +
+            if (libs.versions.ktorVersion
+                    .get()
+                    .startsWith("3.")
+            ) {
+                "-ktor-" + libs.versions.ktorVersion.get()
+            } else {
+                ""
+            }
     coordinates(
         libs.versions.groupId.get(),
-        "ktorfit-converters-response",
+        artifactId,
         libs.versions.ktorfitResponseConverter.get(),
     )
     publishToMavenCentral()