merge develop

sora-xor · Oct 3, 2023 · 489510b · 489510b
2 parents 4103d86 + 32e55c2
commit 489510b
Show file tree

Hide file tree

Showing 34 changed files with 2 additions and 137 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -106,10 +106,6 @@ android {
         }
     }
 
-    kotlin {
-        jvmToolchain(11)
-    }
-
     namespace 'jp.co.soramitsu.common'
 }
 

diff --git a/common_wallet/build.gradle b/common_wallet/build.gradle
@@ -53,10 +53,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.common_wallet'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/core_db/build.gradle b/core_db/build.gradle
@@ -48,10 +48,6 @@ android {
         }
     }
     namespace 'com.example.core_db'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 class RoomSchemaArgProvider implements CommandLineArgumentProvider {

diff --git a/core_di/build.gradle b/core_di/build.gradle
@@ -42,10 +42,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.core_di'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/demeter/build.gradle b/demeter/build.gradle
@@ -25,6 +25,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     composeOptions {
         kotlinCompilerExtensionVersion versions.composeCompiler
     }
@@ -52,10 +53,6 @@ android {
             dimension 'default'
         }
     }
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_account_api/build.gradle b/feature_account_api/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_account_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_account_impl/build.gradle b/feature_account_impl/build.gradle
@@ -45,10 +45,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_account_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_assets_api/build.gradle b/feature_assets_api/build.gradle
@@ -55,10 +55,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_assets_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_assets_impl/build.gradle b/feature_assets_impl/build.gradle
@@ -55,10 +55,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_assets_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_blockexplorer_api/build.gradle b/feature_blockexplorer_api/build.gradle
@@ -56,10 +56,6 @@ android {
             dimension 'default'
         }
     }
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_blockexplorer_impl/build.gradle b/feature_blockexplorer_impl/build.gradle
@@ -56,10 +56,6 @@ android {
             dimension 'default'
         }
     }
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_ecosystem_api/build.gradle b/feature_ecosystem_api/build.gradle
@@ -46,10 +46,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ecosystem_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_ecosystem_impl/build.gradle b/feature_ecosystem_impl/build.gradle
@@ -55,10 +55,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ecosystem_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_ethereum_api/build.gradle b/feature_ethereum_api/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ethereum_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_ethereum_impl/build.gradle b/feature_ethereum_impl/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_ethereum_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_main_api/build.gradle b/feature_main_api/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_main_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_main_impl/build.gradle b/feature_main_impl/build.gradle
@@ -54,10 +54,6 @@ android {
         kotlinCompilerExtensionVersion versions.composeCompiler
     }
     namespace 'jp.co.soramitsu.feature_main_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_multiaccount_api/build.gradle b/feature_multiaccount_api/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_multiaccount_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_multiaccount_impl/build.gradle b/feature_multiaccount_impl/build.gradle
@@ -59,10 +59,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_multiaccount_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {
@@ -118,6 +114,7 @@ dependencies {
     implementation composeConstraintLayoutDep
     implementation composeLiveDataDep
     implementation navigationComposeDep
+
     implementation xbackupDep
     implementation sharedFeaturesModelsDep
     debugImplementation composeToolingDep

diff --git a/feature_polkaswap_api/build.gradle b/feature_polkaswap_api/build.gradle
@@ -46,10 +46,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_polkaswap_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_polkaswap_impl/build.gradle b/feature_polkaswap_impl/build.gradle
@@ -55,10 +55,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_polkaswap_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_referral_api/build.gradle b/feature_referral_api/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_referral_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_referral_impl/build.gradle b/feature_referral_impl/build.gradle
@@ -54,10 +54,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_referral_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_select_node_api/build.gradle b/feature_select_node_api/build.gradle
@@ -64,10 +64,6 @@ android {
             dimension 'default'
         }
     }
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_select_node_impl/build.gradle b/feature_select_node_impl/build.gradle
@@ -54,10 +54,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_select_node_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_sora_card_api/build.gradle b/feature_sora_card_api/build.gradle
@@ -45,10 +45,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_sora_card_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_sora_card_impl/build.gradle b/feature_sora_card_impl/build.gradle
@@ -55,10 +55,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_sora_card_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_wallet_api/build.gradle b/feature_wallet_api/build.gradle
@@ -46,10 +46,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_wallet_api'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/feature_wallet_impl/build.gradle b/feature_wallet_impl/build.gradle
@@ -59,10 +59,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.feature_wallet_impl'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/network/build.gradle b/network/build.gradle
@@ -44,10 +44,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.network'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/soracrypro/build.gradle b/soracrypro/build.gradle
@@ -46,10 +46,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.soracrypro'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/sorasubstrate/build.gradle b/sorasubstrate/build.gradle
@@ -28,7 +28,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
     flavorDimensions "default"
 
     productFlavors {
@@ -49,10 +48,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.sora.substrate'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/test_data/build.gradle b/test_data/build.gradle
@@ -42,10 +42,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.test_data'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {

diff --git a/test_shared/build.gradle b/test_shared/build.gradle
@@ -22,10 +22,6 @@ android {
         }
     }
     namespace 'jp.co.soramitsu.test_shared'
-
-    kotlin {
-        jvmToolchain(11)
-    }
 }
 
 dependencies {
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,10 +106,6 @@ android { @@
             }
         }
-        kotlin {
-            jvmToolchain(11)
-        }
         namespace 'jp.co.soramitsu.common'
     }
@@ Expand Down @@