From 2ddfffa6a989a90f07f0377b8f366637d9f7de76 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 27 Jun 2023 16:46:45 +0600 Subject: [PATCH 1/4] start 0.19.6 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c773c885f5..b45350d4dc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.19.6 + ## 0.19.5 * `Repos`: diff --git a/gradle.properties b/gradle.properties index e033b2b0042..f7bc64b2496 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.19.5 -android_code_version=201 +version=0.19.6 +android_code_version=202 From bd2b5ae5fcbbf074eb7e906d2aa8e67ff0f340e6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 27 Jun 2023 16:46:45 +0600 Subject: [PATCH 2/4] add versions plugin --- build.gradle | 5 +++++ gradle/libs.versions.toml | 4 ++++ versions_plugin_setup.gradle | 11 +++++++++++ 3 files changed, 20 insertions(+) create mode 100644 versions_plugin_setup.gradle diff --git a/build.gradle b/build.gradle index a16dd8dd48e..1bd84cf99f1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,10 @@ buildscript { } } +plugins { + alias(libs.plugins.versions) +} + allprojects { repositories { mavenLocal() @@ -38,3 +42,4 @@ allprojects { apply from: "./extensions.gradle" apply from: "./github_release.gradle" +apply from: "./versions_plugin_setup.gradle" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c697d57c4a4..23791e6ff26 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,8 @@ okio = "3.3.0" ksp = "1.8.20-1.0.11" kotlin-poet = "1.14.2" +versions = "0.47.0" + android-gradle = "7.4.2" dexcount = "4.0.0" @@ -109,3 +111,5 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra [plugins] jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } + +versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } diff --git a/versions_plugin_setup.gradle b/versions_plugin_setup.gradle new file mode 100644 index 00000000000..2e971237cae --- /dev/null +++ b/versions_plugin_setup.gradle @@ -0,0 +1,11 @@ +def isNonStable = { String version -> + def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) } + def regex = /^[0-9,.v-]+(-r)?$/ + return !stableKeyword && !(version ==~ regex) +} + +tasks.named("dependencyUpdates").configure { + rejectVersionIf { + isNonStable(it.candidate.version) + } +} From 8110c42be0d8e88083e9c101fbfa3cfbb236ea1a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 27 Jun 2023 16:53:10 +0600 Subject: [PATCH 3/4] update compose --- CHANGELOG.md | 3 +++ gradle/libs.versions.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b45350d4dc3..aa227ae8efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.19.6 +* `Versions`: + * `Compose`: `1.4.0` -> `1.4.1` + ## 0.19.5 * `Repos`: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 23791e6ff26..d035c68995e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kt-coroutines = "1.6.4" kslog = "1.1.1" -jb-compose = "1.4.0" +jb-compose = "1.4.1" jb-exposed = "0.41.1" jb-dokka = "1.8.20" From ae546dd9ad270c31ed32b03f5bd4032b1397c10f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 29 Jun 2023 18:38:58 +0600 Subject: [PATCH 4/4] update dependencies --- CHANGELOG.md | 4 +++- gradle/libs.versions.toml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa227ae8efa..646ca13027d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,9 @@ ## 0.19.6 * `Versions`: - * `Compose`: `1.4.0` -> `1.4.1` + * `Coroutines`: `1.6.4` -> `1.7.1` + * `Ktor`: `2.3.1` -> `2.3.2` + * `Compose`: `1.4.0` -> `1.4.1` ## 0.19.5 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d035c68995e..f0ab140bebe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kt = "1.8.20" kt-serialization = "1.5.1" -kt-coroutines = "1.6.4" +kt-coroutines = "1.7.1" kslog = "1.1.1" @@ -13,7 +13,7 @@ jb-dokka = "1.8.20" korlibs = "4.0.3" uuid = "0.7.1" -ktor = "2.3.1" +ktor = "2.3.2" gh-release = "2.4.1"