mwr-638 && downgrade_java_version_11

sora-xor · Oct 3, 2023 · 4103d86 · 4103d86
1 parent 78a2a4e
commit 4103d86
Show file tree

Hide file tree

Showing 35 changed files with 70 additions and 210 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -120,12 +120,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 
     applicationVariants.all { variant ->

diff --git a/common/build.gradle b/common/build.gradle
@@ -106,12 +106,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 
     namespace 'jp.co.soramitsu.common'

diff --git a/common_wallet/build.gradle b/common_wallet/build.gradle
@@ -54,12 +54,8 @@ android {
     }
     namespace 'jp.co.soramitsu.common_wallet'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/core_db/build.gradle b/core_db/build.gradle
@@ -49,12 +49,8 @@ android {
     }
     namespace 'com.example.core_db'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/core_di/build.gradle b/core_di/build.gradle
@@ -43,12 +43,8 @@ android {
     }
     namespace 'jp.co.soramitsu.core_di'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/demeter/build.gradle b/demeter/build.gradle
@@ -53,12 +53,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_account_api/build.gradle b/feature_account_api/build.gradle
@@ -45,12 +45,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_account_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_account_impl/build.gradle b/feature_account_impl/build.gradle
@@ -46,12 +46,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_account_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_assets_api/build.gradle b/feature_assets_api/build.gradle
@@ -56,12 +56,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_assets_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_assets_impl/build.gradle b/feature_assets_impl/build.gradle
@@ -56,12 +56,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_assets_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_blockexplorer_api/build.gradle b/feature_blockexplorer_api/build.gradle
@@ -57,12 +57,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_blockexplorer_impl/build.gradle b/feature_blockexplorer_impl/build.gradle
@@ -57,12 +57,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_ecosystem_api/build.gradle b/feature_ecosystem_api/build.gradle
@@ -47,12 +47,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_ecosystem_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_ecosystem_impl/build.gradle b/feature_ecosystem_impl/build.gradle
@@ -56,12 +56,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_ecosystem_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_ethereum_api/build.gradle b/feature_ethereum_api/build.gradle
@@ -45,12 +45,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_ethereum_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_ethereum_impl/build.gradle b/feature_ethereum_impl/build.gradle
@@ -45,12 +45,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_ethereum_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_main_api/build.gradle b/feature_main_api/build.gradle
@@ -45,12 +45,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_main_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_main_impl/build.gradle b/feature_main_impl/build.gradle
@@ -55,12 +55,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_main_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_multiaccount_api/build.gradle b/feature_multiaccount_api/build.gradle
@@ -45,12 +45,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_multiaccount_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_multiaccount_impl/build.gradle b/feature_multiaccount_impl/build.gradle
@@ -60,12 +60,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_multiaccount_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_polkaswap_api/build.gradle b/feature_polkaswap_api/build.gradle
@@ -47,12 +47,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_polkaswap_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_polkaswap_impl/build.gradle b/feature_polkaswap_impl/build.gradle
@@ -56,12 +56,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_polkaswap_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_referral_api/build.gradle b/feature_referral_api/build.gradle
@@ -45,12 +45,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_referral_api'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_referral_impl/build.gradle b/feature_referral_impl/build.gradle
@@ -55,12 +55,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_referral_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_select_node_api/build.gradle b/feature_select_node_api/build.gradle
@@ -65,12 +65,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

diff --git a/feature_select_node_impl/build.gradle b/feature_select_node_impl/build.gradle
@@ -55,12 +55,8 @@ android {
     }
     namespace 'jp.co.soramitsu.feature_select_node_impl'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }