From ba773f6902cd455782ff87cb8708455ebd81b663 Mon Sep 17 00:00:00 2001 From: Sergey Pankratov Date: Wed, 14 Feb 2024 17:50:33 +0500 Subject: [PATCH] gradle 8.2; wip --- app/build.gradle | 6 +++--- app/src/main/java/jp/co/soramitsu/app/App.kt | 5 +++-- build.gradle | 8 ++++---- common/build.gradle | 9 ++++++--- .../soramitsu/common/data/network/OptionsProvider.kt | 2 +- core-api/build.gradle | 6 +++--- core-db/build.gradle | 6 +++--- feature-account-api/build.gradle | 6 +++--- .../domain/PendulumPreInstalledAccountsScenario.kt | 2 +- feature-account-impl/build.gradle | 7 ++++--- .../presentation/exporting/seed/ExportSeedFragment.kt | 2 +- feature-crowdloan-api/build.gradle | 6 +++--- feature-crowdloan-impl/build.gradle | 6 +++--- .../data/network/api/parachain/ParachainMetadata.kt | 2 +- .../custom/acala/AcalaContributeInteractor.kt | 2 +- feature-onboarding-api/build.gradle | 6 +++--- feature-onboarding-impl/build.gradle | 6 +++--- feature-polkaswap-api/build.gradle.kts | 6 +++--- feature-polkaswap-impl/build.gradle.kts | 6 +++--- feature-soracard-api/build.gradle.kts | 6 +++--- feature-soracard-impl/build.gradle.kts | 6 +++--- feature-splash/build.gradle | 6 +++--- feature-staking-api/build.gradle | 6 +++--- feature-staking-impl/build.gradle | 6 +++--- feature-success-api/build.gradle.kts | 6 +++--- feature-success-impl/build.gradle.kts | 6 +++--- feature-wallet-api/build.gradle | 6 +++--- feature-wallet-impl/build.gradle | 7 ++++--- feature-walletconnect-api/build.gradle.kts | 6 +++--- feature-walletconnect-impl/build.gradle.kts | 6 +++--- gradle.properties | 4 +++- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- jacoco.gradle | 4 ++-- runtime-permission/build.gradle | 6 ++++++ runtime/build.gradle | 11 ++++++++++- 36 files changed, 110 insertions(+), 87 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9fde9d42a9..a34ede0ab0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,14 +108,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion diff --git a/app/src/main/java/jp/co/soramitsu/app/App.kt b/app/src/main/java/jp/co/soramitsu/app/App.kt index 082da058cc..e2b559ec7d 100644 --- a/app/src/main/java/jp/co/soramitsu/app/App.kt +++ b/app/src/main/java/jp/co/soramitsu/app/App.kt @@ -9,6 +9,7 @@ import com.walletconnect.android.relay.ConnectionType import com.walletconnect.web3.wallet.client.Wallet import com.walletconnect.web3.wallet.client.Web3Wallet import dagger.hilt.android.HiltAndroidApp +import jp.co.soramitsu.common.BuildConfig import jp.co.soramitsu.common.data.network.OptionsProvider import jp.co.soramitsu.common.resources.ContextManager import jp.co.soramitsu.common.resources.LanguagesHolder @@ -32,7 +33,7 @@ open class App : Application() { override fun onCreate() { super.onCreate() - OptionsProvider.APPLICATION_ID = BuildConfig.APPLICATION_ID + OptionsProvider.APPLICATION_ID = BuildConfig.LIBRARY_PACKAGE_NAME OptionsProvider.CURRENT_VERSION_CODE = BuildConfig.VERSION_CODE OptionsProvider.CURRENT_VERSION_NAME = BuildConfig.VERSION_NAME OptionsProvider.CURRENT_BUILD_TYPE = BuildConfig.BUILD_TYPE @@ -42,7 +43,7 @@ open class App : Application() { private fun setupWalletConnect() { val connectionType = ConnectionType.AUTOMATIC // ConnectionType.AUTOMATIC or ConnectionType.MANUAL - val projectId = jp.co.soramitsu.common.BuildConfig.WALLET_CONNECT_PROJECT_ID // Project ID at https://cloud.walletconnect.com/ + val projectId = BuildConfig.WALLET_CONNECT_PROJECT_ID // Project ID at https://cloud.walletconnect.com/ val relayUrl = "relay.walletconnect.com" val serverUrl = "wss://$relayUrl?projectId=${projectId}" diff --git a/build.gradle b/build.gradle index e7a1355985..abc3f9ea71 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { minSdkVersion = 24 targetSdkVersion = 33 - kotlinVersion = '1.8.20' + kotlinVersion = '1.9.22' materialVersion = '1.8.0' cardViewVersion = '1.0.0' @@ -32,7 +32,7 @@ buildscript { javaxInjectVersion = '1' architectureComponentVersion = '2.6.1' - roomVersion = '2.5.1' + roomVersion = '2.6.1' retrofitVersion = '2.9.0' okhttpVersion = '4.11.0' @@ -66,11 +66,11 @@ buildscript { coilVersion = '2.2.2' - androidxCoreVersion = '1.8.0' + androidxCoreVersion = '1.12.0' composeVersion = '1.5.1' composeFoundationVersion = '1.5.1' - composeCompilerVersion = '1.4.4' + composeCompilerVersion = '1.5.9' appcompatVersion = '1.6.1' recyclerviewVersion = '1.2.0' diff --git a/common/build.gradle b/common/build.gradle index 803cdbc685..888ee5a4b1 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -16,6 +16,8 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "String", "APP_VERSION_NAME", "\"${rootProject.versionName}\"" + buildConfigField "long", "VERSION_CODE", "${rootProject.versionCode}" + buildConfigField "String", "VERSION_NAME", "\"${rootProject.versionName}\"" buildConfigField "String", "POLKASWAP_CONFIG_URL", "\"https://raw.githubusercontent.com/soramitsu/fearless-utils/ios/v3-jsonupd/polkaswapSettings.json\"" buildConfigField "String", "FEATURE_TOGGLE_URL", "\"https://raw.githubusercontent.com/soramitsu/shared-features-utils/master/appConfigs/feature_toggle\"" @@ -83,17 +85,18 @@ android { buildFeatures { viewBinding = true compose = true + buildConfig = true } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion diff --git a/common/src/main/java/jp/co/soramitsu/common/data/network/OptionsProvider.kt b/common/src/main/java/jp/co/soramitsu/common/data/network/OptionsProvider.kt index c57ab1c086..2b0ea96e89 100644 --- a/common/src/main/java/jp/co/soramitsu/common/data/network/OptionsProvider.kt +++ b/common/src/main/java/jp/co/soramitsu/common/data/network/OptionsProvider.kt @@ -1,7 +1,7 @@ package jp.co.soramitsu.common.data.network object OptionsProvider { - var CURRENT_VERSION_CODE: Int = 0 + var CURRENT_VERSION_CODE: Long = 0 var CURRENT_VERSION_NAME: String = "" var APPLICATION_ID: String = "" var CURRENT_BUILD_TYPE: String = "" diff --git a/core-api/build.gradle b/core-api/build.gradle index 6bd76a7ecd..11f00589cc 100644 --- a/core-api/build.gradle +++ b/core-api/build.gradle @@ -13,14 +13,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } namespace 'jp.co.soramitsu.core' } diff --git a/core-db/build.gradle b/core-db/build.gradle index 609a335b42..865f7c4b31 100644 --- a/core-db/build.gradle +++ b/core-db/build.gradle @@ -27,14 +27,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } sourceSets { diff --git a/feature-account-api/build.gradle b/feature-account-api/build.gradle index cd62ec6576..89ee024c77 100644 --- a/feature-account-api/build.gradle +++ b/feature-account-api/build.gradle @@ -18,14 +18,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } namespace 'jp.co.soramitsu.feature_account_api' } diff --git a/feature-account-api/src/main/java/jp/co/soramitsu/account/api/domain/PendulumPreInstalledAccountsScenario.kt b/feature-account-api/src/main/java/jp/co/soramitsu/account/api/domain/PendulumPreInstalledAccountsScenario.kt index ef04b2b66f..4afb9473cc 100644 --- a/feature-account-api/src/main/java/jp/co/soramitsu/account/api/domain/PendulumPreInstalledAccountsScenario.kt +++ b/feature-account-api/src/main/java/jp/co/soramitsu/account/api/domain/PendulumPreInstalledAccountsScenario.kt @@ -1,11 +1,11 @@ package jp.co.soramitsu.account.api.domain import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository +import jp.co.soramitsu.common.BuildConfig import jp.co.soramitsu.common.data.network.config.RemoteConfigFetcher import jp.co.soramitsu.common.data.storage.Preferences import jp.co.soramitsu.common.utils.DEFAULT_DERIVATION_PATH import jp.co.soramitsu.core.models.CryptoType -import jp.co.soramitsu.feature_account_api.BuildConfig import jp.co.soramitsu.shared_utils.encrypt.junction.BIP32JunctionDecoder import jp.co.soramitsu.shared_utils.extensions.fromHex diff --git a/feature-account-impl/build.gradle b/feature-account-impl/build.gradle index 29eb3547f0..a5929422c5 100644 --- a/feature-account-impl/build.gradle +++ b/feature-account-impl/build.gradle @@ -25,17 +25,18 @@ android { buildFeatures { viewBinding = true compose true + buildConfig = true } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion diff --git a/feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/presentation/exporting/seed/ExportSeedFragment.kt b/feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/presentation/exporting/seed/ExportSeedFragment.kt index f10ad8f857..61385d538d 100644 --- a/feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/presentation/exporting/seed/ExportSeedFragment.kt +++ b/feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/presentation/exporting/seed/ExportSeedFragment.kt @@ -11,9 +11,9 @@ import androidx.fragment.app.viewModels import dagger.hilt.android.AndroidEntryPoint import jp.co.soramitsu.account.impl.presentation.exporting.ExportFragment import jp.co.soramitsu.account.impl.presentation.view.advanced.AdvancedBlockView.FieldState +import jp.co.soramitsu.common.BuildConfig import jp.co.soramitsu.common.utils.ComponentHolder import jp.co.soramitsu.common.utils.mediateWith -import jp.co.soramitsu.core.BuildConfig import jp.co.soramitsu.feature_account_impl.R import jp.co.soramitsu.feature_account_impl.databinding.FragmentExportSeedBinding import jp.co.soramitsu.runtime.multiNetwork.chain.model.ChainId diff --git a/feature-crowdloan-api/build.gradle b/feature-crowdloan-api/build.gradle index 8487f1979a..c18577ce13 100644 --- a/feature-crowdloan-api/build.gradle +++ b/feature-crowdloan-api/build.gradle @@ -13,14 +13,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } namespace 'jp.co.soramitsu.feature_crowdloan_api' } diff --git a/feature-crowdloan-impl/build.gradle b/feature-crowdloan-impl/build.gradle index ce0fadbac2..6f011e827c 100644 --- a/feature-crowdloan-impl/build.gradle +++ b/feature-crowdloan-impl/build.gradle @@ -28,12 +28,12 @@ android { kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'jp.co.soramitsu.feature_crowdloan_impl' } diff --git a/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/data/network/api/parachain/ParachainMetadata.kt b/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/data/network/api/parachain/ParachainMetadata.kt index 1e8962f3d9..70ee9ffe1d 100644 --- a/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/data/network/api/parachain/ParachainMetadata.kt +++ b/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/data/network/api/parachain/ParachainMetadata.kt @@ -1,8 +1,8 @@ package jp.co.soramitsu.crowdloan.impl.data.network.api.parachain +import jp.co.soramitsu.common.BuildConfig import jp.co.soramitsu.crowdloan.api.data.repository.ParachainMetadata import jp.co.soramitsu.crowdloan.api.data.repository.ParachainMetadataFlow -import jp.co.soramitsu.feature_crowdloan_impl.BuildConfig fun mapParachainMetadataRemoteToParachainMetadata(parachainMetadata: ParachainMetadataRemote) = with(parachainMetadata) { diff --git a/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt b/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt index 69c5eb65c2..70ecbae62d 100644 --- a/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt @@ -10,7 +10,6 @@ import jp.co.soramitsu.crowdloan.impl.data.network.blockhain.extrinsic.addRemark import jp.co.soramitsu.crowdloan.impl.presentation.contribute.custom.acala.AcalaBonusPayload import jp.co.soramitsu.crowdloan.impl.presentation.contribute.custom.acala.AcalaContributionType.DirectDOT import jp.co.soramitsu.crowdloan.impl.presentation.contribute.custom.acala.AcalaContributionType.LcDOT -import jp.co.soramitsu.feature_crowdloan_impl.BuildConfig import jp.co.soramitsu.runtime.multiNetwork.ChainRegistry import jp.co.soramitsu.shared_utils.extensions.toHexString import jp.co.soramitsu.shared_utils.runtime.extrinsic.ExtrinsicBuilder @@ -18,6 +17,7 @@ import jp.co.soramitsu.wallet.impl.domain.model.planksFromAmount import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigDecimal +import jp.co.soramitsu.common.BuildConfig class AcalaContributeInteractor( private val acalaApi: AcalaApi, diff --git a/feature-onboarding-api/build.gradle b/feature-onboarding-api/build.gradle index 72bd376302..36d098486e 100644 --- a/feature-onboarding-api/build.gradle +++ b/feature-onboarding-api/build.gradle @@ -13,14 +13,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } namespace 'jp.co.soramitsu.feature_onboarding_api' } diff --git a/feature-onboarding-impl/build.gradle b/feature-onboarding-impl/build.gradle index c9ad6da540..5e29b11f31 100644 --- a/feature-onboarding-impl/build.gradle +++ b/feature-onboarding-impl/build.gradle @@ -28,14 +28,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion diff --git a/feature-polkaswap-api/build.gradle.kts b/feature-polkaswap-api/build.gradle.kts index 27d1414a77..0fd6ae5bfe 100644 --- a/feature-polkaswap-api/build.gradle.kts +++ b/feature-polkaswap-api/build.gradle.kts @@ -13,12 +13,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } namespace = "jp.co.soramitsu.feature_polkaswap_api" diff --git a/feature-polkaswap-impl/build.gradle.kts b/feature-polkaswap-impl/build.gradle.kts index 0ab4ce68bc..6b1be4e8e3 100644 --- a/feature-polkaswap-impl/build.gradle.kts +++ b/feature-polkaswap-impl/build.gradle.kts @@ -25,8 +25,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } composeOptions { @@ -34,7 +34,7 @@ android { } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } namespace = "jp.co.soramitsu.feature_polkaswap_impl" } diff --git a/feature-soracard-api/build.gradle.kts b/feature-soracard-api/build.gradle.kts index fce2f98a02..ada3c686d6 100644 --- a/feature-soracard-api/build.gradle.kts +++ b/feature-soracard-api/build.gradle.kts @@ -14,12 +14,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } namespace = "jp.co.soramitsu.feature_soracard_api" diff --git a/feature-soracard-impl/build.gradle.kts b/feature-soracard-impl/build.gradle.kts index 49034d983b..99d12d0a7f 100644 --- a/feature-soracard-impl/build.gradle.kts +++ b/feature-soracard-impl/build.gradle.kts @@ -28,8 +28,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } composeOptions { @@ -37,7 +37,7 @@ android { } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } namespace = "jp.co.soramitsu.feature_soracard_impl" } diff --git a/feature-splash/build.gradle b/feature-splash/build.gradle index afbe31c8b1..81ff92d7e9 100644 --- a/feature-splash/build.gradle +++ b/feature-splash/build.gradle @@ -25,14 +25,14 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } namespace 'jp.co.soramitsu.splash' } diff --git a/feature-staking-api/build.gradle b/feature-staking-api/build.gradle index f9c1ba8582..27295d1ddb 100644 --- a/feature-staking-api/build.gradle +++ b/feature-staking-api/build.gradle @@ -16,12 +16,12 @@ android { kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'jp.co.soramitsu.feature_staking_api' } diff --git a/feature-staking-impl/build.gradle b/feature-staking-impl/build.gradle index 7b160707be..66532569d4 100644 --- a/feature-staking-impl/build.gradle +++ b/feature-staking-impl/build.gradle @@ -30,7 +30,7 @@ android { kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } composeOptions { @@ -39,8 +39,8 @@ android { } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'jp.co.soramitsu.feature_staking_impl' } diff --git a/feature-success-api/build.gradle.kts b/feature-success-api/build.gradle.kts index 9eff4d8ddd..733a7ff8a3 100644 --- a/feature-success-api/build.gradle.kts +++ b/feature-success-api/build.gradle.kts @@ -12,12 +12,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } namespace = "jp.co.soramitsu.feature_success_api" diff --git a/feature-success-impl/build.gradle.kts b/feature-success-impl/build.gradle.kts index 6e65ffba47..29c6fcf1b0 100644 --- a/feature-success-impl/build.gradle.kts +++ b/feature-success-impl/build.gradle.kts @@ -25,8 +25,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } composeOptions { @@ -34,7 +34,7 @@ android { } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } namespace = "jp.co.soramitsu.feature_success_impl" } diff --git a/feature-wallet-api/build.gradle b/feature-wallet-api/build.gradle index e875e8eaed..aaf9f15071 100644 --- a/feature-wallet-api/build.gradle +++ b/feature-wallet-api/build.gradle @@ -20,11 +20,11 @@ android { kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'jp.co.soramitsu.feature_wallet_api' } diff --git a/feature-wallet-impl/build.gradle b/feature-wallet-impl/build.gradle index 8192ef6605..8c75d04ecd 100644 --- a/feature-wallet-impl/build.gradle +++ b/feature-wallet-impl/build.gradle @@ -44,17 +44,18 @@ android { buildFeatures { viewBinding = true compose = true + buildConfig = true } compileOptions { - sourceCompatibility 11 - targetCompatibility 11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion diff --git a/feature-walletconnect-api/build.gradle.kts b/feature-walletconnect-api/build.gradle.kts index 92422d7e0e..1c588fae23 100644 --- a/feature-walletconnect-api/build.gradle.kts +++ b/feature-walletconnect-api/build.gradle.kts @@ -16,11 +16,11 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } diff --git a/feature-walletconnect-impl/build.gradle.kts b/feature-walletconnect-impl/build.gradle.kts index 0bb2e4e4bf..dfcde58d21 100644 --- a/feature-walletconnect-impl/build.gradle.kts +++ b/feature-walletconnect-impl/build.gradle.kts @@ -15,8 +15,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } buildFeatures { @@ -28,7 +28,7 @@ android { } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } diff --git a/gradle.properties b/gradle.properties index 1ef41c953e..9f8cde3766 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,6 @@ room.incremental=true android.useAndroidX=true android.enableJetifier=true -android.suppressUnsupportedCompileSdk=34 \ No newline at end of file +android.suppressUnsupportedCompileSdk=34 +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 936fa4203c..835825f43b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,9 +13,9 @@ xNetworking = "0.2.5-temp7" retrofit = "2.9.0" gson = "2.10.1" detekt = "1.23.0" -kotlin = "1.8.10" +kotlin = "1.9.22" dagger = "2.47" -android_plugin = "7.4.2" +android_plugin = "8.2.2" sharedFeaturesVersion = "1.1.1.23-FLW" web3j = "4.8.8-android" walletconnectBom = "1.18.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5690275724..c657399023 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Aug 04 19:19:31 YEKT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/jacoco.gradle b/jacoco.gradle index 223ff8848c..2405016a50 100644 --- a/jacoco.gradle +++ b/jacoco.gradle @@ -37,8 +37,8 @@ afterEvaluate { if (!file.exists()) file.mkdirs() reports { - xml.enabled = true - html.enabled = true + xml.required = true + html.required = true html.setDestination(new File(outputFileNameHtml)) xml.setDestination(new File(outputFileName)) } diff --git a/runtime-permission/build.gradle b/runtime-permission/build.gradle index 3e65a8ac74..116bcc27ac 100644 --- a/runtime-permission/build.gradle +++ b/runtime-permission/build.gradle @@ -11,6 +11,12 @@ android { targetSdkVersion rootProject.targetSdkVersion } namespace 'jp.co.soramitsu.runtime_permission' + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + } dependencies { diff --git a/runtime/build.gradle b/runtime/build.gradle index 90fba27a5f..f3bd563b3f 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -27,10 +27,19 @@ android { } } + buildFeatures { + buildConfig = true + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { freeCompilerArgs = ["-Xallow-result-return-type"] - jvmTarget = '11' + jvmTarget = '17' } namespace 'jp.co.soramitsu.runtime'