Merge branch 'develop' into mwr-638

sora-xor · Sep 30, 2023 · c1d1aca · c1d1aca
2 parents 5dd2e81 + 32e55c2
commit c1d1aca
Show file tree

Hide file tree

Showing 213 changed files with 1,718 additions and 1,431 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,6 +13,6 @@ def pipeline = new org.android.AppPipeline(steps: this,
     jobParams: jobParams,
     appPushNoti: true,
     gitUpdateSubmodule: true,
-    dockerImage: 'build-tools/android-build-box-jdk11:latest',
+    dockerImage: 'build-tools/android-build-box:jdk17',
     gpgFiles: ['app/google-services.json'])
 pipeline.runPipeline('sora')
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/proguard-rules.pro b/app/proguard-rules.pro
@@ -10,6 +10,121 @@
 #Firebase Crashlytics
 -keep,includedescriptorclasses public class * extends java.lang.Exception
 
+###########
+-keep public class * extends jp.co.soramitsu.common.util.ParseModel {
+    <fields>;
+    <methods>;
+ }
+
+ # This is generated automatically by the Android Gradle plugin.
+ -dontwarn build.IgnoreJava8API
+ -dontwarn java.awt.Component
+ -dontwarn java.awt.GraphicsEnvironment
+ -dontwarn java.awt.HeadlessException
+ -dontwarn java.awt.Window
+ -dontwarn java.beans.ConstructorProperties
+ -dontwarn java.beans.Transient
+ -dontwarn java.lang.management.ManagementFactory
+ -dontwarn java.lang.management.RuntimeMXBean
+ -dontwarn java.lang.management.ThreadMXBean
+ -dontwarn javax.servlet.ServletContextListener
+ -dontwarn lombok.NonNull
+ -dontwarn org.apache.avalon.framework.logger.Logger
+ -dontwarn org.apache.log.Hierarchy
+ -dontwarn org.apache.log.Logger
+ -dontwarn org.apache.log4j.Level
+ -dontwarn org.apache.log4j.Logger
+ -dontwarn org.apache.log4j.Priority
+ -dontwarn org.apache.xml.resolver.Catalog
+ -dontwarn org.apache.xml.resolver.CatalogManager
+ -dontwarn org.apache.xml.resolver.readers.CatalogReader
+ -dontwarn org.apache.xml.resolver.readers.SAXCatalogReader
+ -dontwarn org.ietf.jgss.GSSContext
+ -dontwarn org.ietf.jgss.GSSCredential
+ -dontwarn org.ietf.jgss.GSSException
+ -dontwarn org.ietf.jgss.GSSManager
+ -dontwarn org.ietf.jgss.GSSName
+ -dontwarn org.ietf.jgss.Oid
+ -dontwarn org.slf4j.impl.StaticLoggerBinder
+ -dontwarn org.slf4j.impl.StaticMDCBinder
+ -dontwarn org.slf4j.impl.StaticMarkerBinder
+ -dontwarn org.w3c.dom.events.DocumentEvent
+ -dontwarn org.w3c.dom.events.Event
+ -dontwarn org.w3c.dom.events.EventException
+ -dontwarn org.w3c.dom.events.EventListener
+ -dontwarn org.w3c.dom.events.EventTarget
+ -dontwarn org.w3c.dom.events.MouseEvent
+ -dontwarn org.w3c.dom.events.MutationEvent
+ -dontwarn org.w3c.dom.events.UIEvent
+ -dontwarn org.w3c.dom.html.HTMLAnchorElement
+ -dontwarn org.w3c.dom.html.HTMLAppletElement
+ -dontwarn org.w3c.dom.html.HTMLAreaElement
+ -dontwarn org.w3c.dom.html.HTMLBRElement
+ -dontwarn org.w3c.dom.html.HTMLBaseElement
+ -dontwarn org.w3c.dom.html.HTMLBaseFontElement
+ -dontwarn org.w3c.dom.html.HTMLBodyElement
+ -dontwarn org.w3c.dom.html.HTMLButtonElement
+ -dontwarn org.w3c.dom.html.HTMLCollection
+ -dontwarn org.w3c.dom.html.HTMLDListElement
+ -dontwarn org.w3c.dom.html.HTMLDirectoryElement
+ -dontwarn org.w3c.dom.html.HTMLDivElement
+ -dontwarn org.w3c.dom.html.HTMLDocument
+ -dontwarn org.w3c.dom.html.HTMLElement
+ -dontwarn org.w3c.dom.html.HTMLFieldSetElement
+ -dontwarn org.w3c.dom.html.HTMLFontElement
+ -dontwarn org.w3c.dom.html.HTMLFormElement
+ -dontwarn org.w3c.dom.html.HTMLFrameElement
+ -dontwarn org.w3c.dom.html.HTMLFrameSetElement
+ -dontwarn org.w3c.dom.html.HTMLHRElement
+ -dontwarn org.w3c.dom.html.HTMLHeadElement
+ -dontwarn org.w3c.dom.html.HTMLHeadingElement
+ -dontwarn org.w3c.dom.html.HTMLHtmlElement
+ -dontwarn org.w3c.dom.html.HTMLIFrameElement
+ -dontwarn org.w3c.dom.html.HTMLImageElement
+ -dontwarn org.w3c.dom.html.HTMLInputElement
+ -dontwarn org.w3c.dom.html.HTMLIsIndexElement
+ -dontwarn org.w3c.dom.html.HTMLLIElement
+ -dontwarn org.w3c.dom.html.HTMLLabelElement
+ -dontwarn org.w3c.dom.html.HTMLLegendElement
+ -dontwarn org.w3c.dom.html.HTMLLinkElement
+ -dontwarn org.w3c.dom.html.HTMLMapElement
+ -dontwarn org.w3c.dom.html.HTMLMenuElement
+ -dontwarn org.w3c.dom.html.HTMLMetaElement
+ -dontwarn org.w3c.dom.html.HTMLModElement
+ -dontwarn org.w3c.dom.html.HTMLOListElement
+ -dontwarn org.w3c.dom.html.HTMLObjectElement
+ -dontwarn org.w3c.dom.html.HTMLOptGroupElement
+ -dontwarn org.w3c.dom.html.HTMLOptionElement
+ -dontwarn org.w3c.dom.html.HTMLParagraphElement
+ -dontwarn org.w3c.dom.html.HTMLParamElement
+ -dontwarn org.w3c.dom.html.HTMLPreElement
+ -dontwarn org.w3c.dom.html.HTMLQuoteElement
+ -dontwarn org.w3c.dom.html.HTMLScriptElement
+ -dontwarn org.w3c.dom.html.HTMLSelectElement
+ -dontwarn org.w3c.dom.html.HTMLStyleElement
+ -dontwarn org.w3c.dom.html.HTMLTableCaptionElement
+ -dontwarn org.w3c.dom.html.HTMLTableCellElement
+ -dontwarn org.w3c.dom.html.HTMLTableColElement
+ -dontwarn org.w3c.dom.html.HTMLTableElement
+ -dontwarn org.w3c.dom.html.HTMLTableRowElement
+ -dontwarn org.w3c.dom.html.HTMLTableSectionElement
+ -dontwarn org.w3c.dom.html.HTMLTextAreaElement
+ -dontwarn org.w3c.dom.html.HTMLTitleElement
+ -dontwarn org.w3c.dom.html.HTMLUListElement
+ -dontwarn org.w3c.dom.ls.LSSerializerFilter
+ -dontwarn org.w3c.dom.ranges.DocumentRange
+ -dontwarn org.w3c.dom.ranges.Range
+ -dontwarn org.w3c.dom.ranges.RangeException
+ -dontwarn org.w3c.dom.traversal.DocumentTraversal
+ -dontwarn org.w3c.dom.traversal.NodeFilter
+ -dontwarn org.w3c.dom.traversal.NodeIterator
+ -dontwarn org.w3c.dom.traversal.TreeWalker
+ -dontwarn org.web3j.abi.datatypes.generated.AbiTypes
+ -dontwarn org.webrtc.Dav1dDecoder
+ -dontwarn sun.security.x509.X509Key
+
+-dontwarn java.lang.invoke.StringConcatFactory
+
 # Gson
 -keep,allowobfuscation,allowoptimization class * {
     @com.google.gson.annotations.SerializedName <fields>;

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.7',
+            soraCard               : '0.1.45',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',
             accompanist            : '0.30.1',
@@ -61,9 +61,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"
@@ -76,8 +76,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"
@@ -91,9 +91,6 @@ buildscript {
         daggerDep = "com.google.dagger:hilt-android:$versions.dagger"
         daggerKaptDep = "com.google.dagger:hilt-compiler:$versions.dagger"
         hiltUiTestDep = "com.google.dagger:hilt-android-testing:$versions.dagger"
-        hiltUiTestKaptDep = "com.google.dagger:hilt-compiler:$versions.dagger"
-        hiltUnitTestDep = "com.google.dagger:hilt-android-testing:$versions.dagger"
-        hiltUnitTestKaptDep = "com.google.dagger:hilt-compiler:$versions.dagger"
         hiltNavComposeDep = "androidx.hilt:hilt-navigation-compose:$versions.hiltCompose"
         hiltWorkManagerDep = "androidx.hilt:hilt-work:$versions.hiltWorkManager"
         hiltWorkManagerKaptDep = "androidx.hilt:hilt-compiler:$versions.hiltWorkManager"
@@ -138,7 +135,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"
@@ -156,10 +153,10 @@ buildscript {
 
         jUnitDep = "junit:junit:$versions.jUnit"
         mockitoDep = "org.mockito:mockito-inline:$versions.mockito"
-        mockitoKotlinDep = "org.mockito.kotlin:mockito-kotlin:4.1.0"
+        mockitoKotlinDep = "org.mockito.kotlin:mockito-kotlin:5.1.0"
 
 //        https://github.com/mockk/mockk/issues/243
-        mockkDep = "io.mockk:mockk:1.13.5"
+        mockkDep = "io.mockk:mockk:1.13.8"
 
 //        powerMockDep = "org.powermock:powermock-module-junit4:2.0.2"
 //        powerMockMockitoDep = "org.powermock:powermock-api-mockito2:2.0.2"
@@ -199,7 +196,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"
@@ -223,17 +220,18 @@ 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-beta06'
         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"
     }
 }
 
 plugins {
     id "org.sonarqube" version "2.7"
+    id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
 }
 
 apply from: 'secrets.gradle'

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>