diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cae6b4..8968e6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [macOS-latest, ubuntu-18.04] + os: [macOS-latest, ubuntu-latest, windows-latest] runs-on: ${{matrix.os}} @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'zulu' java-version: '15' - name: Copy CI gradle.properties @@ -41,33 +41,22 @@ jobs: restore-keys: | gradle-${{ runner.os }}- - - name: Prepare Sonatype Gradle properties - run: | - echo "signing.keyId=${{ secrets.SONATYPE_GPG_KEY }}" >> ~/.gradle/gradle.properties - echo "signing.password=${{ secrets.SONATYPE_GPG_PASS }}" >> ~/.gradle/gradle.properties - echo "${{ secrets.SONATYPE_GPG_FILE }}" > opensource.gpg.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.gpg.asc" > "$HOME/.gradle/opensource.gpg" - echo "signing.secretKeyRingFile=$HOME/.gradle/opensource.gpg" >> ~/.gradle/gradle.properties - - - name: Prepare Sonatype Gradle properties - Secret (Unix) - if: matrix.os != 'windows-latest' - run: | - echo "${{ secrets.SONATYPE_GPG_FILE }}" > opensource.gpg.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.gpg.asc" > ~/.gradle/opensource.gpg - echo "signing.secretKeyRingFile=$HOME/.gradle/opensource.gpg" >> ~/.gradle/gradle.properties - - - name: Prepare Sonatype Gradle properties - Secret (Windows) - if: matrix.os == 'windows-latest' - run: | - echo "${{ secrets.SONATYPE_GPG_FILE }}" > opensource.gpg.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.gpg.asc" > ~/.gradle/opensource.gpg - echo "signing.secretKeyRingFile=$HOME\\.gradle\\opensource.gpg" >> ~/.gradle/gradle.properties + - name: Cache konan + uses: actions/cache@v2 + with: + path: ~/.konan + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + gradle-${{ runner.os }}- - name: Publish the macOS artifacts if: matrix.os == 'macOS-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 publishAllPublicationsToMavenRepository --no-daemon - name: Publish the windows artifact @@ -75,13 +64,19 @@ jobs: 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 publishMingwPublicationToMavenRepository - name: Publish the linux artifact - if: matrix.os == 'ubuntu-18.04' + 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 publishLinuxX64PublicationToMavenRepository build: diff --git a/build.gradle b/build.gradle index dbe77fe..26ee042 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { buildTools: "31.0.0", minSdk : 21, targetSdk : 30, - dokka : "1.5.31" + dokka : "1.6.0" ] versions = [ @@ -21,16 +21,16 @@ buildscript { appcompat : '1.3.1', recyclerView : '1.2.1', drawerlayout : '1.1.1', - constraintLayout : '2.1.1', + constraintLayout : '2.1.2', cardView : '1.0.0', - okhttp : '4.9.2', - iconics : "5.3.2", - fastadapter : '5.5.1', - materialdrawer : '9.0.0-a01', - aboutLibraries : '10.0.0-a01', + okhttp : '4.9.3', + iconics : "5.3.3", + fastadapter : '5.6.0', + materialdrawer : '9.0.0-a03', + aboutLibraries : '10.0.0-b02', ktor : "1.6.5", - kermit : "0.3.0-m1", - kotlinxSerialization: "1.3.0", + kermit : "1.0.2", + kotlinxSerialization: "1.3.1", kotlinxDateTime : "0.3.1", kotlinCoroutines : "1.5.2", // ktx @@ -38,7 +38,7 @@ buildscript { lifecycleKtx : "2.4.0", viewModelKtx : "2.4.0", // other - detekt : '1.18.1', + detekt : '1.19.0', ] } diff --git a/gradle.properties b/gradle.properties index 238936c..679953e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Maven stuff GROUP=com.mikepenz -VERSION_NAME=1.1.3 -VERSION_CODE=1103 +VERSION_NAME=1.1.4 +VERSION_CODE=1104 POM_URL=https://github.com/mikepenz/storyblok-mp-SDK diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4ab16c..3cd8500 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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sample-common/src/androidMain/kotlin/com/mikepenz/common/repository/actual.kt b/sample-common/src/androidMain/kotlin/com/mikepenz/common/repository/actual.kt index 92ce796..989369e 100755 --- a/sample-common/src/androidMain/kotlin/com/mikepenz/common/repository/actual.kt +++ b/sample-common/src/androidMain/kotlin/com/mikepenz/common/repository/actual.kt @@ -1,6 +1,7 @@ package com.mikepenz.common.repository -import co.touchlab.kermit.LogcatLogger +import co.touchlab.kermit.LogcatWriter import co.touchlab.kermit.Logger +import co.touchlab.kermit.StaticConfig -actual fun getLogger(): Logger = LogcatLogger() \ No newline at end of file +actual fun getLogger(): Logger = Logger(StaticConfig(logWriterList = listOf(LogcatWriter()))) \ No newline at end of file diff --git a/sample-common/src/commonMain/kotlin/com/mikepenz/common/repository/StoryblokRepository.kt b/sample-common/src/commonMain/kotlin/com/mikepenz/common/repository/StoryblokRepository.kt index 1ab1550..f040613 100755 --- a/sample-common/src/commonMain/kotlin/com/mikepenz/common/repository/StoryblokRepository.kt +++ b/sample-common/src/commonMain/kotlin/com/mikepenz/common/repository/StoryblokRepository.kt @@ -11,7 +11,7 @@ class StoryblokRepository(token: String) { private val storyblok = Storyblok(token) suspend fun fetchStories(): List { - logger.d("fetchStories", "Repo") + logger.d("Repo") return storyblok.fetchStories() } } diff --git a/sample-common/src/iosMain/kotlin/com/mikepenz/common/repository/actual.kt b/sample-common/src/iosMain/kotlin/com/mikepenz/common/repository/actual.kt index d4e2d92..2193148 100755 --- a/sample-common/src/iosMain/kotlin/com/mikepenz/common/repository/actual.kt +++ b/sample-common/src/iosMain/kotlin/com/mikepenz/common/repository/actual.kt @@ -1,6 +1,7 @@ package com.mikepenz.common.repository +import co.touchlab.kermit.NSLogWriter import co.touchlab.kermit.Logger -import co.touchlab.kermit.NSLogLogger +import co.touchlab.kermit.StaticConfig -actual fun getLogger(): Logger = NSLogLogger() \ No newline at end of file +actual fun getLogger(): Logger = Logger(StaticConfig(logWriterList = listOf(NSLogWriter()))) \ No newline at end of file diff --git a/sample-common/src/jvmMain/kotlin/com/mikepenz/common/repository/actual.kt b/sample-common/src/jvmMain/kotlin/com/mikepenz/common/repository/actual.kt index 8f95f44..8a61496 100755 --- a/sample-common/src/jvmMain/kotlin/com/mikepenz/common/repository/actual.kt +++ b/sample-common/src/jvmMain/kotlin/com/mikepenz/common/repository/actual.kt @@ -1,6 +1,7 @@ package com.mikepenz.common.repository -import co.touchlab.kermit.CommonLogger +import co.touchlab.kermit.CommonWriter import co.touchlab.kermit.Logger +import co.touchlab.kermit.StaticConfig -actual fun getLogger(): Logger = CommonLogger() \ No newline at end of file +actual fun getLogger(): Logger = Logger(StaticConfig(logWriterList = listOf(CommonWriter()))) \ No newline at end of file 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 59c0ab2..3320429 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.3" + private const val SDK_VERSION = "1.1.4" private const val SDK_USER_AGENT = "storyblok-sdk-android/$SDK_VERSION" private const val VERSION_PUBLISHED = "published"