From 5916f3eebb876b4812394b130509b3c701d8384f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 19:29:54 +0600 Subject: [PATCH 1/9] start 0.6.4 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 667a9c0..fd24e12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.6.4 + ## 0.6.3 * Versions diff --git a/gradle.properties b/gradle.properties index e5a170a..65b5695 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,5 +33,5 @@ androidx_work_version=2.5.0 ## Common -version=0.6.3 -android_code_version=7 +version=0.6.4 +android_code_version=8 From 32bf5c0641fb2d7e9060eba2e96af5f12fcd36dd Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 19:34:04 +0600 Subject: [PATCH 2/9] update dependencies --- CHANGELOG.md | 5 +++++ gradle.properties | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd24e12..9a4a17d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 0.6.4 +* Versions + * `Kotlin`: `1.5.31` + * `Coroutines`: `1.5.2` + * `Klock`: `2.4.2` + ## 0.6.3 * Versions diff --git a/gradle.properties b/gradle.properties index 65b5695..4258b06 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 From 5798774b2dbd54fa1e81ac66a28819ec4fb0352d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 19:39:18 +0600 Subject: [PATCH 3/9] update androidx work dependency --- CHANGELOG.md | 1 + build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a4a17d..d54460c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * `Kotlin`: `1.5.31` * `Coroutines`: `1.5.2` * `Klock`: `2.4.2` + * `Androidx Work`: `2.6.0` ## 0.6.3 diff --git a/build.gradle b/build.gradle index 9b0dbb8..ec2db9f 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:7.0.2' } } diff --git a/gradle.properties b/gradle.properties index 4258b06..f57c2e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,7 +29,7 @@ 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 From 222542b38fb5611f67445529c8ab545843a04583 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 19:46:35 +0600 Subject: [PATCH 4/9] update version of build gradle tool --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec2db9f..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:7.0.2' + classpath 'com.android.tools.build:gradle:4.2.2' } } From ece767e4d03a732779d37ab84fb3fd26f794162c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 20:04:08 +0600 Subject: [PATCH 5/9] update android compile sdk version and build tools --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f57c2e2..4637242 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,8 +22,8 @@ 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 From b7ebd0ac1c53b14298919df6d33cdd526e6621e0 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 20:08:06 +0600 Subject: [PATCH 6/9] update workflows --- .github/workflows/publishing_packages.yml | 1 + .github/workflows/regular_build.yml | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .github/workflows/regular_build.yml diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index c16f566..97410f3 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -15,6 +15,7 @@ jobs: - name: prebuild run: ./gradlew clean build - name: Publish package + continue-on-error: true run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signAndroidReleasePublication env: GITHUBPACKAGES_USER: ${{ github.actor }} 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 From 001756ab9f6f407ceeb514520c706be9c81a3db3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 20:12:50 +0600 Subject: [PATCH 7/9] add fix for android build --- .github/workflows/publishing_packages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index 97410f3..14c9d00 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -8,6 +8,8 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 1.8 + - name: Fix android 31.0.0 dx + 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 "[^/]*$"`" From 3062f839af3323043dc8f8350322bf5b5f21700e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 20:20:13 +0600 Subject: [PATCH 8/9] fix for publishing packages --- .github/workflows/publishing_packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index 14c9d00..ae97dec 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -9,6 +9,7 @@ jobs: 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: | From 6aa40ad463edae327a910ed759cd64e2b239e569 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 22 Sep 2021 20:26:12 +0600 Subject: [PATCH 9/9] fix publication workflow script --- .github/workflows/publishing_packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publishing_packages.yml b/.github/workflows/publishing_packages.yml index ae97dec..27989ce 100644 --- a/.github/workflows/publishing_packages.yml +++ b/.github/workflows/publishing_packages.yml @@ -19,7 +19,7 @@ jobs: run: ./gradlew clean build - name: Publish package continue-on-error: true - run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signAndroidReleasePublication + 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 }}