sora-xor · mrZizik · Oct 3, 2023 · Sep 25, 2023 · Sep 25, 2023 · Oct 3, 2023
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,14 +72,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildFeatures {
         viewBinding true
         buildConfig true
@@ -128,6 +120,10 @@ android {
         }
     }
 
+    kotlin {
+        jvmToolchain(11)
+    }
+
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             outputFileName = new File("Sora_" + variant.versionName + "_" + variant.flavorName + "_" + buildType.name + ".apk")

diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,8 @@ buildscript {
             jna                    : '5.8.0',
             accompanist            : '0.30.1',
             xserializationjson     : '1.5.0',
-            ktor                   : '2.3.1'
+            ktor                   : '2.3.1',
+            xbackup                : '0.0.2-20231002.173502-3'
     ]
 
     ext {
@@ -117,7 +118,6 @@ buildscript {
         webSocketLibDep = "com.neovisionaries:nv-websocket-client:$versions.webSocketLib"
         uiCoreDep = "jp.co.soramitsu:ui-core:$versions.uiCore"
         sharedUtilsDep = "jp.co.soramitsu.shared_features:core:$versions.sharedUtils"
-        sharedFeaturesBackupDep = "jp.co.soramitsu.shared_features:backup:$versions.sharedUtils"
         sharedFeaturesModelsDep = "jp.co.soramitsu.shared_features:models:$versions.sharedUtils"
 
         soraCardDep = "jp.co.soramitsu:android-sora-card:$versions.soraCard"
@@ -146,6 +146,8 @@ buildscript {
 
         web3jDep = "org.web3j:core:$versions.web3j"
 
+        xbackupDep = "jp.co.soramitsu:xbackup:$versions.xbackup"
+
         permissionsAccompanistDep = "com.google.accompanist:accompanist-permissions:$versions.accompanist"
         permissionsRuntimeDep = "com.guolindev.permissionx:permissionx:1.7.1"
 

diff --git a/common/build.gradle b/common/build.gradle
@@ -28,14 +28,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     composeOptions {
         kotlinCompilerExtensionVersion versions.composeCompiler
     }
@@ -113,6 +105,7 @@ android {
             buildConfigField "String", "GOOGLE_API_TOKEN", readSecretInQuotes("SORA_GOOGLE_TOKEN_PROD")
         }
     }
+
     namespace 'jp.co.soramitsu.common'
 }
 
@@ -157,7 +150,7 @@ dependencies {
     implementation navigationFragmentDep
     implementation navigationUiDep
 
-    implementation sharedFeaturesBackupDep
+    implementation xbackupDep
     implementation sharedUtilsDep
 
     implementation gsonDep

diff --git a/common/src/main/java/jp/co/soramitsu/common/di/modules/CommonModule.kt b/common/src/main/java/jp/co/soramitsu/common/di/modules/CommonModule.kt
@@ -53,7 +53,6 @@ import java.util.Locale
 import java.util.TimeZone
 import javax.inject.Singleton
 import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
-import jp.co.soramitsu.backup.BackupService
 import jp.co.soramitsu.common.BuildConfig
 import jp.co.soramitsu.common.account.AccountAvatarGenerator
 import jp.co.soramitsu.common.data.AppStateProviderImpl
@@ -83,6 +82,7 @@ import jp.co.soramitsu.common.util.json_decoder.JsonAccountsEncoder
 import jp.co.soramitsu.common.vibration.DeviceVibrator
 import jp.co.soramitsu.crypto.ed25519.Ed25519Sha3
 import jp.co.soramitsu.shared_utils.encrypt.json.JsonSeedEncoder
+import jp.co.soramitsu.xbackup.BackupService
 import jp.co.soramitsu.xnetworking.networkclient.SoramitsuHttpClientProvider
 import jp.co.soramitsu.xnetworking.networkclient.SoramitsuHttpClientProviderImpl
 import jp.co.soramitsu.xnetworking.networkclient.SoramitsuNetworkClient

diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
   <string name="backup_password_requirments">Minimum six characters. Optionally, for better security, include uppercase letters, numbers and non-alphabetic characters.</string>
   <string name="backup_password_title">Setting a password will encrypt your Google backup. You’ll need to enter this when restoring your wallet.\nMinimum password length is 6 characters.</string>
   <string name="backup_password_title_2">Setting a password will encrypt your Google backup. You’ll need to enter this when restoring your wallet.</string>
+  <string name="backup_not_enough_space_error">Backup failed. Not enough space on your Google Drive. Free some space and try again.</string>
   <string name="biometric_dialog_title">Authenticate</string>
   <string name="block_id">Block hash</string>
   <string name="buy_crypto_buy_xor_banner_title">Buy XOR token</string>

diff --git a/common_wallet/build.gradle b/common_wallet/build.gradle
@@ -24,14 +24,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     composeOptions {
         kotlinCompilerExtensionVersion versions.composeCompiler
     }

diff --git a/core_db/build.gradle b/core_db/build.gradle
@@ -18,14 +18,6 @@ android {
         minSdkVersion minVersion
         targetSdkVersion targetVersion
 
-//        javaCompileOptions {
-//            annotationProcessorOptions {
-//                arguments += [
-//                        "room.schemaLocation":"$projectDir/schemas".toString(),
-//                        "room.incremental":"true"]
-//            }
-//        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -36,14 +28,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     flavorDimensions "default"
 
     productFlavors {

diff --git a/core_di/build.gradle b/core_di/build.gradle
@@ -15,14 +15,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     flavorDimensions "default"
 
     productFlavors {

diff --git a/demeter/build.gradle b/demeter/build.gradle
@@ -25,13 +25,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = '1.8'
-//    }
+
     composeOptions {
         kotlinCompilerExtensionVersion versions.composeCompiler
     }

diff --git a/feature_account_api/build.gradle b/feature_account_api/build.gradle
@@ -17,14 +17,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildTypes {
         release {
             minifyEnabled soraMinifyRelease

diff --git a/feature_account_impl/build.gradle b/feature_account_impl/build.gradle
@@ -25,14 +25,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     flavorDimensions "default"
 
     productFlavors {

diff --git a/feature_assets_api/build.gradle b/feature_assets_api/build.gradle
@@ -19,14 +19,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildTypes {
         release {
             minifyEnabled soraMinifyRelease

diff --git a/feature_assets_impl/build.gradle b/feature_assets_impl/build.gradle
@@ -19,14 +19,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildTypes {
         release {
             minifyEnabled soraMinifyRelease

diff --git a/feature_blockexplorer_api/build.gradle b/feature_blockexplorer_api/build.gradle
@@ -21,14 +21,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildFeatures {
         viewBinding true
         compose true

diff --git a/feature_blockexplorer_impl/build.gradle b/feature_blockexplorer_impl/build.gradle
@@ -21,14 +21,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildFeatures {
         viewBinding true
         compose true

diff --git a/feature_ecosystem_api/build.gradle b/feature_ecosystem_api/build.gradle
@@ -19,14 +19,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildTypes {
         release {
             minifyEnabled soraMinifyRelease

diff --git a/feature_ecosystem_impl/build.gradle b/feature_ecosystem_impl/build.gradle
@@ -26,14 +26,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildFeatures {
         viewBinding true
         compose true

diff --git a/feature_ethereum_api/build.gradle b/feature_ethereum_api/build.gradle
@@ -24,14 +24,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     flavorDimensions "default"
 
     productFlavors {

diff --git a/feature_ethereum_impl/build.gradle b/feature_ethereum_impl/build.gradle
@@ -24,14 +24,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     flavorDimensions "default"
 
     productFlavors {

diff --git a/feature_main_api/build.gradle b/feature_main_api/build.gradle
@@ -17,14 +17,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     buildTypes {
         release {
             minifyEnabled soraMinifyRelease

diff --git a/feature_main_impl/build.gradle b/feature_main_impl/build.gradle
@@ -25,14 +25,6 @@ android {
         }
     }
 
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = JavaVersion.VERSION_1_8
-//    }
-
     flavorDimensions "default"
 
     productFlavors {
@@ -99,9 +91,9 @@ dependencies {
 
     implementation googlePlayServiceAuth
     implementation googleApiServicesDrive
-    implementation sharedFeaturesBackupDep
+    implementation xbackupDep
     implementation sharedFeaturesModelsDep
-    
+
     implementation composeUiDep
     implementation composeThemeAdapterDep
     implementation composeFoundationDep