From 0a03bbb981b1a32bc8020bd3c2d819bce9329837 Mon Sep 17 00:00:00 2001 From: arvifox Date: Mon, 17 Jun 2024 13:08:45 +0300 Subject: [PATCH] version up --- android-foundation | 2 +- build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- .../main/java/jp/co/soramitsu/common/util/ext/StringExt.kt | 6 +++--- common_wallet/build.gradle.kts | 2 +- core_db/build.gradle.kts | 2 +- core_di/build.gradle.kts | 2 +- demeter/build.gradle.kts | 2 +- feature_account_api/build.gradle.kts | 2 +- feature_account_impl/build.gradle.kts | 2 +- feature_assets_api/build.gradle.kts | 2 +- feature_assets_impl/build.gradle.kts | 2 +- feature_blockexplorer_api/build.gradle.kts | 2 +- feature_blockexplorer_impl/build.gradle.kts | 2 +- feature_ecosystem_impl/build.gradle.kts | 2 +- feature_ethereum_api/build.gradle.kts | 2 +- feature_ethereum_impl/build.gradle.kts | 2 +- feature_main_api/build.gradle.kts | 2 +- feature_main_impl/build.gradle.kts | 2 +- feature_multiaccount_api/build.gradle.kts | 2 +- feature_multiaccount_impl/build.gradle.kts | 2 +- feature_polkaswap_api/build.gradle.kts | 2 +- feature_polkaswap_impl/build.gradle.kts | 2 +- feature_referral_api/build.gradle.kts | 2 +- feature_referral_impl/build.gradle.kts | 2 +- feature_select_node_api/build.gradle.kts | 2 +- feature_select_node_impl/build.gradle.kts | 2 +- feature_sora_card_api/build.gradle.kts | 2 +- feature_sora_card_impl/build.gradle.kts | 2 +- feature_wallet_api/build.gradle.kts | 2 +- feature_wallet_impl/build.gradle.kts | 2 +- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- network/build.gradle.kts | 2 +- sorasubstrate/build.gradle.kts | 2 +- test_data/build.gradle.kts | 2 +- test_shared/build.gradle.kts | 2 +- 38 files changed, 41 insertions(+), 41 deletions(-) diff --git a/android-foundation b/android-foundation index c98ef9805..a5be15486 160000 --- a/android-foundation +++ b/android-foundation @@ -1 +1 @@ -Subproject commit c98ef9805eb9b8c08dac3ab1ba87f84392d662bb +Subproject commit a5be154865d8cb01051f6fc827126487210de7c9 diff --git a/build.gradle.kts b/build.gradle.kts index 736222178..be00f5677 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { alias(libs.plugins.firebaseCrashlyticsPlugin) apply false alias(libs.plugins.firebaseAppDistributionPlugin) apply false alias(libs.plugins.triplet) apply false - id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false + id("com.google.devtools.ksp") version "1.9.24-1.0.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.5" } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index d438141eb..2f1fe911f 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -38,7 +38,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/common/src/main/java/jp/co/soramitsu/common/util/ext/StringExt.kt b/common/src/main/java/jp/co/soramitsu/common/util/ext/StringExt.kt index e7c34acbb..798d35c58 100644 --- a/common/src/main/java/jp/co/soramitsu/common/util/ext/StringExt.kt +++ b/common/src/main/java/jp/co/soramitsu/common/util/ext/StringExt.kt @@ -46,7 +46,7 @@ import java.nio.charset.CodingErrorAction import java.nio.charset.StandardCharsets import java.util.Locale import java.util.regex.Pattern -import jp.co.soramitsu.androidfoundation.format.hexPrefix +import jp.co.soramitsu.androidfoundation.format.HEX_PREFIX import jp.co.soramitsu.common.util.SoraColoredClickableSpan fun String.parseOtpCode(): String { @@ -73,14 +73,14 @@ fun String.getInitials(): String { fun String.splitVersions() = split(".").map { it.toInt() } fun String.isErc20Address(): Boolean { - return this.split(" ").size == 1 && this.startsWith(hexPrefix) + return this.split(" ").size == 1 && this.startsWith(HEX_PREFIX) } fun String.didToAccountId(): String { return this.replace(":", "_") + "@sora" } -fun String.addHexPrefix(): String = "${hexPrefix}$this" +fun String.addHexPrefix(): String = "${HEX_PREFIX}$this" fun String.removeWebPrefix(): String = this.removePrefix("http://").removePrefix("https://").removePrefix("www.") diff --git a/common_wallet/build.gradle.kts b/common_wallet/build.gradle.kts index ce9cabbf2..1fffe83f4 100644 --- a/common_wallet/build.gradle.kts +++ b/common_wallet/build.gradle.kts @@ -20,7 +20,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/core_db/build.gradle.kts b/core_db/build.gradle.kts index 1b81b0399..50cf57402 100644 --- a/core_db/build.gradle.kts +++ b/core_db/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } testOptions { diff --git a/core_di/build.gradle.kts b/core_di/build.gradle.kts index a84bd83d7..dccd89a63 100644 --- a/core_di/build.gradle.kts +++ b/core_di/build.gradle.kts @@ -13,7 +13,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/demeter/build.gradle.kts b/demeter/build.gradle.kts index ac402e81b..054b9b29d 100644 --- a/demeter/build.gradle.kts +++ b/demeter/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_account_api/build.gradle.kts b/feature_account_api/build.gradle.kts index bd8c71750..7699155be 100644 --- a/feature_account_api/build.gradle.kts +++ b/feature_account_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_account_impl/build.gradle.kts b/feature_account_impl/build.gradle.kts index 24605f903..dde8449e1 100644 --- a/feature_account_impl/build.gradle.kts +++ b/feature_account_impl/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_assets_api/build.gradle.kts b/feature_assets_api/build.gradle.kts index 31d2117d3..45dea4da7 100644 --- a/feature_assets_api/build.gradle.kts +++ b/feature_assets_api/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_assets_impl/build.gradle.kts b/feature_assets_impl/build.gradle.kts index bbcd8a95c..c559c09ca 100644 --- a/feature_assets_impl/build.gradle.kts +++ b/feature_assets_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_blockexplorer_api/build.gradle.kts b/feature_blockexplorer_api/build.gradle.kts index 823df56cf..004271340 100644 --- a/feature_blockexplorer_api/build.gradle.kts +++ b/feature_blockexplorer_api/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_blockexplorer_impl/build.gradle.kts b/feature_blockexplorer_impl/build.gradle.kts index 66e68e984..1cd753e70 100644 --- a/feature_blockexplorer_impl/build.gradle.kts +++ b/feature_blockexplorer_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_ecosystem_impl/build.gradle.kts b/feature_ecosystem_impl/build.gradle.kts index 878b579c8..0863ddce2 100644 --- a/feature_ecosystem_impl/build.gradle.kts +++ b/feature_ecosystem_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_ethereum_api/build.gradle.kts b/feature_ethereum_api/build.gradle.kts index 39925dbf4..a85fcca4c 100644 --- a/feature_ethereum_api/build.gradle.kts +++ b/feature_ethereum_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_ethereum_impl/build.gradle.kts b/feature_ethereum_impl/build.gradle.kts index 077446d8e..d89859133 100644 --- a/feature_ethereum_impl/build.gradle.kts +++ b/feature_ethereum_impl/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_main_api/build.gradle.kts b/feature_main_api/build.gradle.kts index 520ca480c..749222530 100644 --- a/feature_main_api/build.gradle.kts +++ b/feature_main_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_main_impl/build.gradle.kts b/feature_main_impl/build.gradle.kts index 41a2786b2..782f64aca 100644 --- a/feature_main_impl/build.gradle.kts +++ b/feature_main_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_multiaccount_api/build.gradle.kts b/feature_multiaccount_api/build.gradle.kts index 858e876fe..c6af5676a 100644 --- a/feature_multiaccount_api/build.gradle.kts +++ b/feature_multiaccount_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_multiaccount_impl/build.gradle.kts b/feature_multiaccount_impl/build.gradle.kts index 2bdf9f531..eb7333fb7 100644 --- a/feature_multiaccount_impl/build.gradle.kts +++ b/feature_multiaccount_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_polkaswap_api/build.gradle.kts b/feature_polkaswap_api/build.gradle.kts index 40b7dc28a..5f6c69386 100644 --- a/feature_polkaswap_api/build.gradle.kts +++ b/feature_polkaswap_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_polkaswap_impl/build.gradle.kts b/feature_polkaswap_impl/build.gradle.kts index e6bfe0f16..297b57c17 100644 --- a/feature_polkaswap_impl/build.gradle.kts +++ b/feature_polkaswap_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_referral_api/build.gradle.kts b/feature_referral_api/build.gradle.kts index 8b25cf72a..95a0ba19b 100644 --- a/feature_referral_api/build.gradle.kts +++ b/feature_referral_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_referral_impl/build.gradle.kts b/feature_referral_impl/build.gradle.kts index e11437da6..219396951 100644 --- a/feature_referral_impl/build.gradle.kts +++ b/feature_referral_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_select_node_api/build.gradle.kts b/feature_select_node_api/build.gradle.kts index dfe22064d..be9dae9a9 100644 --- a/feature_select_node_api/build.gradle.kts +++ b/feature_select_node_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_select_node_impl/build.gradle.kts b/feature_select_node_impl/build.gradle.kts index c47ea0371..0312cc2d1 100644 --- a/feature_select_node_impl/build.gradle.kts +++ b/feature_select_node_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_sora_card_api/build.gradle.kts b/feature_sora_card_api/build.gradle.kts index 6f55472bf..292c93838 100644 --- a/feature_sora_card_api/build.gradle.kts +++ b/feature_sora_card_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_sora_card_impl/build.gradle.kts b/feature_sora_card_impl/build.gradle.kts index d165d65e6..c42587b25 100644 --- a/feature_sora_card_impl/build.gradle.kts +++ b/feature_sora_card_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_wallet_api/build.gradle.kts b/feature_wallet_api/build.gradle.kts index 898d268dd..e8f8e4870 100644 --- a/feature_wallet_api/build.gradle.kts +++ b/feature_wallet_api/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/feature_wallet_impl/build.gradle.kts b/feature_wallet_impl/build.gradle.kts index 641a39e7b..4f8fa5e4c 100644 --- a/feature_wallet_impl/build.gradle.kts +++ b/feature_wallet_impl/build.gradle.kts @@ -19,7 +19,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/gradle.properties b/gradle.properties index bc80a1b1f..21646fd0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,4 +46,4 @@ android.defaults.buildfeatures.shaders=false android.nonTransitiveRClass=false android.nonFinalResIds=false -composeCompilerVersion=1.5.8 +composeCompilerVersion=1.5.14 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f7b145f7f..550c69983 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -agp = "8.3.0" -kotlin = "1.9.22" +agp = "8.5.0" +kotlin = "1.9.24" appcompat = "1.6.1" coroutines = "1.7.3" coreKtx = "1.12.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbb0a111f..4b792ab3e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jan 13 13:13:48 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/network/build.gradle.kts b/network/build.gradle.kts index 553d548ec..2d35ac5e0 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -16,7 +16,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/sorasubstrate/build.gradle.kts b/sorasubstrate/build.gradle.kts index 7ef969f61..a9f3927a5 100644 --- a/sorasubstrate/build.gradle.kts +++ b/sorasubstrate/build.gradle.kts @@ -17,7 +17,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/test_data/build.gradle.kts b/test_data/build.gradle.kts index b65579c36..aec956db8 100644 --- a/test_data/build.gradle.kts +++ b/test_data/build.gradle.kts @@ -15,7 +15,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/test_shared/build.gradle.kts b/test_shared/build.gradle.kts index 61cf68841..e16cd7169 100644 --- a/test_shared/build.gradle.kts +++ b/test_shared/build.gradle.kts @@ -15,7 +15,7 @@ android { compileSdk = 34 defaultConfig { - minSdk = 24 + minSdk = 26 multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }