diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml index 64143588..1a18e826 100644 --- a/.github/workflows/release-deploy.yml +++ b/.github/workflows/release-deploy.yml @@ -13,7 +13,7 @@ jobs: java-version: 17 - uses: little-core-labs/get-git-tag@v3.0.2 - name: deploy-release - run: ./gradlew :compose:publishDefaultPublicationToOSSHRRepository -PreleaseMode=RELEASE --stacktrace + run: ./gradlew :compose:publishReleasePublicationToOSSHRRepository -PreleaseMode=RELEASE --stacktrace env: GH_TOKEN: ${{ secrets.GH_TOKEN }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/buildSrc/src/main/kotlin/Deployment.kt b/buildSrc/src/main/kotlin/Deployment.kt index 70df49c7..8b2533c5 100644 --- a/buildSrc/src/main/kotlin/Deployment.kt +++ b/buildSrc/src/main/kotlin/Deployment.kt @@ -62,54 +62,12 @@ object Deployment { project.plugins.apply("maven-publish") - val (component, additionalArtifacts) = when { - project.extensions.findByType(LibraryExtension::class) != null -> { - val android = project.extensions.findByType(LibraryExtension::class)!! - val main = android.sourceSets.getByName("main") - val sourcesJar by project.tasks.creating(Jar::class) { - archiveClassifier.set("sources") - from((main.kotlin as DefaultAndroidSourceDirectorySet).srcDirs) - val moduleMetadata = project.tasks.findByName("generateMetadataFileForDefaultPublication") as GenerateModuleMetadata - dependsOn(moduleMetadata) - } - val javadocJar by project.tasks.creating(Jar::class) { - archiveClassifier.set("javadoc") - val dokka = project.tasks.findByName("dokkaJavadoc") as DokkaTask - from(dokka.outputDirectory) - dependsOn(dokka) - } - - Pair(project.components["release"], listOf(sourcesJar, javadocJar)) - } - project.the(JavaPluginConvention::class) != null -> { - val javaPlugin = project.the(JavaPluginConvention::class) - - val sourcesJar by project.tasks.creating(Jar::class) { - archiveClassifier.set("sources") - from(javaPlugin.sourceSets["main"].allSource) - } - val javadocJar by project.tasks.creating(Jar::class) { - archiveClassifier.set("javadoc") - from(javaPlugin.docsDir) - dependsOn("javadoc") - } - - Pair(project.components["java"], listOf(sourcesJar, javadocJar)) - } - else -> { - throw RuntimeException("Unknown plugin") - } - } - project.configure { publications { - create("default", MavenPublication::class.java) { + create("release", MavenPublication::class.java) { groupId = PackageInfo.groupId customizePom(pom) - additionalArtifacts.forEach { - artifact(it) - } - from(component) + from(project.components["release"]) } } repositories { diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 2e2a5ef5..3b6ea20f 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -27,6 +27,13 @@ android { kotlin { jvmToolchain(17) } + + publishing { + singleVariant("release") { + withJavadocJar() + withSourcesJar() + } + } } dependencies {