develop to master

sora-xor · Sep 8, 2024 · cad9bbc · cad9bbc
1 parent ffca336
commit cad9bbc
Show file tree

Hide file tree

Showing 317 changed files with 2,787 additions and 4,204 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "android-foundation"]
-	path = android-foundation
-	url = https://github.com/soramitsu/android-foundation.git

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,6 +16,5 @@ def pipeline = new org.android.AppPipeline(steps: this,
     gitUpdateSubmodule: true,
     dockerImage: 'build-tools/android-build-box:jdk17',
     gpgFiles: ['app/google-services.json'],
-    dojoProductType: 'sora-mobile'
-    )
+    dojoProductType: 'sora-mobile')
 pipeline.runPipeline('sora')
diff --git a/android-foundation b/android-foundation
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
     jvmToolchain(11)
 }
 
-// soralution 138 3.8.4.0 2024.03.14
+// soralution 138 3.8.5.0 2024.09.06
 // sora dae 114 3.8.4.0 2024.03.19
 
 android {
@@ -119,7 +119,7 @@ android {
         create("develop") {
             dimension = "default"
             applicationIdSuffix = ".develop"
-            resValue("string", "app_name", "Sora Develop")
+            resValue("string", "app_name", "SORA Develop")
             manifestPlaceholders["pathPrefix"] = "/dev/#/referral"
             manifestPlaceholders["appIcon"] = "@mipmap/ic_dev_launcher"
             manifestPlaceholders["roundedIcon"] = "@mipmap/ic_dev_launcher"
@@ -136,7 +136,7 @@ android {
 
         create("production") {
             dimension = "default"
-            resValue("string", "app_name", "Sora")
+            resValue("string", "app_name", "SORA")
             manifestPlaceholders["pathPrefix"] = "/#/referral"
             manifestPlaceholders["appIcon"] = "@mipmap/ic_prod_launcher"
             manifestPlaceholders["roundedIcon"] = "@mipmap/ic_prod_launcher_rounded"
@@ -155,6 +155,11 @@ android {
     configurations {
         all {
             exclude(module = "bcprov-jdk15on")
+//            resolutionStrategy {
+//                dependencySubstitution {
+//                    substitute(module("")).using(module(""))
+//                }
+//            }
         }
     }
 }
@@ -167,13 +172,12 @@ play {
     serviceAccountCredentials = file(System.getenv("CI_PLAY_KEY") ?: "../key/fake.json")
     track = "internal"
     releaseStatus = ReleaseStatus.DRAFT
-    releaseName = "3.8.4.0 - Bug fixes and minor improvements"
+    releaseName = "3.8.4.0 - SORA Card Improvements"
     defaultToAppBundles = true
 }
 
 dependencies {
     // implementation(libs.fileTree(dir: 'libs', include: ['*.jar'])
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":core_db"))
     implementation(project(":demeter"))
@@ -188,7 +192,6 @@ dependencies {
     implementation(project(":feature_account_api"))
     implementation(project(":feature_account_impl"))
     implementation(project(":feature_ethereum_api"))
-    implementation(project(":feature_ethereum_impl"))
     implementation(project(":feature_polkaswap_api"))
     implementation(project(":feature_polkaswap_impl"))
     implementation(project(":feature_wallet_api"))
@@ -218,6 +221,7 @@ dependencies {
     implementation(libs.timberDep)
 
     implementation(libs.xsubstrateDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.daggerDep)
     kapt(libs.daggerKaptDep)
@@ -235,8 +239,11 @@ dependencies {
 
     implementation(libs.webSocketLibDep)
 
-    // Tests
-    testImplementation(project(":test_shared"))
+    testImplementation(libs.coroutineTestDep)
+    testImplementation(libs.junitDep)
+    testImplementation(libs.mockkDep)
+    testImplementation(libs.mockitoKotlinDep)
+    testImplementation(libs.archCoreTestDep)
 
     kover(project(":common"))
     kover(project(":common_wallet"))
@@ -259,7 +266,6 @@ dependencies {
     kover(project(":feature_polkaswap_impl"))
     kover(project(":feature_referral_impl"))
     kover(project(":feature_ethereum_api"))
-    kover(project(":feature_ethereum_impl"))
     kover(project(":feature_wallet_api"))
     kover(project(":feature_wallet_impl"))
     kover(project(":feature_select_node_api"))

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,11 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 <!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
 
+    <queries>
+        <package android:name="com.soracard.iban.wallet"/>
+        <package android:name="com.soracard.iban.wallet.test"/>
+    </queries>
+
     <application
         tools:replace="android:allowBackup"
         android:allowBackup="false"

diff --git a/app/src/test/java/jp/co/soramitsu/sora/splash/domain/SplashInteractorTest.kt b/app/src/test/java/jp/co/soramitsu/sora/splash/domain/SplashInteractorTest.kt
@@ -33,9 +33,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.sora.splash.domain
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import jp.co.soramitsu.androidfoundation.testing.MainCoroutineRule
 import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository
 import jp.co.soramitsu.feature_account_api.domain.model.OnboardingState
-import jp.co.soramitsu.test_shared.MainCoroutineRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals

diff --git a/app/src/test/java/jp/co/soramitsu/sora/splash/presentation/SplashViewModelTest.kt b/app/src/test/java/jp/co/soramitsu/sora/splash/presentation/SplashViewModelTest.kt
@@ -35,11 +35,11 @@ package jp.co.soramitsu.sora.splash.presentation
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import io.mockk.every
 import io.mockk.mockkObject
+import jp.co.soramitsu.androidfoundation.testing.MainCoroutineRule
+import jp.co.soramitsu.androidfoundation.testing.getOrAwaitValue
 import jp.co.soramitsu.common.logger.FirebaseWrapper
 import jp.co.soramitsu.feature_account_api.domain.model.OnboardingState
 import jp.co.soramitsu.sora.splash.domain.SplashInteractor
-import jp.co.soramitsu.test_shared.MainCoroutineRule
-import jp.co.soramitsu.test_shared.getOrAwaitValue
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -138,10 +138,19 @@ android {
             buildConfigField("String", "GOOGLE_API_TOKEN", maybeWrapQuotes(secret("SORA_GOOGLE_TOKEN_PROD")))
         }
     }
+
+    packaging {
+        resources {
+            excludes += listOf(
+                "META-INF/DEPENDENCIES",
+                "META-INF/LICENSE.md",
+                "META-INF/LICENSE-notice.md",
+            )
+        }
+    }
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":network"))
 
     implementation(libs.activityKtxDep)
@@ -155,6 +164,7 @@ dependencies {
     implementation(libs.coroutineDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.kotlinxSerializationJsonDep)
 
@@ -180,7 +190,9 @@ dependencies {
     implementation(libs.xbackupDep)
     implementation(libs.xsubstrateDep)
     implementation(libs.xcryptoDep)
-    implementation(libs.ed25519Dep)
+    implementation(libs.ed25519Dep) {
+//        exclude(module = "bcpkix-jdk15on")
+    }
     implementation(libs.xercesDep)
 
     implementation(libs.gsonDep)
@@ -205,6 +217,7 @@ dependencies {
     implementation(libs.coilComposeDep)
 
     implementation(libs.composeActivityDep)
+    implementation(platform(libs.compose.bom))
     implementation(libs.composeUiDep)
     implementation(libs.composeLiveDataDep)
     implementation(libs.composeFoundationDep)
@@ -215,7 +228,9 @@ dependencies {
     implementation(libs.navigationComposeDep)
     debugImplementation(libs.composeToolingDep)
 
-    testImplementation(project(":test_shared"))
+    testImplementation(libs.mockitoDep)
+    testImplementation(libs.archCoreTestDep)
+    testImplementation(libs.coroutineTestDep)
 }
 
 kapt {

diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
@@ -1,3 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
 </manifest>
diff --git a/common/src/main/java/jp/co/soramitsu/common/base/SoraBaseFragment.kt b/common/src/main/java/jp/co/soramitsu/common/base/SoraBaseFragment.kt
@@ -67,6 +67,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.findNavController
 import javax.inject.Inject
+import jp.co.soramitsu.androidfoundation.format.safeCast
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.domain.BarsColorHandler
 import jp.co.soramitsu.common.domain.DarkThemeManager
@@ -76,7 +77,6 @@ import jp.co.soramitsu.common.presentation.compose.theme.SoraAppTheme
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.DebounceClickHandler
-import jp.co.soramitsu.common.util.ext.safeCast
 import jp.co.soramitsu.ui_core.theme.customColors
 import kotlinx.coroutines.launch
 

diff --git a/common/src/main/java/jp/co/soramitsu/common/data/network/connection/NetworkStateListener.kt b/common/src/main/java/jp/co/soramitsu/common/data/network/connection/NetworkStateListener.kt
@@ -36,7 +36,7 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkRequest
-import jp.co.soramitsu.common.util.ext.safeCast
+import jp.co.soramitsu.androidfoundation.format.safeCast
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow