From 9fc6107c49df6cc60f4d108be2f5e6eb4b450f04 Mon Sep 17 00:00:00 2001 From: arvifox Date: Mon, 7 Oct 2024 15:23:54 +0300 Subject: [PATCH] mwr-911 --- app/build.gradle.kts | 81 +++++++++---------- build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- common_wallet/build.gradle.kts | 2 +- core_db/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 +- .../assetdetails/AssetDetailsBalanceCard.kt | 2 +- feature_blockexplorer_api/build.gradle.kts | 2 +- feature_blockexplorer_impl/build.gradle.kts | 2 +- feature_ecosystem_impl/build.gradle.kts | 2 +- .../presentation/explore/ExploreFragment.kt | 3 +- feature_ethereum_api/build.gradle.kts | 2 +- feature_main_api/build.gradle.kts | 2 +- feature_main_impl/build.gradle.kts | 2 +- .../presentation/profile/ProfileScreen.kt | 18 ++--- feature_multiaccount_api/build.gradle.kts | 2 +- feature_multiaccount_impl/build.gradle.kts | 2 +- .../backup_password/BackupPasswordScreen.kt | 6 +- .../ImportAccountPasswordScreen.kt | 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 +- .../details/SoraCardMainSoraContentCard.kt | 2 +- feature_wallet_api/build.gradle.kts | 2 +- feature_wallet_impl/build.gradle.kts | 2 +- .../data/repository/WalletRepositoryImpl.kt | 3 +- gradle/libs.versions.toml | 31 ++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- network/build.gradle.kts | 2 +- sorasubstrate/build.gradle.kts | 2 +- test_data/build.gradle.kts | 2 +- 40 files changed, 104 insertions(+), 106 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aa2f30a4a..9d6efcade 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } // soralution 138 3.8.5.0 2024.09.06 @@ -280,47 +280,46 @@ kapt { correctErrorTypes = true } -koverReport { - androidReports("developDebug") { - filters { - excludes { - classes( - "*.BuildConfig", - "**.models.*", - "**.core.network.*", - "**.di.*", - "**.shared_utils.wsrpc.*", - "*NetworkDataSource", - "*NetworkDataSource\$*", - "*ChainConnection", - "*ChainConnection\$*", - "**.runtime.definitions.TypeDefinitionsTreeV2", - "**.runtime.definitions.TypeDefinitionsTreeV2\$*", - - // TODO: Coverage these modules by tests - "**.core.rpc.*", - "**.core.utils.*", - "**.core.extrinsic.*", - ) +kover { + reports { + variant("developDebug") { + xml { + onCheck = true + title = "sora wallet xml report" + xmlFile = file("${project.rootDir}/report/coverage.xml") } - } - - xml { - onCheck = false - } - - html { - onCheck = true - } - - verify { - onCheck = true - - rule { - isEnabled = true - - minBound(14) - // TODO: Update to 85 + html { + title = "sora wallet html report" + onCheck = true + charset = "UTF-8" + htmlDir.set(file("${project.rootDir}/htmlreport")) + } + verify { + rule { + minBound(14) + } + } + filters { + excludes { + classes( + "*.BuildConfig", + "**.models.*", + "**.core.network.*", + "**.di.*", + "**.shared_utils.wsrpc.*", + "*NetworkDataSource", + "*NetworkDataSource\$*", + "*ChainConnection", + "*ChainConnection\$*", + "**.runtime.definitions.TypeDefinitionsTreeV2", + "**.runtime.definitions.TypeDefinitionsTreeV2\$*", + + // TODO: Coverage these modules by tests + "**.core.rpc.*", + "**.core.utils.*", + "**.core.extrinsic.*", + ) + } } } } diff --git a/build.gradle.kts b/build.gradle.kts index be00f5677..a5147d8ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { alias(libs.plugins.firebaseAppDistributionPlugin) apply false alias(libs.plugins.triplet) 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" + id("org.jetbrains.kotlinx.kover") version "0.8.3" } tasks.register("clean", Delete::class) { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 2da5b1a91..3c71fa339 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -30,7 +30,7 @@ fun maybeWrapQuotes(s: String): String { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/common_wallet/build.gradle.kts b/common_wallet/build.gradle.kts index 56add40fe..b8cd6d887 100644 --- a/common_wallet/build.gradle.kts +++ b/common_wallet/build.gradle.kts @@ -12,7 +12,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/core_db/build.gradle.kts b/core_db/build.gradle.kts index 69be73846..501aa50d2 100644 --- a/core_db/build.gradle.kts +++ b/core_db/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/demeter/build.gradle.kts b/demeter/build.gradle.kts index e718715ce..935c5a0d0 100644 --- a/demeter/build.gradle.kts +++ b/demeter/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_account_api/build.gradle.kts b/feature_account_api/build.gradle.kts index b5c6473f6..55f5e9e69 100644 --- a/feature_account_api/build.gradle.kts +++ b/feature_account_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_account_impl/build.gradle.kts b/feature_account_impl/build.gradle.kts index 1736bdbf2..78ba05cd1 100644 --- a/feature_account_impl/build.gradle.kts +++ b/feature_account_impl/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_assets_api/build.gradle.kts b/feature_assets_api/build.gradle.kts index a24d325fe..f1f9b7641 100644 --- a/feature_assets_api/build.gradle.kts +++ b/feature_assets_api/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_assets_impl/build.gradle.kts b/feature_assets_impl/build.gradle.kts index 7412823c8..8c73ba098 100644 --- a/feature_assets_impl/build.gradle.kts +++ b/feature_assets_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt index 44cdcf20f..20905aa3d 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt @@ -208,7 +208,7 @@ internal fun AssetDetailsBalanceCard( AmountCardIcon( res = R.drawable.ic_buy_crypto, text = stringResource(id = R.string.common_buy), - enabled = false, + enabled = true, onClick = onBuyCryptoClick ) } diff --git a/feature_blockexplorer_api/build.gradle.kts b/feature_blockexplorer_api/build.gradle.kts index 17dcef38e..f89b0eff7 100644 --- a/feature_blockexplorer_api/build.gradle.kts +++ b/feature_blockexplorer_api/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_blockexplorer_impl/build.gradle.kts b/feature_blockexplorer_impl/build.gradle.kts index 8bb6ea06e..fa79f3a3b 100644 --- a/feature_blockexplorer_impl/build.gradle.kts +++ b/feature_blockexplorer_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_ecosystem_impl/build.gradle.kts b/feature_ecosystem_impl/build.gradle.kts index a1a177772..1a8708856 100644 --- a/feature_ecosystem_impl/build.gradle.kts +++ b/feature_ecosystem_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt index 05ee6d415..79dd48991 100644 --- a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt +++ b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt @@ -274,7 +274,8 @@ class ExploreFragment : SoraBaseFragment() { } HorizontalPager( - modifier = Modifier.fillMaxHeight(), state = pagerState, beyondBoundsPageCount = 1 + modifier = Modifier.fillMaxHeight(), + state = pagerState, ) { when (it) { ExplorePages.CURRENCIES.ordinal -> { diff --git a/feature_ethereum_api/build.gradle.kts b/feature_ethereum_api/build.gradle.kts index d996d7ae3..c2c14dc70 100644 --- a/feature_ethereum_api/build.gradle.kts +++ b/feature_ethereum_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_main_api/build.gradle.kts b/feature_main_api/build.gradle.kts index fcffd5a53..fd08046bb 100644 --- a/feature_main_api/build.gradle.kts +++ b/feature_main_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_main_impl/build.gradle.kts b/feature_main_impl/build.gradle.kts index 27f15be1b..b1ba382f3 100644 --- a/feature_main_impl/build.gradle.kts +++ b/feature_main_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileScreen.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileScreen.kt index dd939ca94..439e20f53 100644 --- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileScreen.kt +++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileScreen.kt @@ -85,15 +85,15 @@ internal fun ProfileItems( icon = R.drawable.ic_buy_crypto, onClick = onSoraCardClick, ) -// CategoryItem( -// modifier = Modifier -// .testTagAsId("BuyXor") -// .padding(top = Dimens.x2), -// title = stringResource(id = R.string.buy_crypto_buy_xor_with_fiat_title), -// subtitle = stringResource(id = R.string.buy_crypto_buy_xor_with_fiat_subtitle), -// icon = R.drawable.ic_settings_buy_crypto, -// onClick = onBuyCrypto, -// ) + CategoryItem( + modifier = Modifier + .testTagAsId("BuyXor") + .padding(top = Dimens.x2), + title = stringResource(id = R.string.buy_crypto_buy_xor_with_fiat_title), + subtitle = stringResource(id = R.string.buy_crypto_buy_xor_with_fiat_subtitle), + icon = R.drawable.ic_settings_buy_crypto, + onClick = onBuyCrypto, + ) } CategoryItem( modifier = Modifier diff --git a/feature_multiaccount_api/build.gradle.kts b/feature_multiaccount_api/build.gradle.kts index eeb436ecc..180469fc3 100644 --- a/feature_multiaccount_api/build.gradle.kts +++ b/feature_multiaccount_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_multiaccount_impl/build.gradle.kts b/feature_multiaccount_impl/build.gradle.kts index a775fea21..074fab84e 100644 --- a/feature_multiaccount_impl/build.gradle.kts +++ b/feature_multiaccount_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt index dbb3f52fa..edce49e21 100644 --- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt +++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt @@ -107,7 +107,7 @@ fun BackupPasswordScreen( keyboardOptions = KeyboardOptions.Default.copy( imeAction = ImeAction.Done, keyboardType = KeyboardType.Password, - autoCorrect = false + autoCorrectEnabled = false, ), ) @@ -128,7 +128,7 @@ fun BackupPasswordScreen( keyboardOptions = KeyboardOptions.Default.copy( imeAction = ImeAction.Done, keyboardType = KeyboardType.Password, - autoCorrect = false + autoCorrectEnabled = false, ), ) @@ -145,7 +145,7 @@ fun BackupPasswordScreen( .fillMaxWidth(), loading = state.isLoading, loaderSize = Size.Large, - ) { modifier, elevation -> + ) { modifier, _ -> FilledButton( modifier = modifier .fillMaxWidth(), diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt index b4af02b98..94be57782 100644 --- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt +++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt @@ -124,7 +124,7 @@ fun ImportAccountPasswordScreen( keyboardOptions = KeyboardOptions.Default.copy( imeAction = ImeAction.Done, keyboardType = KeyboardType.Password, - autoCorrect = false + autoCorrectEnabled = false, ), ) diff --git a/feature_polkaswap_api/build.gradle.kts b/feature_polkaswap_api/build.gradle.kts index 3957a7d9c..b63831b38 100644 --- a/feature_polkaswap_api/build.gradle.kts +++ b/feature_polkaswap_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_polkaswap_impl/build.gradle.kts b/feature_polkaswap_impl/build.gradle.kts index 1ddc98b0d..61f39b80f 100644 --- a/feature_polkaswap_impl/build.gradle.kts +++ b/feature_polkaswap_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_referral_api/build.gradle.kts b/feature_referral_api/build.gradle.kts index eff44a145..839137799 100644 --- a/feature_referral_api/build.gradle.kts +++ b/feature_referral_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_referral_impl/build.gradle.kts b/feature_referral_impl/build.gradle.kts index ae4201185..eaf6352e4 100644 --- a/feature_referral_impl/build.gradle.kts +++ b/feature_referral_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_select_node_api/build.gradle.kts b/feature_select_node_api/build.gradle.kts index ea55d05c5..c9ec667a0 100644 --- a/feature_select_node_api/build.gradle.kts +++ b/feature_select_node_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_select_node_impl/build.gradle.kts b/feature_select_node_impl/build.gradle.kts index 40555eb5a..bc06b7c18 100644 --- a/feature_select_node_impl/build.gradle.kts +++ b/feature_select_node_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_sora_card_api/build.gradle.kts b/feature_sora_card_api/build.gradle.kts index 130eaed23..d0e697a4b 100644 --- a/feature_sora_card_api/build.gradle.kts +++ b/feature_sora_card_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_sora_card_impl/build.gradle.kts b/feature_sora_card_impl/build.gradle.kts index 3fb9f7b22..b44b22f0a 100644 --- a/feature_sora_card_impl/build.gradle.kts +++ b/feature_sora_card_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardMainSoraContentCard.kt b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardMainSoraContentCard.kt index 579d9ced8..852c70fcd 100644 --- a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardMainSoraContentCard.kt +++ b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardMainSoraContentCard.kt @@ -180,7 +180,7 @@ fun SoraCardMainSoraContentCard( .padding(horizontal = Dimens.x1) .weight(1f), size = Size.Large, - enabled = false, + enabled = true, order = Order.PRIMARY, onClick = onExchangeXor, text = stringResource(id = jp.co.soramitsu.oauth.R.string.exchange_xor), diff --git a/feature_wallet_api/build.gradle.kts b/feature_wallet_api/build.gradle.kts index 619396621..04a6f05d9 100644 --- a/feature_wallet_api/build.gradle.kts +++ b/feature_wallet_api/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_wallet_impl/build.gradle.kts b/feature_wallet_impl/build.gradle.kts index 93ea84af1..26203450b 100644 --- a/feature_wallet_impl/build.gradle.kts +++ b/feature_wallet_impl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { val composeCompilerVersion: String by project kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt index 39a1e9f57..60966ff07 100644 --- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt +++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt @@ -129,8 +129,7 @@ class WalletRepositoryImpl @Inject constructor( val card = CardsHubMapper.map(cardLocal) when (card?.cardType) { CardHubType.GET_SORA_CARD -> if (soraCard) card else null -// CardHubType.BUY_XOR_TOKEN -> if (soraCard) card else null - CardHubType.BUY_XOR_TOKEN -> null + CardHubType.BUY_XOR_TOKEN -> if (soraCard) card else null else -> card } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4f50f0208..8b700441b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,21 @@ [versions] -agp = "8.6.0" +agp = "8.7.0" kotlin = "1.9.24" appcompat = "1.7.0" coroutines = "1.8.1" coreKtx = "1.13.1" constraint = "2.2.0-alpha05" biometric = "1.1.0" -navigation = "2.7.7" -navigationCompose = "2.7.7" +navigation = "2.8.2" +navigationCompose = "2.8.2" lottie = "4.2.0" insetter = "0.6.1" workManager = "2.9.1" -coil = "2.2.2" +coil = "2.7.0" svg = "1.4" jdenticon = "1.1" -archFragmentTest = "1.8.2" -mockk = "1.13.8" +archFragmentTest = "1.8.4" +mockk = "1.13.11" truth = "1.4.2" mockitoKotlin = "5.2.1" mockito = "5.2.0" @@ -23,14 +23,13 @@ junit = "4.13.2" androidxTestExtJunit = "1.2.1" androidxTestEspressoCore = "3.6.1" archCoreTest = "2.2.0" -archComponents = "2.7.0" -activityCompose = "1.9.1" +archComponents = "2.8.6" +activityCompose = "1.9.2" material = "1.12.0" -fragmentKtx = "1.7.1" +fragmentKtx = "1.8.4" permission = "1.7.1" -compose-bom = "2024.05.00" -composeViewModel = "2.7.0" -composeLifecycle = "2.7.0" +compose-bom = "2024.09.03" +composeLifecycle = "2.8.6" composeConstraintLayout = "1.1.0-alpha05" firebasebom = "32.7.0" googleServices = "4.3.15" @@ -49,18 +48,18 @@ webSocketLib = "2.14" web3j = "4.6.0-android" zXing = "3.3.3" zXingEmbedded = "4.3.0" -activityKtx = "1.9.1" +activityKtx = "1.9.2" xserializationjson = "1.6.3" gson = "2.10.1" datastore = "1.0.0" room = "2.6.1" lazySodium = "5.0.2" jna = "5.8.0" -kover = "0.7.5" +kover = "0.8.3" soramitsuSoracard = "1.1.18" -soramitsuXnetworking = "1.0.9" +soramitsuXnetworking = "1.0.10" soramitsuXsubstrate = "1.2.7" -soramitsuUicore = "0.2.34" +soramitsuUicore = "0.2.37" soramitsuXbackup = "1.2.2" soramitsuXcrypto = "1.2.6" soramitsuAndroidFoundation = "0.0.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b792ab3e..05c38d09b 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-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 07d1afd40..8d767507b 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/sorasubstrate/build.gradle.kts b/sorasubstrate/build.gradle.kts index e77365650..e52f2eaaa 100644 --- a/sorasubstrate/build.gradle.kts +++ b/sorasubstrate/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android { diff --git a/test_data/build.gradle.kts b/test_data/build.gradle.kts index 816612576..29d7007e5 100644 --- a/test_data/build.gradle.kts +++ b/test_data/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(17) } android {