downgrade_java_version_11

sora-xor · Oct 2, 2023 · 9f888f6 · 9f888f6
1 parent c5ed72e
commit 9f888f6
Show file tree

Hide file tree

Showing 37 changed files with 284 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -120,6 +120,14 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "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
@@ -51,7 +51,7 @@ buildscript {
             accompanist            : '0.30.1',
             xserializationjson     : '1.5.0',
             ktor                   : '2.3.1',
-            xbackup                : '0.0.2-20230915.111539-1'
+            xbackup                : '0.0.2-20231002.173502-3'
     ]
 
     ext {
@@ -220,7 +220,7 @@ 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:8.2.0-beta01'
+        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'

diff --git a/common/build.gradle b/common/build.gradle
@@ -105,6 +105,15 @@ android {
             buildConfigField "String", "GOOGLE_API_TOKEN", readSecretInQuotes("SORA_GOOGLE_TOKEN_PROD")
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
     namespace 'jp.co.soramitsu.common'
 }
 

diff --git a/common_wallet/build.gradle b/common_wallet/build.gradle
@@ -53,6 +53,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.common_wallet'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/core_db/build.gradle b/core_db/build.gradle
@@ -48,6 +48,14 @@ android {
         }
     }
     namespace 'com.example.core_db'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 class RoomSchemaArgProvider implements CommandLineArgumentProvider {

diff --git a/core_di/build.gradle b/core_di/build.gradle
@@ -42,6 +42,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.core_di'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/demeter/build.gradle b/demeter/build.gradle
@@ -52,6 +52,14 @@ android {
             dimension 'default'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_account_api/build.gradle b/feature_account_api/build.gradle
@@ -44,6 +44,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_account_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_account_impl/build.gradle b/feature_account_impl/build.gradle
@@ -45,6 +45,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_account_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_assets_api/build.gradle b/feature_assets_api/build.gradle
@@ -55,6 +55,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_assets_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_assets_impl/build.gradle b/feature_assets_impl/build.gradle
@@ -55,6 +55,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_assets_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_blockexplorer_api/build.gradle b/feature_blockexplorer_api/build.gradle
@@ -56,6 +56,14 @@ android {
             dimension 'default'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_blockexplorer_impl/build.gradle b/feature_blockexplorer_impl/build.gradle
@@ -56,6 +56,14 @@ android {
             dimension 'default'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_ecosystem_api/build.gradle b/feature_ecosystem_api/build.gradle
@@ -46,6 +46,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ecosystem_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_ecosystem_impl/build.gradle b/feature_ecosystem_impl/build.gradle
@@ -55,6 +55,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ecosystem_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_ethereum_api/build.gradle b/feature_ethereum_api/build.gradle
@@ -44,6 +44,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ethereum_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_ethereum_impl/build.gradle b/feature_ethereum_impl/build.gradle
@@ -44,6 +44,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ethereum_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_main_api/build.gradle b/feature_main_api/build.gradle
@@ -44,6 +44,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_main_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_main_impl/build.gradle b/feature_main_impl/build.gradle
@@ -54,6 +54,14 @@ android {
         kotlinCompilerExtensionVersion versions.composeCompiler
     }
     namespace 'jp.co.soramitsu.feature_main_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_multiaccount_api/build.gradle b/feature_multiaccount_api/build.gradle
@@ -44,6 +44,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_multiaccount_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_multiaccount_impl/build.gradle b/feature_multiaccount_impl/build.gradle
@@ -59,6 +59,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_multiaccount_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/..._multiaccount_impl/presentation/export_account/account_details/AccountDetailsViewModel.kt b/..._multiaccount_impl/presentation/export_account/account_details/AccountDetailsViewModel.kt
@@ -324,6 +324,7 @@ class AccountDetailsViewModel @AssistedInject constructor(
                 } catch (e: StorageQuotaExceeded) {
                     withContext(coroutineManager.main) {
                         onError(R.string.backup_not_enough_space_error)
+                        _createBackupPasswordState.value = createBackupPasswordState.copy(isLoading = false)
                     }
                 }
             }

diff --git a/feature_polkaswap_api/build.gradle b/feature_polkaswap_api/build.gradle
@@ -46,6 +46,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_polkaswap_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_polkaswap_impl/build.gradle b/feature_polkaswap_impl/build.gradle
@@ -55,6 +55,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_polkaswap_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_referral_api/build.gradle b/feature_referral_api/build.gradle
@@ -44,6 +44,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_referral_api'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {

diff --git a/feature_referral_impl/build.gradle b/feature_referral_impl/build.gradle
@@ -54,6 +54,14 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_referral_impl'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {