mwr-911

sora-xor · Oct 7, 2024 · 9fc6107 · 9fc6107
1 parent a07a0db
commit 9fc6107
Show file tree

Hide file tree

Showing 40 changed files with 104 additions and 106 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/...ature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt b/...ature_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
@@ -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
@@ -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
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/.../main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt b/.../main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt
@@ -274,7 +274,8 @@ class ExploreFragment : SoraBaseFragment<ExploreViewModel>() {
                 }
 
                 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
@@ -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
@@ -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
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/...mpl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileScreen.kt b/...mpl/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
@@ -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
@@ -11,7 +11,7 @@ plugins {
 val composeCompilerVersion: String by project
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {

diff --git a/.../soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt b/.../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/...l/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt b/...l/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 android {