From 96fe63994b24fcb125d86acad42b74ca9b1c1ca3 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Mon, 17 Jan 2022 13:19:30 +0100 Subject: [PATCH 1/2] - update to kotlin 1.6.10 - update gradle to 7.3.3 --- build.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 26ee042..b48844b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,12 +8,12 @@ buildscript { ] setup = [ - kotlin : '1.5.31', + kotlin : '1.6.10', compileSdk: 31, buildTools: "31.0.0", minSdk : 21, targetSdk : 30, - dokka : "1.6.0" + dokka : "1.6.10" ] versions = [ @@ -27,12 +27,12 @@ buildscript { iconics : "5.3.3", fastadapter : '5.6.0', materialdrawer : '9.0.0-a03', - aboutLibraries : '10.0.0-b02', + aboutLibraries : '10.0.0-b07', ktor : "1.6.5", kermit : "1.0.2", - kotlinxSerialization: "1.3.1", + kotlinxSerialization: "1.3.2", kotlinxDateTime : "0.3.1", - kotlinCoroutines : "1.5.2", + kotlinCoroutines : "1.6.0", // ktx activityKtx : "1.4.0", lifecycleKtx : "2.4.0", @@ -49,7 +49,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:7.0.3" + classpath "com.android.tools.build:gradle:7.0.4" classpath "com.vanniktech:gradle-maven-publish-plugin:0.18.0" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${setup.kotlin}" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3cd8500..669386b 100644 --- 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.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 3da45c1..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright ? 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?, -# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?; -# * compound commands having a testable exit status, especially ?case?; -# * various built-in commands including ?command?, ?set?, and ?ulimit?. +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # From 5e14c257a1323e7dc13c73d96607d37a023c6005 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Mon, 17 Jan 2022 13:30:34 +0100 Subject: [PATCH 2/2] - [release] v1.2.0 --- gradle.properties | 4 ++-- .../commonMain/kotlin/com/mikepenz/storyblok/sdk/Storyblok.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 679953e..0880ceb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Maven stuff GROUP=com.mikepenz -VERSION_NAME=1.1.4 -VERSION_CODE=1104 +VERSION_NAME=1.2.0 +VERSION_CODE=1200 POM_URL=https://github.com/mikepenz/storyblok-mp-SDK 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 index 3320429..697646c 100644 --- 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 @@ -299,7 +299,7 @@ class Storyblok constructor( private const val API_ENDPOINT = "api.storyblok.com" private const val API_VERSION = "v2" - private const val SDK_VERSION = "1.1.4" + private const val SDK_VERSION = "1.2.0" private const val SDK_USER_AGENT = "storyblok-sdk-android/$SDK_VERSION" private const val VERSION_PUBLISHED = "published"