From de161003ecc92c5a2620be10c07b1768702e79fa Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Wed, 24 Feb 2021 12:04:16 +0100 Subject: [PATCH] Add release scripts, version bump, dokka downgrade --- buildSrc/src/main/kotlin/Deps.kt | 4 +-- .../build.gradle.kts | 31 ++++++++----------- publishLinuxToMaven.sh | 5 +++ publishMacToMaven.sh | 4 +++ publishWindowsToMaven.sh | 5 +++ 5 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 publishLinuxToMaven.sh create mode 100644 publishMacToMaven.sh create mode 100644 publishWindowsToMaven.sh diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index 94e3818..7a2a221 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -21,7 +21,7 @@ object Versions { val kotlinSerializationPlugin = "1.4.10" val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val nodePlugin = "1.3.0" - val dokkaPlugin = "1.4.20" + val dokkaPlugin = "1.4.0-rc" val taskTreePlugin = "1.5" val kotlinBigNumVersion = "0.2.8-SNAPSHOT" val jna = "5.7.0" @@ -41,7 +41,7 @@ object Versions { object ReleaseInfo { val group = "com.ionspin.kotlin" val version = "0.1.0-SNAPSHOT" - val bindingsVersion = "0.8.0-SNAPSHOT" + val bindingsVersion = "0.8.1-SNAPSHOT" } object Deps { diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts index cb5fe7f..9a6db71 100644 --- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts +++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts @@ -591,28 +591,22 @@ tasks.whenTaskAdded { tasks { - dokkaHtml { - println("Dokka Html!") + + dokkaJavadoc { + println("Dokka !") dokkaSourceSets { - named("commonMain") { -// displayName.set("common") -// platform.set(Platform.common) - moduleName.set("Kotlin Multiplatform Libsodium Bindings") - includes.from( - "src/commonMain/kotlin/com.ionspin.kotlin.crypto/aead/Aead.md", - "src/commonMain/kotlin/com.ionspin.kotlin.crypto/auth/Auth.md", - "src/commonMain/kotlin/com.ionspin.kotlin.crypto/box/Box.md", - "src/commonMain/kotlin/com.ionspin.kotlin.crypto/generichash/GenericHash.md", - "src/commonMain/kotlin/com.ionspin.kotlin.crypto/CryptoModule.md") - displayName.set("Kotlin multiplatform") - } - configureEach { - if (name != "commonMain") { - suppress.set(true) - } + create("commonMain") { + displayName = "common" + platform = "common" } } } + + create("javadocJar") { + dependsOn(dokkaJavadoc) + archiveClassifier.set("javadoc") + from(dokkaJavadoc.get().outputDirectory) + } if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { val jvmTest by getting(Test::class) { testLogging { @@ -701,6 +695,7 @@ signing { publishing { publications.withType(MavenPublication::class) { + artifact(tasks["javadocJar"]) pom { name.set("Kotlin Multiplatform Crypto") description.set("Kotlin Multiplatform Crypto library") diff --git a/publishLinuxToMaven.sh b/publishLinuxToMaven.sh new file mode 100644 index 0000000..bf18f98 --- /dev/null +++ b/publishLinuxToMaven.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +./gradlew publishAllPublicationsToMavenRepository + + diff --git a/publishMacToMaven.sh b/publishMacToMaven.sh new file mode 100644 index 0000000..d12fb6b --- /dev/null +++ b/publishMacToMaven.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +./gradlew publishAllPublicationsToMavenRepository -x publishKotlinMultiplatformPublicationToMavenRepository -x publishMetadataPublicationToMavenRepository -x publishJvmPublicationToMavenRepository + diff --git a/publishWindowsToMaven.sh b/publishWindowsToMaven.sh new file mode 100644 index 0000000..f300fe6 --- /dev/null +++ b/publishWindowsToMaven.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +./gradlew publishMingwX64PublicationToMavenRepository + +