Merge pull request #14 from saschpe/updates-again

Publishing fixes
saschpe · Sep 14, 2023 · 3caf1a4 · 3caf1a4
2 parents 968a85f + 1ace914
commit 3caf1a4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Kase64
 
-![Kotlin Version](https://img.shields.io/badge/Kotlin-1.7.10-B125EA?logo=kotlin)
-[![Maven Central](https://img.shields.io/maven-central/v/de.peilicke.sascha/kase64.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22de.peilicke.sascha%22%20AND%20a:%22kase64%22)
-[![Build Status](https://github.com/saschpe/kase64/workflows/Main%20CI/badge.svg)](https://github.com/saschpe/kase64/actions)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.9.10-B125EA?logo=kotlin)](https://kotlinlang.org)
+[![Maven Central](https://img.shields.io/maven-central/v/de.peilicke.sascha/kase64.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/de.peilicke.sascha/kase64)
+[![Build Status](https://github.com/saschpe/kase64/workflows/Main/badge.svg)](https://github.com/saschpe/kase64/actions)
 [![License](http://img.shields.io/:License-Apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 ![badge-android](http://img.shields.io/badge/Platform-Android-brightgreen.svg?logo=android)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
-    kotlin("jvm") version "1.9.10"
-    id("com.android.library") version "8.1.0-rc01" apply false
     id("com.diffplug.spotless") version "6.21.0"
-    id("com.github.ben-manes.versions") version "0.47.0"
+    id("com.github.ben-manes.versions") version "0.48.0"
 }
 
 spotless {
@@ -11,6 +9,7 @@ spotless {
         propertiesFile("gradle.properties")
     }
     kotlin {
+        target("**/*.kt")
         ktlint()
     }
     kotlinGradle {

diff --git a/kase64/build.gradle.kts b/kase64/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("multiplatform")
-    id("com.android.library")
+    kotlin("multiplatform") version "1.9.10"
+    id("com.android.library") version "8.1.0-rc01"
     `maven-publish`
     signing
 }
@@ -31,17 +31,13 @@ kotlin {
     sourceSets["iosSimulatorArm64Test"].dependsOn(sourceSets["iosTest"])
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 android {
-    compileSdk = 33
     namespace = "saschpe.kase64"
 
     defaultConfig {
+        compileSdk = 33
         minSdk = 17
     }
 
@@ -51,14 +47,8 @@ android {
 group = "de.peilicke.sascha"
 version = "1.0.7"
 
-val javadocJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
-}
-
 publishing {
     publications.withType<MavenPublication> {
-        artifact(javadocJar.get())
-
         pom {
             name.set("Kase64")
             description.set("Base64 encoder/decoder for Kotlin/Multiplatform. Supports Android, iOS, JavaScript and plain JVM environments.")

diff --git a/kase64/src/commonMain/kotlin/saschpe/kase64/Base64Internal.kt b/kase64/src/commonMain/kotlin/saschpe/kase64/Base64Internal.kt
@@ -22,12 +22,12 @@ internal sealed interface Encoding {
     val alphabet: String
     val requiresPadding: Boolean
 
-    object Standard : Encoding {
+    data object Standard : Encoding {
         override val alphabet: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
         override val requiresPadding: Boolean = true
     }
 
-    object UrlSafe : Encoding {
+    data object UrlSafe : Encoding {
         override val alphabet: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
         override val requiresPadding: Boolean = false // Padding is optional
     }