agp 8.6.0, versions up

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "android-foundation"]
-	path = android-foundation
-	url = https://github.com/soramitsu/android-foundation.git

app/build.gradle.kts

@@ -178,7 +178,6 @@ play {
 
 dependencies {
     // implementation(libs.fileTree(dir: 'libs', include: ['*.jar'])
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":core_db"))
     implementation(project(":demeter"))
@@ -222,6 +221,7 @@ dependencies {
     implementation(libs.timberDep)
 
     implementation(libs.xsubstrateDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.daggerDep)
     kapt(libs.daggerKaptDep)

common/build.gradle.kts

@@ -151,7 +151,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":network"))
 
     implementation(libs.activityKtxDep)
@@ -165,6 +164,7 @@ dependencies {
     implementation(libs.coroutineDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.kotlinxSerializationJsonDep)
 

common_wallet/build.gradle.kts

@@ -79,7 +79,6 @@ android {
 dependencies {
     // implementation(libs.fileTree(dir: 'libs', include: ['*.jar']))
 
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":feature_blockexplorer_api"))
     implementation(project(":core_db"))
@@ -93,6 +92,7 @@ dependencies {
     implementation(libs.coroutineDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.coilSvgDep)
 
@@ -106,9 +106,8 @@ dependencies {
     implementation(libs.svgDep)
     implementation(libs.jdenticonDep)
 
-    api(libs.soraCardDep) {
+    api(libs.soramitsu.sora.card) {
         exclude(group = "com.paywings.onboarding.kyc.android-libs", module = "java-websocket-lib")
-        exclude(module = "android-foundation")
     }
 
     implementation(libs.daggerDep)

core_db/build.gradle.kts

@@ -93,7 +93,7 @@ dependencies {
     ksp(libs.roomKaptDep)
 
     androidTestImplementation(project(":test_data"))
-    androidTestImplementation(project(":android-foundation"))
+    androidTestImplementation(libs.soramitsu.android.foundation)
     androidTestImplementation(libs.androidxTestExtJunitDep)
     androidTestImplementation(libs.androidxTestEspressoCoreDep)
     androidTestImplementation(libs.archCoreTestDep)

demeter/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":common_wallet"))
     implementation(project(":core_db"))
@@ -96,6 +95,7 @@ dependencies {
     implementation(libs.coroutineAndroidDep)
 
     implementation(libs.xsubstrateDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.composeRuntimeDep)
 

feature_account_impl/build.gradle.kts

@@ -65,7 +65,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":feature_account_api"))
     implementation(project(":feature_blockexplorer_api"))
@@ -74,6 +73,7 @@ dependencies {
 
     implementation(libs.xcryptoDep)
     implementation(libs.xsubstrateDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.daggerDep)
     kapt(libs.daggerKaptDep)

feature_assets_impl/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":common_wallet"))
     implementation(project(":core_db"))
@@ -93,6 +92,7 @@ dependencies {
 
     implementation(libs.xsubstrateDep)
     implementation(libs.xcryptoDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.appcompatDep)
     implementation(libs.materialDep)

feature_blockexplorer_api/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":core_db"))
     implementation(project(":network"))
@@ -93,6 +92,7 @@ dependencies {
     implementation(libs.viewmodelKtxDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
     implementation(libs.navigationComposeDep)
 
     implementation(platform(libs.compose.bom))

feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/SoraConfigManager.kt

@@ -44,7 +44,7 @@ import jp.co.soramitsu.feature_blockexplorer_api.data.models.SoraConfig
 import jp.co.soramitsu.feature_blockexplorer_api.data.models.SoraConfigNode
 import jp.co.soramitsu.feature_blockexplorer_api.data.models.SoraCurrency
 import jp.co.soramitsu.xnetworking.lib.engines.rest.api.RestClient
-import jp.co.soramitsu.xnetworking.lib.engines.utils.JsonGetRequest
+import jp.co.soramitsu.xnetworking.lib.engines.utils.getAsString
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -124,12 +124,7 @@ class SoraConfigManager @Inject constructor(
         deserializer: () -> DeserializationStrategy<T>
     ): T? {
         val result = runCatching {
-            restClient.getReturnString(
-                JsonGetRequest(
-                    url = url(),
-                    responseDeserializer = String.serializer()
-                )
-            )
+            restClient.getAsString(url())
         }.onSuccess { configAsString ->
             soraPreferences.putString(
                 field = nameToSaveWith(),

feature_blockexplorer_impl/build.gradle.kts

@@ -77,7 +77,6 @@ android {
 
 dependencies {
 
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":sorasubstrate"))
     implementation(project(":feature_assets_api"))
@@ -99,6 +98,7 @@ dependencies {
     implementation(libs.viewmodelKtxDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
     implementation(libs.navigationComposeDep)
 
     implementation(platform(libs.compose.bom))

feature_ecosystem_impl/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":demeter"))
     implementation(project(":common_wallet"))
@@ -119,6 +118,7 @@ dependencies {
     kapt(libs.lifecycleKaptDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(platform(libs.compose.bom))
     implementation(libs.composeUiDep)

feature_main_impl/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":common_wallet"))
     implementation(project(":core_db"))
@@ -99,6 +98,7 @@ dependencies {
     implementation(libs.biometricDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.coreKtxDep)
 

feature_multiaccount_impl/build.gradle.kts

@@ -81,7 +81,6 @@ android {
 
 dependencies {
 
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":feature_assets_api"))
     implementation(project(":feature_account_api"))
@@ -105,6 +104,7 @@ dependencies {
     implementation(libs.viewmodelKtxDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.coilDep)
     implementation(libs.coilComposeDep)

feature_polkaswap_impl/build.gradle.kts

@@ -77,7 +77,6 @@ android {
 
 dependencies {
 
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":common_wallet"))
     implementation(project(":core_db"))
@@ -93,6 +92,7 @@ dependencies {
 
     implementation(libs.xsubstrateDep)
     implementation(libs.xcryptoDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.appcompatDep)
     implementation(libs.materialDep)

feature_referral_impl/build.gradle.kts

@@ -77,7 +77,6 @@ android {
 
 dependencies {
 
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":core_db"))
     implementation(project(":feature_assets_api"))
@@ -98,6 +97,7 @@ dependencies {
     implementation(libs.viewmodelKtxDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
     implementation(libs.navigationComposeDep)
 
     implementation(platform(libs.compose.bom))

feature_select_node_impl/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":feature_select_node_api"))
     implementation(project(":feature_main_api"))
@@ -100,6 +99,7 @@ dependencies {
     implementation(libs.navigationUiDep)
 
     implementation(libs.xsubstrateDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.roomDep)
     implementation(libs.roomKtxDep)

feature_sora_card_impl/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":common_wallet"))
     implementation(project(":demeter"))
@@ -106,6 +105,7 @@ dependencies {
     implementation(libs.navigationUiDep)
 
     implementation(libs.uiCoreDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.timberDep)
 

feature_wallet_impl/build.gradle.kts

@@ -80,7 +80,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":android-foundation"))
     implementation(project(":common"))
     implementation(project(":common_wallet"))
     implementation(project(":core_db"))
@@ -99,6 +98,7 @@ dependencies {
 
     implementation(libs.xsubstrateDep)
     implementation(libs.xcryptoDep)
+    implementation(libs.soramitsu.android.foundation)
 
     implementation(libs.appcompatDep)
     implementation(libs.materialDep)