From fb2024b1707ce29282138a05db0bf3d970c7e1e4 Mon Sep 17 00:00:00 2001
From: Anton Holmberg <aholmberg@spotify.com>
Date: Fri, 10 Jul 2026 12:44:17 +0100
Subject: [PATCH] Fix duplicate sources artifact and DokkaJar output collision
 in publishing

AGP 8.7.3 auto-includes sources in the component's published variants,
so the manual artifact(sourcesJar) created a duplicate that broke signing.
Also differentiate DokkaJar output filenames per flavor to avoid task
output path collisions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 auth-lib/build.gradle.kts | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/auth-lib/build.gradle.kts b/auth-lib/build.gradle.kts
index c9b819e..a2457c8 100644
--- a/auth-lib/build.gradle.kts
+++ b/auth-lib/build.gradle.kts
@@ -191,10 +191,6 @@ afterEvaluate {
                 "../docs/"
             }
 
-            val sourceDirs = variant.sourceSets.flatMap {
-                it.javaDirectories + it.resourcesDirectories
-            }
-
             val dokkaTaskName = "${variant.name}Dokka"
             if (tasks.findByName(dokkaTaskName) == null) {
                 tasks.register(dokkaTaskName, DokkaTask::class.java) {
@@ -242,28 +238,19 @@ afterEvaluate {
             if (tasks.findByName(dokkaJarTaskName) == null) {
                 tasks.register(dokkaJarTaskName, org.gradle.jvm.tasks.Jar::class.java) {
                     dependsOn(dokkaTaskName)
+                    archiveAppendix.set(variant.flavorName)
                     archiveClassifier.set("javadoc")
                     from(file(javaDocDir))
                 }
             }
 
-            val sourcesJarTaskName = "${variant.name}SourcesJar"
-            if (tasks.findByName(sourcesJarTaskName) == null) {
-                tasks.register(sourcesJarTaskName, org.gradle.jvm.tasks.Jar::class.java) {
-                    from(sourceDirs)
-                    archiveClassifier.set("sources")
-                }
-            }
-
             val dokkaJar = tasks.named(dokkaJarTaskName)
-            val sourcesJar = tasks.named(sourcesJarTaskName)
 
             publications {
                 create<MavenPublication>("${variant.flavorName}Release") {
                     from(components["${variant.flavorName}Release"])
                     val suffix = if (flavored) "-${variant.flavorName}" else ""
                     artifact(dokkaJar)
-                    artifact(sourcesJar)
                     groupId = project.group.toString()
                     version = project.version.toString()
                     artifactId = archivesBaseName + suffix