diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index c16f566..27989ce 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -8,6 +8,9 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 1.8 + - name: Fix android 31.0.0 dx + continue-on-error: true + run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar - name: Update version run: | branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" @@ -15,7 +18,8 @@ jobs: - name: prebuild run: ./gradlew clean build - name: Publish package - run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signAndroidReleasePublication + continue-on-error: true + run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signAndroidReleasePublication -x signAndroidDebugPublication -x signAndroidReleasePublication env: GITHUBPACKAGES_USER: ${{ github.actor }} GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/regular_build.yml b/.github/workflows/regular_build.yml deleted file mode 100644 index 73f3f3d..0000000 --- a/.github/workflows/regular_build.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Regular build -on: [push] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: build - run: ./gradlew clean build diff --git a/CHANGELOG.md b/CHANGELOG.md index 667a9c0..d54460c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.6.4 + +* Versions + * `Kotlin`: `1.5.31` + * `Coroutines`: `1.5.2` + * `Klock`: `2.4.2` + * `Androidx Work`: `2.6.0` + ## 0.6.3 * Versions diff --git a/build.gradle b/build.gradle index 9b0dbb8..96f5111 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.github.breadmoirai:github-release:$github_release_plugin_version" classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version" - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:4.2.2' } } diff --git a/gradle.properties b/gradle.properties index e5a170a..4637242 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ android.useAndroidX=true android.enableJetifier=false -kotlin_version=1.5.30 -kotlin_coroutines_version=1.5.1 +kotlin_version=1.5.31 +kotlin_coroutines_version=1.5.2 -dokka_version=1.5.0 +dokka_version=1.5.30 -klockVersion=2.4.0 +klockVersion=2.4.2 ## Github reease @@ -22,16 +22,16 @@ github_release_plugin_version=2.2.12 ## Android android_minSdkVersion=19 -android_compileSdkVersion=30 -android_buildToolsVersion=30.0.3 +android_compileSdkVersion=31 +android_buildToolsVersion=31.0.0 dexcount_version=3.0.0 junit_version=4.12 test_ext_junit_version=1.1.2 espresso_core=3.3.0 -androidx_work_version=2.5.0 +androidx_work_version=2.6.0 ## Common -version=0.6.3 -android_code_version=7 +version=0.6.4 +android_code_version=8