From 14337ccb46773f6e6eda178ede90287e00d2b079 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 10 Sep 2023 17:09:08 +0600 Subject: [PATCH 1/8] start 0.20.7 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e55282c550d..19de88c02fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.20.7 + ## 0.20.6 * `Repos`: diff --git a/gradle.properties b/gradle.properties index a622fccaba0..2cac0d3ca27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.20.6 -android_code_version=212 +version=0.20.7 +android_code_version=213 From f17613f3fb8970cad8d76880d7c331f93b7c7567 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 12 Sep 2023 14:11:12 +0600 Subject: [PATCH 2/8] update dependencies --- extensions.gradle | 6 ++++++ gradle/libs.versions.toml | 7 ++++--- mppProjectWithSerializationAndCompose.gradle | 7 +++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/extensions.gradle b/extensions.gradle index 1028b0c59b3..4b54bd9526c 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -19,6 +19,12 @@ allprojects { } releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" + String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] + String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() + composePluginKotlinVersion = compilerPluginVersionFromProperties + if (compilerPluginVersionFromProperties == null) { + composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions + } mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 438c59a0de1..76bb0ff511c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] -kt = "1.9.10" +kt = "1.9.20-Beta" +compose-kotlin = "1.5.2.1-Beta" kt-serialization = "1.6.0" kt-coroutines = "1.7.3" @@ -21,7 +22,7 @@ koin = "3.4.3" okio = "3.5.0" -ksp = "1.9.10-1.0.13" +ksp = "1.9.20-Beta-1.0.13" kotlin-poet = "1.14.2" versions = "0.47.0" @@ -29,7 +30,7 @@ versions = "0.47.0" android-gradle = "7.4.2" dexcount = "4.0.0" -android-coreKtx = "1.10.1" +android-coreKtx = "1.12.0" android-recyclerView = "1.3.1" android-appCompat = "1.6.1" android-fragment = "1.6.1" diff --git a/mppProjectWithSerializationAndCompose.gradle b/mppProjectWithSerializationAndCompose.gradle index d05dcb9f3b6..d806eb0f6ea 100644 --- a/mppProjectWithSerializationAndCompose.gradle +++ b/mppProjectWithSerializationAndCompose.gradle @@ -73,3 +73,10 @@ java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + + +compose { + if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { + kotlinCompilerPlugin.set(composePluginKotlinVersion) + } +} From 3da9eb9dbe70a919c3df3217c898c15c0193aa30 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 22 Sep 2023 14:14:23 +0600 Subject: [PATCH 3/8] temporal update --- gradle/libs.versions.toml | 8 ++++---- mppAndroidProject.gradle | 2 +- mppProjectWithSerialization.gradle | 2 +- mppProjectWithSerializationAndCompose.gradle | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76bb0ff511c..fd460573084 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kt = "1.9.20-Beta" -compose-kotlin = "1.5.2.1-Beta" +kt = "1.9.20-Beta2" +compose-kotlin = "1.5.2.1-Beta2" kt-serialization = "1.6.0" kt-coroutines = "1.7.3" @@ -22,10 +22,10 @@ koin = "3.4.3" okio = "3.5.0" -ksp = "1.9.20-Beta-1.0.13" +ksp = "1.9.20-Beta2-1.0.13" kotlin-poet = "1.14.2" -versions = "0.47.0" +versions = "0.48.0" android-gradle = "7.4.2" dexcount = "4.0.0" diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle index 7bd45386817..f98ea63e24b 100644 --- a/mppAndroidProject.gradle +++ b/mppAndroidProject.gradle @@ -4,7 +4,7 @@ project.group = "$group" apply from: "$publishGradlePath" kotlin { - android { + androidTarget { publishAllLibraryVariants() } diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index 2ed6bff423d..2907f5b0415 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -15,7 +15,7 @@ kotlin { browser() nodejs() } - android { + androidTarget { publishAllLibraryVariants() } linuxX64() diff --git a/mppProjectWithSerializationAndCompose.gradle b/mppProjectWithSerializationAndCompose.gradle index d806eb0f6ea..485e1b9b449 100644 --- a/mppProjectWithSerializationAndCompose.gradle +++ b/mppProjectWithSerializationAndCompose.gradle @@ -15,7 +15,7 @@ kotlin { browser() nodejs() } - android { + androidTarget { publishAllLibraryVariants() } From 1593159a3fd7e56017bcf4c51b41edcc65f05abd Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 26 Sep 2023 01:27:20 +0600 Subject: [PATCH 4/8] Update libs.versions.toml --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd460573084..bf3c4a3f21d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ kt-coroutines = "1.7.3" kslog = "1.2.1" jb-compose = "1.5.1" -jb-exposed = "0.43.0" +jb-exposed = "0.44.0" jb-dokka = "1.9.0" korlibs = "4.0.10" @@ -36,7 +36,7 @@ android-appCompat = "1.6.1" android-fragment = "1.6.1" android-espresso = "3.5.1" android-test = "1.1.5" -android-compose-material3 = "1.1.1" +android-compose-material3 = "1.1.2" android-props-minSdk = "21" android-props-compileSdk = "34" From eef6e811346fcf3edd49cd2c75b43042ed81034d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 26 Sep 2023 01:28:36 +0600 Subject: [PATCH 5/8] Update libs.versions.toml --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bf3c4a3f21d..13f4e9fd57e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ ktor = "2.3.4" gh-release = "2.4.1" -koin = "3.4.3" +koin = "3.5.0" okio = "3.5.0" From 0fb9b8dc30b8dad2848e4d705bcd3236e22fdbc8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 27 Sep 2023 17:59:09 +0600 Subject: [PATCH 6/8] update compose version --- extensions.gradle | 12 ++++++------ gradle/libs.versions.toml | 4 ++-- mppProjectWithSerializationAndCompose.gradle | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extensions.gradle b/extensions.gradle index 4b54bd9526c..7cc0fcefac7 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -19,12 +19,12 @@ allprojects { } releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" - String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] - String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() - composePluginKotlinVersion = compilerPluginVersionFromProperties - if (compilerPluginVersionFromProperties == null) { - composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions - } +// String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] +// String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() +// composePluginKotlinVersion = compilerPluginVersionFromProperties +// if (compilerPluginVersionFromProperties == null) { +// composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions +// } mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13f4e9fd57e..60a4a41d3b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] kt = "1.9.20-Beta2" -compose-kotlin = "1.5.2.1-Beta2" +#compose-kotlin = "1.5.10-beta02" kt-serialization = "1.6.0" kt-coroutines = "1.7.3" kslog = "1.2.1" -jb-compose = "1.5.1" +jb-compose = "1.5.10-beta02" jb-exposed = "0.44.0" jb-dokka = "1.9.0" diff --git a/mppProjectWithSerializationAndCompose.gradle b/mppProjectWithSerializationAndCompose.gradle index 485e1b9b449..7bafc1d7ca2 100644 --- a/mppProjectWithSerializationAndCompose.gradle +++ b/mppProjectWithSerializationAndCompose.gradle @@ -75,8 +75,8 @@ java { } -compose { - if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { - kotlinCompilerPlugin.set(composePluginKotlinVersion) - } -} +//compose { +// if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { +// kotlinCompilerPlugin.set(composePluginKotlinVersion) +// } +//} From f0d5035cd04e700da84c6e75d5f677860583b713 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 9 Oct 2023 13:53:44 +0600 Subject: [PATCH 7/8] update dependencies --- gradle.properties | 2 +- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2cac0d3ca27..0f441b06300 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ kotlin.incremental.js=true #kotlin.experimental.tryK2=true android.useAndroidX=true android.enableJetifier=true -org.gradle.jvmargs=-Xmx2g +org.gradle.jvmargs=-Xmx2500m # JS NPM diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60a4a41d3b3..b9ee7922ef2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,18 +14,18 @@ jb-dokka = "1.9.0" korlibs = "4.0.10" uuid = "0.8.1" -ktor = "2.3.4" +ktor = "2.3.5" gh-release = "2.4.1" koin = "3.5.0" -okio = "3.5.0" +okio = "3.6.0" ksp = "1.9.20-Beta2-1.0.13" kotlin-poet = "1.14.2" -versions = "0.48.0" +versions = "0.49.0" android-gradle = "7.4.2" dexcount = "4.0.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 98debb84d51..068cdb2dc26 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.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7090566041bb9d6fac5bb91b9d3b20ae7f4788ba Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 9 Oct 2023 13:58:17 +0600 Subject: [PATCH 8/8] fill changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19de88c02fc..904e84386ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ ## 0.20.7 +**THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO BETA VERSIONS. USE WITH CAUTION** + +* `Versions`: + * `Kotlin`: `1.9.10` -> `1.9.20-Beta2` + * `Compose`: `1.5.1` -> `1.5.10-beta02` + * `Exposed`: `0.43.0` -> `0.44.0` + * `Ktor`: `2.3.4` -> `2.3.5` + * `Koin`: `3.4.3` -> `3.5.0` + * `Okio`: `3.5.0` -> `3.6.0` + * `Android Core`: `1.10.1` -> `1.12.0` + * `Android Compose Material`: `1.1.1` -> `1.1.2` + ## 0.20.6 * `Repos`: