Merge pull request #103 from mikepenz/develop

dev -> main

Author: mikepenz

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ macos-latest, ubuntu-latest, windows-latest ]
+        os: [ macos-latest ]
 
     runs-on: ${{matrix.os}}
 
@@ -54,26 +54,6 @@ jobs:
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
         run: ./gradlew publishAllPublicationsToMavenCentralRepository
 
-      - name: Publish the windows artifact
-        if: matrix.os == 'windows-latest'
-        env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
-        run: ./gradlew publishMingwX64PublicationToMavenCentralRepository
-
-      - name: Publish the linux artifact
-        if: matrix.os == 'ubuntu-latest'
-        env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
-        run: ./gradlew publishLinuxX64PublicationToMavenCentralRepository
-
   build:
     name: Build
     runs-on: ubuntu-latest

app/build.gradle.kts

@@ -7,13 +7,13 @@ plugins {
     id("com.mikepenz.convention.android-application")
     id("com.mikepenz.convention.compose")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("com.codingfeline.buildkonfig") version "0.16.0"
+    id("com.codingfeline.buildkonfig") version "0.17.1"
 }
 
 kotlin {
     @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "composeApp"
+        outputModuleName = "composeApp"
         browser {
             commonWebpackConfig {
                 outputFileName = "composeApp.js"
@@ -168,6 +168,13 @@ buildkonfig {
 }
 
 aboutLibraries {
-    registerAndroidTasks = false
-    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+    android {
+        registerAndroidTasks = false
+    }
+    library {
+        duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+    }
+    export {
+        outputFile = file("src/commonMain/composeResources/files/aboutlibraries.json")
+    }
 }

app/src/commonMain/composeResources/files/aboutlibraries.json

@@ -11,6 +11,7 @@ plugins {
     alias(baseLibs.plugins.dokka)
     alias(baseLibs.plugins.mavenPublish) apply false
     alias(baseLibs.plugins.binaryCompatiblityValidator) apply false
+    alias(baseLibs.plugins.versionCatalogUpdate) apply false
 
 
     alias(libs.plugins.baselineprofile) apply false

build.gradle.kts

@@ -4,8 +4,8 @@ kotlin.code.style=official
 # Publishing
 ##################################
 GROUP=com.mikepenz
-VERSION_NAME=2.1.0-rc01
-VERSION_CODE=2010
+VERSION_NAME=2.2.0
+VERSION_CODE=2020
 
 POM_DESCRIPTION=Storyblok
 POM_GITHUB_REPO=mikepenz/storyblok-mp-SDK
@@ -26,10 +26,8 @@ [email protected]
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
-
-# Compile JS for legacy backend and new IR backend.
-kotlin.js.compiler=both
+kotlin.native.ignoreDisabledTargets=true
+kotlin.native.enableKlibsCrossCompilation=true
 
 # Compose
 org.jetbrains.compose.experimental.uikit.enabled=true
@@ -39,4 +37,7 @@ org.jetbrains.compose.experimental.macos.enabled=true
 
 # Dokka
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
-org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
+# convention plugin
+com.mikepenz.version-catalog-update.enabled=true

gradle.properties

@@ -1,22 +1,22 @@
 [versions]
-androidx-benchmark = "1.3.3"
-datetime = "0.6.1"
-serialization = "1.8.0"
-ktor = "3.1.0"
+androidx-benchmark = "1.3.4"
+datetime = "0.6.2"
+serialization = "1.8.1"
+ktor = "3.1.2"
 kermit = "2.0.5"
-koin = "4.0.2"
-kmp-nativecoroutines = "1.0.0-ALPHA-39"
-kmp-observeablevm = "1.0.0-BETA-9"
+koin = "4.0.4"
+kmp-nativecoroutines = "1.0.0-ALPHA-42"
+kmp-observeablevm = "1.0.0-BETA-10"
+androidx-lifecycle = "2.8.7"
 
 [plugins]
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidx-benchmark" }
 kmp-nativecoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "kmp-nativecoroutines" }
 
 [libraries]
-androidx-activity-compose = "androidx.activity:activity-compose:1.10.0"
+androidx-activity-compose = "androidx.activity:activity-compose:1.10.1"
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
 kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
-
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
@@ -25,21 +25,19 @@ ktor-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
 ktor-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-compose-multiplatform = { module = "io.insert-koin:koin-compose", version.ref = "koin" }
-
 kmp-viewmodel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmp-observeablevm" }
-
 # sample app
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
-
 # legacy sample app
-androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
-androidx-lifecycle-viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 
 [bundles]
-ktor = ["ktor-core", "ktor-content-negotiation", "ktor-json"]
-
-
+ktor = [
+    "ktor-content-negotiation",
+    "ktor-core",
+    "ktor-json",
+]

gradle/libs.versions.toml

@@ -22,7 +22,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.1.6")
+            from("com.mikepenz:version-catalog:0.3.3")
         }
     }
 }

settings.gradle.kts

@@ -345,7 +345,7 @@ class Storyblok(
         private val API_ENDPOINT = Endpoints.EU.host
         private val API_PATH = Endpoints.EU.path
 
-        private const val SDK_VERSION = "2.1.0-rc01"
+        private const val SDK_VERSION = "2.2.0"
         private const val SDK_USER_AGENT = "storyblok-sdk-android/$SDK_VERSION"
 
         private const val VERSION_PUBLISHED = "published"