Merge branch 'allenschobersonos-main'

touchlab · Apr 15, 2024 · cd1c879 · cd1c879
2 parents 882d836 + c65129d
commit cd1c879
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/kmmbridge/src/main/kotlin/co/touchlab/faktory/KmmBridgeExtension.kt b/kmmbridge/src/main/kotlin/co/touchlab/faktory/KmmBridgeExtension.kt
@@ -73,8 +73,8 @@ interface KmmBridgeExtension {
      * the name in here.
      */
     @Suppress("unused")
-    fun Project.mavenPublishArtifacts(repository: String? = null, publication: String? = null) {
-        artifactManager.setAndFinalize(MavenPublishArtifactManager(this, publication, repository))
+    fun Project.mavenPublishArtifacts(repository: String? = null, publication: String? = null, artifactSuffix: String? = null) {
+        artifactManager.setAndFinalize(MavenPublishArtifactManager(this, publication, artifactSuffix, repository))
     }
 
     @Suppress("unused")

diff --git a/kmmbridge/src/main/kotlin/co/touchlab/faktory/artifactmanager/MavenPublishArtifactManager.kt b/kmmbridge/src/main/kotlin/co/touchlab/faktory/artifactmanager/MavenPublishArtifactManager.kt
@@ -20,18 +20,19 @@ private const val KMMBRIDGE_ARTIFACT_SUFFIX = "kmmbridge"
 class MavenPublishArtifactManager(
     val project: Project,
     private val publicationName: String?,
-    private val repositoryName: String?
-) : ArtifactManager {
+    artifactSuffix: String?,
+    private val repositoryName: String?,
+    ) : ArtifactManager {
     private val group: String = project.group.toString().replace(".", "/")
-    private val kmmbridgeArtifactId = "${project.name}-$KMMBRIDGE_ARTIFACT_SUFFIX"
+    private val kmmbridgeArtifactId = "${project.name}-${artifactSuffix ?: KMMBRIDGE_ARTIFACT_SUFFIX}"
 
     override fun configure(
         project: Project,
         version: String,
         uploadTask: TaskProvider<Task>,
         kmmPublishTask: TaskProvider<Task>
     ) {
-        project.publishingExtension.publications.create(FRAMEWORK_PUBLICATION_NAME, MavenPublication::class.java) {
+        project.publishingExtension.publications.create(publicationName ?: FRAMEWORK_PUBLICATION_NAME, MavenPublication::class.java) {
             this.version = version
             val archiveProvider = project.tasks.named("zipXCFramework", Zip::class.java).flatMap {
                 it.archiveFile