From 8d9bef7f81293b5edc5888bf2ab443e13e99658e Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Sat, 23 Mar 2024 18:23:16 +0100 Subject: [PATCH 1/2] Generate javadoc artifacts with Dokka plugin to fix SonaType publication --- CHANGELOG.md | 1 + kase64/build.gradle.kts | 14 ++++++++++++-- settings.gradle.kts | 3 +-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bfd645..2ea4307 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +- Provide javadoc artifacts for Sonatype Maven Central ## [1.1.0] - 2023-09-14 ### Changed diff --git a/kase64/build.gradle.kts b/kase64/build.gradle.kts index f3329ee..d56c4d0 100644 --- a/kase64/build.gradle.kts +++ b/kase64/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") id("com.android.library") + id("org.jetbrains.dokka") `maven-publish` signing } @@ -20,8 +21,10 @@ kotlin { applyDefaultHierarchyTemplate() - sourceSets["commonTest"].dependencies { - implementation(kotlin("test")) + sourceSets { + commonTest.dependencies { + implementation(kotlin("test")) + } } } @@ -43,6 +46,13 @@ version = "1.1.0" publishing { publications.withType { + artifact(project.tasks.register("${name}DokkaJar", Jar::class) { + group = JavaBasePlugin.DOCUMENTATION_GROUP + description = "Assembles Kotlin docs with Dokka into a Javadoc jar" + archiveClassifier.set("javadoc") + from(tasks.named("dokkaHtml")) + archiveBaseName.set("${archiveBaseName.get()}-$name") + }) pom { name.set("Kase64") description.set("Base64 encoder/decoder for Kotlin/Multiplatform. Supports Android, iOS, JavaScript and plain JVM environments.") diff --git a/settings.gradle.kts b/settings.gradle.kts index e798424..a57d6d4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,8 +7,7 @@ pluginManagement { plugins { kotlin("multiplatform") version "1.9.23" id("com.android.library") version "8.2.2" - `maven-publish` - signing + id("org.jetbrains.dokka") version "1.9.20" } } From 686fe0e608dc85a01ff1e98d2a3b0c08e3151ef4 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Sat, 23 Mar 2024 18:29:11 +0100 Subject: [PATCH 2/2] Release version 1.1.1 Signed-off-by: Sascha Peilicke --- CHANGELOG.md | 2 ++ README.md | 2 +- kase64/build.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ea4307..44017ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.1.1] - 2024-03-23 - Provide javadoc artifacts for Sonatype Maven Central ## [1.1.0] - 2023-09-14 diff --git a/README.md b/README.md index e1e1d16..57240f4 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ repositories { } dependencies { - implementation("de.peilicke.sascha:kase64:1.1.0") + implementation("de.peilicke.sascha:kase64:1.1.1") } ``` diff --git a/kase64/build.gradle.kts b/kase64/build.gradle.kts index d56c4d0..ee193e8 100644 --- a/kase64/build.gradle.kts +++ b/kase64/build.gradle.kts @@ -42,7 +42,7 @@ android { } group = "de.peilicke.sascha" -version = "1.1.0" +version = "1.1.1" publishing { publications.withType {