mwr-651

sora-xor · Sep 24, 2023 · ab968cb · ab968cb
1 parent 818692d
commit ab968cb
Show file tree

Hide file tree

Showing 113 changed files with 549 additions and 422 deletions.
diff --git a/android-foundation b/android-foundation
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,6 +10,10 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
 apply from: '../tests.gradle'
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
     compileSdkVersion compileVersion
     flavorDimensions "default"
@@ -68,14 +72,13 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
+//    kotlinOptions {
+//        jvmTarget = JavaVersion.VERSION_1_8
+//    }
 
     buildFeatures {
         viewBinding true
@@ -134,6 +137,7 @@ android {
     configurations {
         all*.exclude module: 'bcprov-jdk15on'
     }
+    namespace 'jp.co.soramitsu.sora'
 }
 
 hilt {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="jp.co.soramitsu.sora">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,9 @@
 buildscript {
 
     ext.versions = [
-            kotlin                 : '1.8.20',
-            coroutines             : '1.6.4',
-            dagger                 : '2.45',
+            kotlin                 : '1.9.10',
+            coroutines             : '1.7.3',
+            dagger                 : '2.48',
             hiltWorkManager        : '1.0.0',
             hiltCompose            : '1.0.0',
             timber                 : '5.0.1',
@@ -29,7 +29,7 @@ buildscript {
             archCoreTest           : '2.1.0',
             archFragmentTest       : '1.4.1',
             archComponents         : '2.6.1',
-            room                   : '2.5.1',
+            room                   : '2.6.0-rc01',
             datastore              : '1.0.0',
             biometric              : '1.1.0',
             workManager            : '2.8.1',
@@ -40,12 +40,12 @@ buildscript {
             truth                  : '1.1.5',
             lottie                 : '4.2.0',
             xNetworking            : '0.0.61',
-            compose                : '1.4.3',
+            compose                : '1.5.1',
             composeMaterial        : '1.4.3',
-            composeCompiler        : '1.4.6',
+            composeCompiler        : '1.5.3',
             composeConstraintLayout: '1.1.0-alpha05',
-            uiCore                 : '0.1.4',
-            soraCard               : '0.1.41',
+            uiCore                 : '0.2.0',
+            soraCard               : '0.1.45',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',
             accompanist            : '0.30.1',
@@ -60,9 +60,9 @@ buildscript {
         appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 110)
         appVersionName = '3.4.0.4'
 
-        compileVersion = 33
+        compileVersion = 34
         minVersion = 24
-        targetVersion = 33
+        targetVersion = 34
         soraMinifyRelease = true
 
         //kotlinDep = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
@@ -75,8 +75,8 @@ buildscript {
         cardViewDep = "androidx.cardview:cardview:1.0.0"
         constraintDep = "androidx.constraintlayout:constraintlayout:$versions.constraint"
         activityKtxDep = "androidx.activity:activity-ktx:1.7.1"
-        fragmentKtxDep = "androidx.fragment:fragment-ktx:1.5.7"
-        coreKtxDep = "androidx.core:core-ktx:1.10.1"
+        fragmentKtxDep = "androidx.fragment:fragment-ktx:1.6.1"
+        coreKtxDep = "androidx.core:core-ktx:1.12.0"
 
         workManagerDep = "androidx.work:work-runtime-ktx:$versions.workManager"
         coroutineDep = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions.coroutines"
@@ -138,7 +138,7 @@ buildscript {
 
         navigationFragmentDep = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
         navigationUiDep = "androidx.navigation:navigation-ui-ktx:$versions.navigation"
-        navigationComposeDep = "androidx.navigation:navigation-compose:$versions.navigation"
+        navigationComposeDep = "androidx.navigation:navigation-compose:2.7.2"
 
         zXingCoreDep = "com.google.zxing:core:$versions.zXing"
         zXingEmbeddedDep = "com.journeyapps:zxing-android-embedded:$versions.zXingEmbedded"
@@ -197,7 +197,7 @@ buildscript {
         composeLiveDataDep = "androidx.compose.runtime:runtime-livedata:$versions.compose"
         composeFoundationDep = "androidx.compose.foundation:foundation:$versions.compose"
         composeRuntimeDep = "androidx.compose.runtime:runtime:$versions.compose"
-        composeMaterialDep = "androidx.compose.material:material:$versions.composeMaterial"
+        composeMaterialDep = "androidx.compose.material:material:$versions.compose"
         composeThemeAdapterDep = "com.google.accompanist:accompanist-themeadapter-material:$versions.accompanist"
         composeAnimationDep = "androidx.compose.animation:animation:$versions.compose"
         composeAnimationGraphicsDep = "androidx.compose.animation:animation-graphics:$versions.compose"
@@ -221,11 +221,11 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.kotlin:kotlin-serialization:${versions.kotlin}"
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.0-beta05'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:3.2.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.45'
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.48'
         classpath "com.github.triplet.gradle:play-publisher:3.8.4"
     }
 }

diff --git a/common/build.gradle b/common/build.gradle
@@ -7,8 +7,12 @@ apply plugin: 'kotlinx-serialization'
 apply from: '../tests.gradle'
 apply from: '../secrets.gradle'
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
-    compileSdkVersion compileVersion
+    compileSdk compileVersion
 
     defaultConfig {
         minSdkVersion minVersion
@@ -24,14 +28,13 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
+//    kotlinOptions {
+//        jvmTarget = JavaVersion.VERSION_1_8
+//    }
 
     composeOptions {
         kotlinCompilerExtensionVersion versions.composeCompiler
@@ -110,6 +113,7 @@ android {
             buildConfigField "String", "GOOGLE_API_TOKEN", readSecretInQuotes("SORA_GOOGLE_TOKEN_PROD")
         }
     }
+    namespace 'jp.co.soramitsu.common'
 }
 
 dependencies {
@@ -178,7 +182,8 @@ dependencies {
     implementation composeConstraintLayoutDep
     implementation composeAnimationGraphicsDep
     implementation composeToolingPreviewDep
-    implementation accompanistNavAnimationDep
+    //implementation accompanistNavAnimationDep
+    implementation navigationComposeDep
     debugImplementation composeToolingDep
 
     testImplementation project(":test_shared")

diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="jp.co.soramitsu.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </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
@@ -62,9 +62,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.rememberNavController
 import androidx.navigation.findNavController
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import javax.inject.Inject
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.domain.BarsColorhandler
@@ -116,7 +116,7 @@ abstract class SoraBaseFragment<T : BaseViewModel> : Fragment() {
                     val coroutineScope = rememberCoroutineScope()
                     val openAlertDialog = remember { mutableStateOf(AlertDialogData()) }
 
-                    val navController = rememberAnimatedNavController()
+                    val navController = rememberNavController()
                     LaunchedEffect(Unit) {
                         navController.addOnDestinationChangedListener { _, destination, _ ->
                             destination.route?.let {
@@ -200,7 +200,7 @@ abstract class SoraBaseFragment<T : BaseViewModel> : Fragment() {
                         BackHandler {
                             onBack()
                         }
-                        AnimatedNavHost(
+                        NavHost(
                             modifier = Modifier
                                 .padding(padding)
                                 .fillMaxSize(),

diff --git a/...rc/main/java/jp/co/soramitsu/common/presentation/compose/components/AnimatedComposable.kt b/...rc/main/java/jp/co/soramitsu/common/presentation/compose/components/AnimatedComposable.kt
@@ -42,7 +42,7 @@ import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDeepLink
 import androidx.navigation.NavGraphBuilder
-import com.google.accompanist.navigation.animation.composable
+import androidx.navigation.compose.composable
 
 private const val TRANSITION_DURATION = 300
 

diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/webview/WebViewFragment.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/webview/WebViewFragment.kt
@@ -37,7 +37,7 @@ import androidx.compose.foundation.ScrollState
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
-import com.google.accompanist.navigation.animation.composable
+import androidx.navigation.compose.composable
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import jp.co.soramitsu.common.base.SoraBaseFragment

diff --git a/common_wallet/build.gradle b/common_wallet/build.gradle
@@ -3,6 +3,10 @@ apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
     compileSdkVersion compileVersion
 
@@ -20,14 +24,13 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
+//    kotlinOptions {
+//        jvmTarget = JavaVersion.VERSION_1_8
+//    }
 
     composeOptions {
         kotlinCompilerExtensionVersion versions.composeCompiler
@@ -57,6 +60,7 @@ android {
             dimension 'default'
         }
     }
+    namespace 'jp.co.soramitsu.common_wallet'
 }
 
 dependencies {
@@ -118,7 +122,7 @@ dependencies {
     implementation composeConstraintLayoutDep
     implementation composeAnimationGraphicsDep
     implementation composeToolingPreviewDep
-    implementation accompanistNavAnimationDep
+    //implementation accompanistNavAnimationDep
     debugImplementation composeToolingDep
 
     testImplementation project(":test_shared")

diff --git a/common_wallet/src/main/AndroidManifest.xml b/common_wallet/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="jp.co.soramitsu.common_wallet"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/core_db/build.gradle b/core_db/build.gradle
@@ -4,6 +4,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply from: '../tests.gradle'
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
     compileSdkVersion compileVersion
 
@@ -29,14 +33,13 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
+//    kotlinOptions {
+//        jvmTarget = JavaVersion.VERSION_1_8
+//    }
 
     flavorDimensions "default"
 
@@ -57,6 +60,7 @@ android {
             dimension 'default'
         }
     }
+    namespace 'com.example.core_db'
 }
 
 dependencies {

diff --git a/core_db/src/main/AndroidManifest.xml b/core_db/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.example.core_db" />
+<manifest />
diff --git a/core_di/build.gradle b/core_di/build.gradle
@@ -1,6 +1,10 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
     compileSdkVersion compileVersion
 
@@ -11,14 +15,13 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
+//    kotlinOptions {
+//        jvmTarget = JavaVersion.VERSION_1_8
+//    }
 
     flavorDimensions "default"
 
@@ -46,6 +49,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'jp.co.soramitsu.core_di'
 }
 
 dependencies {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<manifest package="com.example.core_db" />
		<manifest />