From 630f9bc0d40bd460acd0a1416208d4cf0583b94c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 23 Sep 2021 13:10:44 +0600 Subject: [PATCH 1/3] start 0.5.29 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab8f6034322..c1ffffa1375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.5.29 + ## 0.5.28 * `Versions`: diff --git a/gradle.properties b/gradle.properties index e5d77a2396c..6575a70e35c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,5 +45,5 @@ dokka_version=1.5.0 # Project data group=dev.inmo -version=0.5.28 -android_code_version=69 +version=0.5.29 +android_code_version=70 From f5bd4c5ccb9236b47432ff4f2542298ca09e6ee7 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 23 Sep 2021 13:12:03 +0600 Subject: [PATCH 2/3] update dependencies --- CHANGELOG.md | 3 +++ gradle.properties | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1ffffa1375..5d329d076c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.5.29 +* `Versions`: + * `Exposed`: `0.34.2` -> `0.35.1` + ## 0.5.28 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 6575a70e35c..a133ba5f0d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.5.31 kotlin_coroutines_version=1.5.2 kotlin_serialisation_core_version=1.2.2 -kotlin_exposed_version=0.34.2 +kotlin_exposed_version=0.35.1 ktor_version=1.6.3 @@ -27,8 +27,8 @@ androidx_recycler_version=1.2.1 appcompat_version=1.3.1 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 @@ -40,7 +40,7 @@ crypto_js_version=4.1.1 # Dokka -dokka_version=1.5.0 +dokka_version=1.5.30 # Project data From 0337d1b82d1204f1b160b808cc99a2b3e324ac63 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 23 Sep 2021 13:23:02 +0600 Subject: [PATCH 3/3] add fix of 31.0.0 for kdocs workflow --- .github/workflows/dokka_push.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dokka_push.yml b/.github/workflows/dokka_push.yml index 2c7d4fc4c88..2fefc23dbf6 100644 --- a/.github/workflows/dokka_push.yml +++ b/.github/workflows/dokka_push.yml @@ -11,6 +11,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: Build run: ./gradlew dokkaHtml - name: Publish KDocs