Merge pull request #68 from mikepenz/develop

dev -> main
mikepenz · Mar 11, 2022 · 0c6d96e · 0c6d96e
2 parents 0bb72bc + c9889d9
commit 0c6d96e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,33 +10,33 @@ buildscript {
         setup = [
                 kotlin    : '1.6.10',
                 compileSdk: 31,
-                buildTools: "31.0.0",
+                buildTools: "32.0.0",
                 minSdk    : 21,
                 targetSdk : 30,
                 dokka     : "1.6.10"
         ]
 
         versions = [
                 annotation          : '1.0.1',
-                appcompat           : '1.3.1',
+                appcompat           : '1.4.1',
                 recyclerView        : '1.2.1',
                 drawerlayout        : '1.1.1',
-                constraintLayout    : '2.1.2',
+                constraintLayout    : '2.1.3',
                 cardView            : '1.0.0',
                 okhttp              : '4.9.3',
                 iconics             : "5.3.3",
                 fastadapter         : '5.6.0',
-                materialdrawer      : '9.0.0-a03',
-                aboutLibraries      : '10.0.0-b07',
+                materialdrawer      : '9.0.0-b01',
+                aboutLibraries      : '10.0.0',
                 ktor                : "1.6.5",
-                kermit              : "1.0.2",
+                kermit              : "1.0.3",
                 kotlinxSerialization: "1.3.2",
                 kotlinxDateTime     : "0.3.1",
                 kotlinCoroutines    : "1.6.0",
                 // ktx
                 activityKtx         : "1.4.0",
-                lifecycleKtx        : "2.4.0",
-                viewModelKtx        : "2.4.0",
+                lifecycleKtx        : "2.4.1",
+                viewModelKtx        : "2.4.1",
                 // other
                 detekt              : '1.19.0',
         ]

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Maven stuff
 GROUP=com.mikepenz
-VERSION_NAME=1.2.0
-VERSION_CODE=1200
+VERSION_NAME=1.2.1
+VERSION_CODE=1201
 
 POM_URL=https://github.com/mikepenz/storyblok-mp-SDK
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/storyblok-mp-sdk/src/commonMain/kotlin/com/mikepenz/storyblok/sdk/Storyblok.kt b/storyblok-mp-sdk/src/commonMain/kotlin/com/mikepenz/storyblok/sdk/Storyblok.kt
@@ -2,6 +2,7 @@ package com.mikepenz.storyblok.sdk
 
 import com.mikepenz.storyblok.sdk.http.provideClient
 import com.mikepenz.storyblok.sdk.model.*
+import com.mikepenz.storyblok.sdk.util.parameter
 import io.ktor.client.*
 import io.ktor.client.features.json.*
 import io.ktor.client.features.json.serializer.*
@@ -299,7 +300,7 @@ class Storyblok constructor(
         private const val API_ENDPOINT = "api.storyblok.com"
         private const val API_VERSION = "v2"
 
-        private const val SDK_VERSION = "1.2.0"
+        private const val SDK_VERSION = "1.2.1"
         private const val SDK_USER_AGENT = "storyblok-sdk-android/$SDK_VERSION"
 
         private const val VERSION_PUBLISHED = "published"

diff --git a/storyblok-mp-sdk/src/commonMain/kotlin/com/mikepenz/storyblok/sdk/util/Utils.kt b/storyblok-mp-sdk/src/commonMain/kotlin/com/mikepenz/storyblok/sdk/util/Utils.kt
@@ -0,0 +1,10 @@
+package com.mikepenz.storyblok.sdk.util
+
+import io.ktor.client.request.*
+
+/**
+ * Sets a single URL query parameter of [key] with a specific [value] Array if the value is not null. Can not be used to set
+ * form parameters in the body.
+ */
+fun HttpRequestBuilder.parameter(key: String, value: Array<String>?): Unit =
+    value?.let { url.parameters.append(key, it.joinToString(",")) } ?: Unit