gradle 8.2; wip

soramitsu · Feb 20, 2024 · ba773f6 · ba773f6
1 parent 8a4a7d7
commit ba773f6
Show file tree

Hide file tree

Showing 36 changed files with 110 additions and 87 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../src/main/java/jp/co/soramitsu/account/api/domain/PendulumPreInstalledAccountsScenario.kt b/.../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
@@ -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/.../main/java/jp/co/soramitsu/account/impl/presentation/exporting/seed/ExportSeedFragment.kt b/.../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
@@ -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
@@ -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/.../main/java/jp/co/soramitsu/crowdloan/impl/data/network/api/parachain/ParachainMetadata.kt b/.../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/...p/co/soramitsu/crowdloan/impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt b/...p/co/soramitsu/crowdloan/impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt
@@ -10,14 +10,14 @@ 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
 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
@@ -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
@@ -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
@@ -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
@@ -25,16 +25,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = rootProject.ext["composeCompilerVersion"] as String
     }
 
     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
@@ -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
@@ -28,16 +28,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = rootProject.ext["composeCompilerVersion"] as String
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
     namespace = "jp.co.soramitsu.feature_soracard_impl"
 }