From 4103d866d8c7e9aee6c58dd4e078dcdc54f5846b Mon Sep 17 00:00:00 2001 From: Ali Abdulmadzhidov Date: Tue, 3 Oct 2023 09:47:50 +0300 Subject: [PATCH] mwr-638 && downgrade_java_version_11 --- app/build.gradle | 8 ++------ common/build.gradle | 8 ++------ common_wallet/build.gradle | 8 ++------ core_db/build.gradle | 8 ++------ core_di/build.gradle | 8 ++------ demeter/build.gradle | 8 ++------ feature_account_api/build.gradle | 8 ++------ feature_account_impl/build.gradle | 8 ++------ feature_assets_api/build.gradle | 8 ++------ feature_assets_impl/build.gradle | 8 ++------ feature_blockexplorer_api/build.gradle | 8 ++------ feature_blockexplorer_impl/build.gradle | 8 ++------ feature_ecosystem_api/build.gradle | 8 ++------ feature_ecosystem_impl/build.gradle | 8 ++------ feature_ethereum_api/build.gradle | 8 ++------ feature_ethereum_impl/build.gradle | 8 ++------ feature_main_api/build.gradle | 8 ++------ feature_main_impl/build.gradle | 8 ++------ feature_multiaccount_api/build.gradle | 8 ++------ feature_multiaccount_impl/build.gradle | 8 ++------ feature_polkaswap_api/build.gradle | 8 ++------ feature_polkaswap_impl/build.gradle | 8 ++------ feature_referral_api/build.gradle | 8 ++------ feature_referral_impl/build.gradle | 8 ++------ feature_select_node_api/build.gradle | 8 ++------ feature_select_node_impl/build.gradle | 8 ++------ feature_sora_card_api/build.gradle | 8 ++------ feature_sora_card_impl/build.gradle | 8 ++------ feature_wallet_api/build.gradle | 8 ++------ feature_wallet_impl/build.gradle | 8 ++------ network/build.gradle | 8 ++------ soracrypro/build.gradle | 8 ++------ sorasubstrate/build.gradle | 8 ++------ test_data/build.gradle | 8 ++------ test_shared/build.gradle | 8 ++------ 35 files changed, 70 insertions(+), 210 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 57af069c9..18ab52d97 100644 --- 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 index dbc13062e..ee1ce5227 100644 --- 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 index b81915b58..9eb23fb55 100644 --- 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 index 2d2daf11b..31328a0b5 100644 --- 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 index 01351bccc..2fc7ce680 100644 --- 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 index 8e7f976a3..86187108f 100644 --- 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 index 87848d8da..9635021ef 100644 --- 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 index 4d75b0a33..92539ca13 100644 --- 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 index 669d90d46..47fee579c 100644 --- 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 index e13c0bfa5..9ffd068b1 100644 --- 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 index 32bbe4f88..4c743dda1 100644 --- 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 index 06c7235bf..9246753db 100644 --- 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 index 8fde90a1f..b2019c7d0 100644 --- 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 index fa621af90..9a6e848e2 100644 --- 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 index 2edce2c48..b889fc73b 100644 --- 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 index c6d3ff133..5f82745b3 100644 --- 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 index 47af0e264..66ff6a08b 100644 --- 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 index 588d2a379..3d4051e92 100644 --- 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 index bb43406e6..fe8ca42c0 100644 --- 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 index 09684eab6..ef8242334 100644 --- 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 index 5a660a03d..e57d0ed9c 100644 --- 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 index 0bccc6c22..9530afd84 100644 --- 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 index cfcb43a25..bdcdf6b0d 100644 --- 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 index 4563a38e4..6836a572c 100644 --- 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 index d8f7adb54..b2cf7a02c 100644 --- 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 index 265b16aa0..b622292a7 100644 --- 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) } } diff --git a/feature_sora_card_api/build.gradle b/feature_sora_card_api/build.gradle index 21b8c666b..5c362a483 100644 --- a/feature_sora_card_api/build.gradle +++ b/feature_sora_card_api/build.gradle @@ -46,12 +46,8 @@ android { } namespace 'jp.co.soramitsu.feature_sora_card_api' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/feature_sora_card_impl/build.gradle b/feature_sora_card_impl/build.gradle index 36335c6fb..8420da274 100644 --- a/feature_sora_card_impl/build.gradle +++ b/feature_sora_card_impl/build.gradle @@ -56,12 +56,8 @@ android { } namespace 'jp.co.soramitsu.feature_sora_card_impl' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/feature_wallet_api/build.gradle b/feature_wallet_api/build.gradle index 06b3d6c2e..5dfdbabd5 100644 --- a/feature_wallet_api/build.gradle +++ b/feature_wallet_api/build.gradle @@ -47,12 +47,8 @@ android { } namespace 'jp.co.soramitsu.feature_wallet_api' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/feature_wallet_impl/build.gradle b/feature_wallet_impl/build.gradle index f39440e55..2b297d0a9 100644 --- a/feature_wallet_impl/build.gradle +++ b/feature_wallet_impl/build.gradle @@ -60,12 +60,8 @@ android { } namespace 'jp.co.soramitsu.feature_wallet_impl' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/network/build.gradle b/network/build.gradle index 176dfaf40..12adec0d3 100644 --- a/network/build.gradle +++ b/network/build.gradle @@ -45,12 +45,8 @@ android { } namespace 'jp.co.soramitsu.network' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/soracrypro/build.gradle b/soracrypro/build.gradle index d5eb4252f..7aafa91fd 100644 --- a/soracrypro/build.gradle +++ b/soracrypro/build.gradle @@ -47,12 +47,8 @@ android { } namespace 'jp.co.soramitsu.soracrypro' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/sorasubstrate/build.gradle b/sorasubstrate/build.gradle index e78db6541..a37cf86b4 100644 --- a/sorasubstrate/build.gradle +++ b/sorasubstrate/build.gradle @@ -50,12 +50,8 @@ android { } namespace 'jp.co.soramitsu.sora.substrate' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/test_data/build.gradle b/test_data/build.gradle index b6a2f0dfe..c18ffe590 100644 --- a/test_data/build.gradle +++ b/test_data/build.gradle @@ -43,12 +43,8 @@ android { } namespace 'jp.co.soramitsu.test_data' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } } diff --git a/test_shared/build.gradle b/test_shared/build.gradle index 68ee184a5..7a8de4016 100644 --- a/test_shared/build.gradle +++ b/test_shared/build.gradle @@ -23,12 +23,8 @@ android { } namespace 'jp.co.soramitsu.test_shared' - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = "11" + kotlin { + jvmToolchain(11) } }