From 0d8070654d894cc88546e54f7c833a8eeeb70f98 Mon Sep 17 00:00:00 2001 From: josephj Date: Thu, 5 Sep 2024 16:34:16 +0200 Subject: [PATCH] Create libs.versions.toml and migrate dependencies to it COAND-977 --- 3ds2/build.gradle | 22 ++-- ach/build.gradle | 22 ++-- action-core/build.gradle | 20 +-- action/build.gradle | 20 +-- await/build.gradle | 20 +-- bacs/build.gradle | 20 +-- bcmc/build.gradle | 20 +-- blik/build.gradle | 22 ++-- boleto/build.gradle | 20 +-- build.gradle | 24 ++-- card/build.gradle | 22 ++-- cashapppay/build.gradle | 22 ++-- checkout-core/build.gradle | 28 ++-- components-compose/build.gradle | 16 +-- components-core/build.gradle | 45 ++++--- config/gradle/buildConfig.gradle | 2 +- config/gradle/detekt.gradle | 6 +- config/gradle/dokka.gradle | 2 + config/gradle/dokkaRoot.gradle | 2 + config/gradle/jacoco.gradle | 4 +- config/gradle/ktlint.gradle | 2 +- config/gradle/release.gradle | 4 +- config/gradle/sonarcloud.gradle | 2 + config/module/template/build.gradle | 12 +- convenience-stores-jp/build.gradle | 16 +-- cse/build.gradle | 24 ++-- dependencies.gradle | 193 ---------------------------- dotpay/build.gradle | 18 +-- drop-in-compose/build.gradle | 16 +-- drop-in/build.gradle | 26 ++-- econtext/build.gradle | 20 +-- entercash/build.gradle | 18 +-- eps/build.gradle | 18 +-- example-app/build.gradle | 82 ++++++------ giftcard/build.gradle | 20 +-- googlepay/build.gradle | 22 ++-- gradle/libs.versions.toml | 189 +++++++++++++++++++++++++++ ideal/build.gradle | 22 ++-- instant/build.gradle | 20 +-- issuer-list/build.gradle | 22 ++-- lint/build.gradle | 10 +- mbway/build.gradle | 20 +-- meal-voucher-fr/build.gradle | 18 +-- molpay/build.gradle | 18 +-- online-banking-core/build.gradle | 26 ++-- online-banking-cz/build.gradle | 16 +-- online-banking-jp/build.gradle | 16 +-- online-banking-pl/build.gradle | 18 +-- online-banking-sk/build.gradle | 16 +-- openbanking/build.gradle | 18 +-- paybybank/build.gradle | 20 +-- payeasy/build.gradle | 16 +-- qr-code/build.gradle | 22 ++-- redirect/build.gradle | 20 +-- sepa/build.gradle | 20 +-- sessions-core/build.gradle | 25 ++-- settings.gradle | 1 + seven-eleven/build.gradle | 16 +-- test-core/build.gradle | 16 +-- twint-action/build.gradle | 24 ++-- twint/build.gradle | 22 ++-- ui-core/build.gradle | 36 +++--- upi/build.gradle | 20 +-- voucher/build.gradle | 22 ++-- wechatpay/build.gradle | 22 ++-- 65 files changed, 789 insertions(+), 794 deletions(-) delete mode 100644 dependencies.gradle create mode 100644 gradle/libs.versions.toml diff --git a/3ds2/build.gradle b/3ds2/build.gradle index ea830ff4ad..abccc27aa7 100644 --- a/3ds2/build.gradle +++ b/3ds2/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.adyen3ds2' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -41,14 +41,14 @@ dependencies { api project(':ui-core') // Dependencies - api libraries.adyen3ds2 + api libs.adyen3ds2 //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/ach/build.gradle b/ach/build.gradle index b0b2a8cc57..11b02cd4b7 100644 --- a/ach/build.gradle +++ b/ach/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact ext.mavenArtifactId = "ach" @@ -12,11 +12,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.ach' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -37,15 +37,15 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':cse')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/action-core/build.gradle b/action-core/build.gradle index 930de80af5..a7746a1f28 100644 --- a/action-core/build.gradle +++ b/action-core/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "action-core" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.action.core' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -56,8 +56,8 @@ dependencies { testImplementation project(':wechatpay') testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/action/build.gradle b/action/build.gradle index 8b29e53d30..40f2fec0b0 100644 --- a/action/build.gradle +++ b/action/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "action" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.action' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -39,8 +39,8 @@ dependencies { //Tests testImplementation testFixtures(project(':test-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/await/build.gradle b/await/build.gradle index e18bc85997..d4fce540a3 100644 --- a/await/build.gradle +++ b/await/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "await" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.await' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -43,8 +43,8 @@ dependencies { testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/bacs/build.gradle b/bacs/build.gradle index e9e9b82fae..d13952589b 100644 --- a/bacs/build.gradle +++ b/bacs/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.bacs' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -43,13 +43,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/bcmc/build.gradle b/bcmc/build.gradle index 30e0d8c221..7bab02254a 100644 --- a/bcmc/build.gradle +++ b/bcmc/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.bcmc' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -48,12 +48,12 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/blik/build.gradle b/blik/build.gradle index 55d75fc920..7e1232ec50 100644 --- a/blik/build.gradle +++ b/blik/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.blik' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -43,14 +43,14 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/boleto/build.gradle b/boleto/build.gradle index 618fa39108..fad366b0d1 100644 --- a/boleto/build.gradle +++ b/boleto/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "boleto" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.boleto' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -42,13 +42,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/build.gradle b/build.gradle index 0f2b8b9929..127b19833d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,14 @@ -buildscript { - apply from: './dependencies.gradle' -} - plugins { - id 'com.android.application' version "$android_gradle_plugin_version" apply false - id 'com.android.library' version "$android_gradle_plugin_version" apply false - id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false - id 'com.google.devtools.ksp' version "$ksp_version" apply false - id 'com.google.dagger.hilt.android' version "$hilt_version" apply false - id 'io.gitlab.arturbosch.detekt' version "$detekt_gradle_plugin_version" - id 'org.jetbrains.dokka' version "$dokka_version" - id 'org.sonarqube' version "$sonarqube_version" - id 'jacoco' - id 'org.jetbrains.kotlinx.binary-compatibility-validator' version "$binary_compatibility_validator_version" + alias libs.plugins.android.application apply false + alias libs.plugins.android.library apply false + alias libs.plugins.jetbrains.kotlin.android apply false + alias libs.plugins.ksp apply false + alias libs.plugins.hilt apply false + alias libs.plugins.detekt + alias libs.plugins.dokka + alias libs.plugins.sonarqube + alias libs.plugins.jacoco + alias libs.plugins.binary.compatibility.validator } apply from: "config/gradle/dokkaRoot.gradle" diff --git a/card/build.gradle b/card/build.gradle index 5f185472d6..85bba90640 100644 --- a/card/build.gradle +++ b/card/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.card' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -49,7 +49,7 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) @@ -57,8 +57,8 @@ dependencies { testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':cse')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/cashapppay/build.gradle b/cashapppay/build.gradle index 4469b9f7ce..aaa0167f39 100644 --- a/cashapppay/build.gradle +++ b/cashapppay/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "cashapppay" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.cashapppay' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -48,13 +48,13 @@ dependencies { api project(':sessions-core') api project(':ui-core') - api libraries.cashAppPay - implementation libraries.material + api libs.cash.app.pay + implementation libs.material testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/checkout-core/build.gradle b/checkout-core/build.gradle index 02ca7d14d9..ab2fee0f5c 100644 --- a/checkout-core/build.gradle +++ b/checkout-core/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "checkout-core" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.core' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -33,14 +33,14 @@ android { dependencies { // Dependencies - api libraries.androidx.annotation - api libraries.kotlinCoroutines - implementation libraries.okhttp - api libraries.parcelize + api libs.androidx.annotation + api libs.bundles.kotlin.coroutines + implementation libs.okhttp + api libs.parcelize //Tests - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - androidTestImplementation testLibraries.androidTest - androidTestImplementation testLibraries.espresso + testImplementation libs.json + testImplementation libs.bundles.junit + androidTestImplementation libs.bundles.androidx.test + androidTestImplementation libs.bundles.espresso } diff --git a/components-compose/build.gradle b/components-compose/build.gradle index 4d6f3892b6..f46433e8b4 100644 --- a/components-compose/build.gradle +++ b/components-compose/build.gradle @@ -7,8 +7,8 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android } // Maven artifact @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.components.compose' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -35,7 +35,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = compose_compiler_version + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } } @@ -45,6 +45,6 @@ dependencies { api project(':sessions-core') api project(':ui-core') - implementation platform(libraries.compose.bom) - implementation libraries.compose.viewmodel + implementation platform(libs.compose.bom) + implementation libs.compose.viewmodel } diff --git a/components-core/build.gradle b/components-core/build.gradle index 8e357861ec..5b50e5c1d1 100644 --- a/components-core/build.gradle +++ b/components-core/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.components.core' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -41,24 +41,23 @@ dependencies { api project(':checkout-core') // Dependencies - api libraries.kotlinCoroutines - api libraries.androidx.activity - api libraries.androidx.fragment - api libraries.androidx.lifecycle + api libs.androidx.activity + api libs.androidx.fragment + api libs.bundles.androidx.lifecycle //Tests testImplementation testFixtures(project(':test-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.androidx.lifecycle - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito - testImplementation testLibraries.robolectric - - androidTestImplementation testLibraries.androidTest - androidTestImplementation testLibraries.mockitoAndroid - androidTestImplementation testLibraries.espresso - - testFixturesImplementation testLibraries.junit5 - testFixturesImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.androidx.test.lifecycle + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito + testImplementation libs.robolectric + + androidTestImplementation libs.bundles.androidx.test + androidTestImplementation libs.bundles.mockito.android + androidTestImplementation libs.bundles.espresso + + testFixturesImplementation libs.bundles.junit + testFixturesImplementation libs.bundles.mockito } diff --git a/config/gradle/buildConfig.gradle b/config/gradle/buildConfig.gradle index f43cf2bbcb..20a0c77080 100644 --- a/config/gradle/buildConfig.gradle +++ b/config/gradle/buildConfig.gradle @@ -8,7 +8,7 @@ android { defaultConfig { - buildConfigField "String", "CHECKOUT_VERSION", "\"$version_name\"" + buildConfigField "String", "CHECKOUT_VERSION", "\"${libs.versions.version.name}\"" } buildFeatures { diff --git a/config/gradle/detekt.gradle b/config/gradle/detekt.gradle index f9ef026d92..4026d8bb3f 100644 --- a/config/gradle/detekt.gradle +++ b/config/gradle/detekt.gradle @@ -12,10 +12,12 @@ * Docs: https://github.com/detekt/detekt/ */ +// cannot reference the plugins declared in the version catalogs here because it requires the use of the `plugins` block instead of the `apply plugin` command +// the `plugins` block cannot be used in gradle files such as this one, which are imported into other gradle files with the `apply from` command apply plugin: 'io.gitlab.arturbosch.detekt' detekt { - toolVersion = "$project.detekt_version" + toolVersion = "${libs.versions.detekt.get()}" input = files("src") @@ -36,7 +38,7 @@ tasks.named("detekt").configure { } dependencies { - detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$detekt_version" + detektPlugins libs.detekt } tasks.detekt.jvmTarget = JavaVersion.VERSION_1_8.toString() diff --git a/config/gradle/dokka.gradle b/config/gradle/dokka.gradle index 9494fbbfba..4f5db35fd3 100644 --- a/config/gradle/dokka.gradle +++ b/config/gradle/dokka.gradle @@ -8,6 +8,8 @@ // only apply dokka if module supports kotlin project.plugins.withId("kotlin-android") { + // cannot reference the plugins declared in the version catalogs here because it requires the use of the `plugins` block instead of the `apply plugin` command + // the `plugins` block cannot be used in gradle files such as this one, which are imported into other gradle files with the `apply from` command apply plugin: "org.jetbrains.dokka" tasks.register("javadocJar", Jar) { diff --git a/config/gradle/dokkaRoot.gradle b/config/gradle/dokkaRoot.gradle index 8ce02b9404..41174d3c88 100644 --- a/config/gradle/dokkaRoot.gradle +++ b/config/gradle/dokkaRoot.gradle @@ -6,6 +6,8 @@ * Created by josephj on 15/2/2021. */ +// cannot reference the plugins declared in the version catalogs here because it requires the use of the `plugins` block instead of the `apply plugin` command +// the `plugins` block cannot be used in gradle files such as this one, which are imported into other gradle files with the `apply from` command apply plugin: "org.jetbrains.dokka" tasks.named("dokkaHtmlMultiModule") { diff --git a/config/gradle/jacoco.gradle b/config/gradle/jacoco.gradle index 1e1ee9d25d..aad6ee5669 100644 --- a/config/gradle/jacoco.gradle +++ b/config/gradle/jacoco.gradle @@ -1,3 +1,5 @@ +// cannot reference the plugins declared in the version catalogs here because it requires the use of the `plugins` block instead of the `apply plugin` command +// the `plugins` block cannot be used in gradle files such as this one, which are imported into other gradle files with the `apply from` command apply plugin: 'jacoco' if (project.hasProperty('android')) { @@ -10,7 +12,7 @@ if (project.hasProperty('android')) { project.afterEvaluate { jacoco { - toolVersion = "$jacoco_version" + toolVersion = "${libs.versions.jacoco}" } tasks.withType(Test).configureEach { diff --git a/config/gradle/ktlint.gradle b/config/gradle/ktlint.gradle index 1bde8ae02b..c351a66917 100644 --- a/config/gradle/ktlint.gradle +++ b/config/gradle/ktlint.gradle @@ -17,7 +17,7 @@ configurations { } dependencies { - ktlint "com.pinterest.ktlint:ktlint-cli:$ktlint_version" + ktlint libs.ktlint.cli } tasks.register("ktlint", JavaExec) { diff --git a/config/gradle/release.gradle b/config/gradle/release.gradle index f0bc33c90d..5b318a1eb9 100644 --- a/config/gradle/release.gradle +++ b/config/gradle/release.gradle @@ -5,6 +5,8 @@ * * Created by ran on 6/2/2019. */ +// cannot reference the plugins declared in the version catalogs here because it requires the use of the `plugins` block instead of the `apply plugin` command +// the `plugins` block cannot be used in gradle files such as this one, which are imported into other gradle files with the `apply from` command apply plugin: "maven-publish" apply plugin: "signing" @@ -35,7 +37,7 @@ if (secretPropsFile.exists()) { final theGroupId = "com.adyen.checkout" final theArtifactId = project.mavenArtifactId -final theVersion = project.version_name +final theVersion = libs.versions.version.name.get() final theName = project.mavenArtifactName final theDescription = project.mavenArtifactDescription diff --git a/config/gradle/sonarcloud.gradle b/config/gradle/sonarcloud.gradle index bc3b8a92ef..161a714e69 100644 --- a/config/gradle/sonarcloud.gradle +++ b/config/gradle/sonarcloud.gradle @@ -34,6 +34,8 @@ project(":test-core") { } subprojects { + // cannot reference the plugins declared in the version catalogs here because it requires the use of the `plugins` block instead of the `apply plugin` command + // the `plugins` block cannot be used in gradle files such as this one, which are imported into other gradle files with the `apply from` command apply plugin: 'org.sonarqube' sonar { diff --git a/config/module/template/build.gradle b/config/module/template/build.gradle index a9cdb3bf30..b020885605 100644 --- a/config/module/template/build.gradle +++ b/config/module/template/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.library' - id 'kotlin-android' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android } ext.mavenArtifactId = "#module_name" @@ -10,13 +10,11 @@ ext.mavenArtifactDescription = "Adyen checkout #module_name component client for apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version - versionCode version_code - versionName version_name + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/convenience-stores-jp/build.gradle b/convenience-stores-jp/build.gradle index e709c6c5c6..a07267a3fe 100644 --- a/convenience-stores-jp/build.gradle +++ b/convenience-stores-jp/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.conveniencestoresjp' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -32,6 +32,6 @@ dependencies { api project(':econtext') testImplementation testFixtures(project(':test-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito } diff --git a/cse/build.gradle b/cse/build.gradle index 4f6a0a32c0..8f9532efec 100644 --- a/cse/build.gradle +++ b/cse/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.cse' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -33,11 +33,11 @@ dependencies { api project(':checkout-core') //Tests - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.jose4j + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.jose4j - testFixturesImplementation testLibraries.junit5 - testFixturesImplementation testLibraries.mockito + testFixturesImplementation libs.bundles.junit + testFixturesImplementation libs.bundles.mockito } diff --git a/dependencies.gradle b/dependencies.gradle deleted file mode 100644 index dd9a69ff41..0000000000 --- a/dependencies.gradle +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Copyright (c) 2022 Adyen N.V. - * - * This file is open source and available under the MIT license. See the LICENSE file for more info. - * - * Created by oscars on 8/6/2022. - */ - -ext { - // SDK - compile_sdk_version = 34 - target_sdk_version = 34 - min_sdk_version = 21 - - // App version - // just for example app, don't need to increment - version_code = 1 - // The version_name format is "major.minor.patch(-(alpha|beta|rc)[0-9]{2}){0,1}" (e.g. 3.0.0, 3.1.1-alpha04 or 3.1.4-rc01 etc). - version_name = "5.7.0" - - // Build Script - android_gradle_plugin_version = '8.5.1' - kotlin_version = '1.9.24' - ksp_version = '1.9.24-1.0.20' - detekt_gradle_plugin_version = "1.23.7" - dokka_version = "1.9.20" - hilt_version = "2.52" - compose_compiler_version = '1.5.14' - - // Code quality - detekt_version = "1.23.7" - jacoco_version = '0.8.12' - ktlint_version = '1.3.1' - sonarqube_version = '5.0.0.4638' - binary_compatibility_validator_version = "0.16.0" - - // Android Dependencies - activity_version = "1.9.2" - annotation_version = "1.8.0" - appcompat_version = "1.7.0" - autofill_version = "1.3.0-alpha01" - browser_version = "1.8.0" - coroutines_version = "1.8.1" - fragment_version = "1.8.3" - lifecycle_version = "2.8.3" - material_version = "1.12.0" - recyclerview_version = "1.3.2" - constraintlayout_version = '2.1.4' - - // Compose Dependencies - compose_activity_version = '1.9.2' - compose_bom_version = '2024.06.00' - compose_hilt_version = '1.2.0' - compose_viewmodel_version = '2.8.3' - - // Adyen Dependencies - adyen3ds2_version = "2.2.21" - - // External Dependencies - cash_app_pay_version = '2.5.0' - google_pay_compose_button_version = '1.0.0' - okhttp_version = "4.12.0" - play_services_wallet_version = '19.4.0' - twint_version = '8.0.0' - wechat_pay_version = "6.8.0" - - // Example app - leak_canary_version = '2.14' - moshi_adapters_version = '1.15.1' - moshi_kotlin_adapter_version = '1.15.1' - okhttp_logging_version = "4.12.0" - preference_version = "1.2.1" - retrofit2_version = '2.11.0' - - // Tests - arch_core_testing_version = "2.2.0" - barista_version = "4.3.0" - espresso_version = "3.6.1" - json_version = '20240303' - jose4j_version = '0.9.6' - junit_jupiter_version = "5.11.1" - konsist_version = "0.16.1" - lint_version = "31.7.0" - mockito_kotlin_version = "5.4.0" - mockito_version = "5.12.0" - robolectric_version = "4.13" - test_ext_version = "1.2.1" - test_rules_version = "1.6.1" - turbine_version = "1.1.0" - uiautomator_version = "2.3.0" - - libraries = [ - adyen3ds2 : "com.adyen.threeds:adyen-3ds2:$adyen3ds2_version", - androidx : [ - activity : "androidx.activity:activity:$activity_version", - annotation : "androidx.annotation:annotation:$annotation_version", - appcompat : "androidx.appcompat:appcompat:$appcompat_version", - autofill : "androidx.autofill:autofill:$autofill_version", - browser : "androidx.browser:browser:$browser_version", - constraintlayout: "androidx.constraintlayout:constraintlayout:$constraintlayout_version", - fragment : "androidx.fragment:fragment-ktx:$fragment_version", - lifecycle : [ - "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version", - "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - ], - preference : "androidx.preference:preference-ktx:$preference_version", - recyclerview : "androidx.recyclerview:recyclerview:$recyclerview_version" - ], - cashAppPay : "app.cash.paykit:core:$cash_app_pay_version", - compose : [ - activity : "androidx.activity:activity-compose:$compose_activity_version", - bom : "androidx.compose:compose-bom:$compose_bom_version", - hilt : "androidx.hilt:hilt-navigation-compose:$compose_hilt_version", - material : 'androidx.compose.material3:material3', - ui : [ - 'androidx.compose.ui:ui', - 'androidx.compose.ui:ui-graphics', - 'androidx.compose.ui:ui-tooling-preview', - ], - viewmodel: "androidx.lifecycle:lifecycle-viewmodel-compose:$compose_viewmodel_version" - ], - googlePay : [ - composeButton : "com.google.pay.button:compose-pay-button:$google_pay_compose_button_version", - playServicesWallet: "com.google.android.gms:play-services-wallet:$play_services_wallet_version", - ], - hilt : "com.google.dagger:hilt-android:$hilt_version", - hiltCompiler : "com.google.dagger:hilt-compiler:$hilt_version", - kotlinCoroutines: [ - "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version", - "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - ], - leakCanary : "com.squareup.leakcanary:leakcanary-android:$leak_canary_version", - material : "com.google.android.material:material:$material_version", - moshi : [ - "com.squareup.moshi:moshi-adapters:$moshi_adapters_version", - "com.squareup.moshi:moshi-kotlin:$moshi_kotlin_adapter_version" - ], - okhttp : "com.squareup.okhttp3:okhttp:$okhttp_version", - okhttpLogging : "com.squareup.okhttp3:logging-interceptor:$okhttp_logging_version", - parcelize : "org.jetbrains.kotlin:kotlin-parcelize-runtime:$kotlin_version", - retrofit : [ - "com.squareup.retrofit2:retrofit:$retrofit2_version", - "com.squareup.retrofit2:converter-moshi:$retrofit2_version" - ], - twint : "ch.twint.payment.sdk:android-sdk:$twint_version", - wechat : "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:$wechat_pay_version" - ] - - testLibraries = [ - androidTest : [ - "androidx.test:rules:$test_rules_version", - "androidx.test.ext:junit-ktx:$test_ext_version", - "androidx.test.uiautomator:uiautomator:$uiautomator_version" - ], - androidx : [ - lifecycle: "androidx.arch.core:core-testing:$arch_core_testing_version" - ], - barista : "com.adevinta.android:barista:$barista_version", - espresso : [ - "androidx.test.espresso:espresso-contrib:$espresso_version", - "androidx.test.espresso:espresso-core:$espresso_version", - "androidx.test.espresso:espresso-intents:$espresso_version" - ], - hilt : "com.google.dagger:hilt-android-testing:$hilt_version", - hiltCompiler : "com.google.dagger:hilt-android-compiler:$hilt_version", - jose4j : "org.bitbucket.b_c:jose4j:$jose4j_version", - json : "org.json:json:$json_version", - junit5 : [ - "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version", - "org.junit.jupiter:junit-jupiter-engine:$junit_jupiter_version", - "org.junit.jupiter:junit-jupiter-params:$junit_jupiter_version", - "org.junit.vintage:junit-vintage-engine:$junit_jupiter_version", - ], - konsist : "com.lemonappdev:konsist:$konsist_version", - kotlinCoroutines: [ - "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version", - "app.cash.turbine:turbine:$turbine_version" - ], - lint : "com.android.tools.lint:lint:$lint_version", - lintApi : "com.android.tools.lint:lint-api:$lint_version", - lintTests : "com.android.tools.lint:lint-tests:$lint_version", - mockito : [ - "org.mockito:mockito-junit-jupiter:$mockito_version", - "org.mockito.kotlin:mockito-kotlin:$mockito_kotlin_version" - ], - mockitoAndroid : [ - "org.mockito:mockito-android:$mockito_version", - "org.mockito.kotlin:mockito-kotlin:$mockito_kotlin_version" - ], - mockWebServer : "com.squareup.okhttp3:mockwebserver:$okhttp_version", - robolectric : "org.robolectric:robolectric:$robolectric_version" - ] -} diff --git a/dotpay/build.gradle b/dotpay/build.gradle index dd4376d7dc..5c156c8495 100644 --- a/dotpay/build.gradle +++ b/dotpay/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.dotpay' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -38,9 +38,9 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests - testImplementation testLibraries.junit5 + testImplementation libs.bundles.junit } diff --git a/drop-in-compose/build.gradle b/drop-in-compose/build.gradle index b6d9386957..ccc7432407 100644 --- a/drop-in-compose/build.gradle +++ b/drop-in-compose/build.gradle @@ -7,8 +7,8 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android } // Maven artifact @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.dropin.compose' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -35,7 +35,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = compose_compiler_version + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } } @@ -43,6 +43,6 @@ dependencies { // Checkout api project(':drop-in') - implementation platform(libraries.compose.bom) - implementation libraries.compose.activity + implementation platform(libs.compose.bom) + implementation libs.compose.activity } diff --git a/drop-in/build.gradle b/drop-in/build.gradle index 293e17728a..02829d7f4e 100644 --- a/drop-in/build.gradle +++ b/drop-in/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.dropin' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -80,15 +80,15 @@ dependencies { api project(':wechatpay') // Dependencies - implementation libraries.androidx.recyclerview - implementation libraries.material + implementation libs.androidx.recyclerview + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) - testImplementation testLibraries.androidx.lifecycle - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.androidx.test.lifecycle + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/econtext/build.gradle b/econtext/build.gradle index 732b2f8441..a6d04d84f9 100644 --- a/econtext/build.gradle +++ b/econtext/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.econtext' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -43,7 +43,7 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation project(':3ds2') @@ -52,7 +52,7 @@ dependencies { testImplementation project(':wechatpay') testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/entercash/build.gradle b/entercash/build.gradle index c794d5f23a..21de4fbcf9 100644 --- a/entercash/build.gradle +++ b/entercash/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.entercash' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -38,9 +38,9 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests - testImplementation testLibraries.junit5 + testImplementation libs.bundles.junit } diff --git a/eps/build.gradle b/eps/build.gradle index e9a92f9234..8dddf52b40 100644 --- a/eps/build.gradle +++ b/eps/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.eps' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -38,9 +38,9 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests - testImplementation testLibraries.junit5 + testImplementation libs.bundles.junit } diff --git a/example-app/build.gradle b/example-app/build.gradle index 2a4897b808..b0492f1442 100644 --- a/example-app/build.gradle +++ b/example-app/build.gradle @@ -7,10 +7,10 @@ */ plugins { - id 'com.android.application' - id 'kotlin-android' - id 'com.google.devtools.ksp' - id 'dagger.hilt.android.plugin' + alias libs.plugins.android.application + alias libs.plugins.kotlin.android + alias libs.plugins.ksp + alias libs.plugins.hilt } apply from: "${rootDir}/config/gradle/codeQuality.gradle" @@ -31,16 +31,16 @@ def isIDEBuild() { } android { - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { applicationId "com.adyen.checkout.example" namespace "com.adyen.checkout.example" - minSdk min_sdk_version - targetSdk target_sdk_version - versionCode version_code - versionName version_name + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() + versionCode libs.versions.version.code.get().toInteger() + versionName libs.versions.version.name.get() testInstrumentationRunner 'com.adyen.checkout.test.HiltTestRunner' } @@ -63,7 +63,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = compose_compiler_version + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } } @@ -75,47 +75,47 @@ dependencies { // implementation "com.adyen.checkout:components-compose:5.7.0" // Dependencies - implementation libraries.kotlinCoroutines + implementation libs.bundles.kotlin.coroutines - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview - implementation libraries.androidx.constraintlayout - implementation libraries.androidx.preference + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview + implementation libs.androidx.constraintlayout + implementation libs.androidx.preference - implementation platform(libraries.compose.bom) - implementation libraries.compose.ui - implementation libraries.compose.activity - implementation libraries.compose.hilt - implementation libraries.compose.material - implementation libraries.compose.viewmodel + implementation platform(libs.compose.bom) + implementation libs.bundles.compose.ui + implementation libs.compose.activity + implementation libs.compose.hilt + implementation libs.compose.material + implementation libs.compose.viewmodel - implementation libraries.material + implementation libs.material - implementation libraries.retrofit - implementation libraries.moshi - implementation libraries.okhttpLogging + implementation libs.bundles.retrofit + implementation libs.bundles.moshi + implementation libs.okhttp.logging - implementation libraries.hilt - ksp libraries.hiltCompiler + implementation libs.hilt + ksp libs.hilt.compiler - implementation libraries.googlePay.composeButton + implementation libs.google.pay.compose.button - debugImplementation libraries.leakCanary - debugImplementation 'androidx.compose.ui:ui-tooling' - debugImplementation 'androidx.compose.ui:ui-test-manifest' + debugImplementation libs.leak.canary + debugImplementation libs.compose.ui.tooling + debugImplementation libs.compose.ui.test.manifest // Tests - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.konsist + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.konsist - androidTestImplementation testLibraries.androidTest - androidTestImplementation testLibraries.barista - androidTestImplementation testLibraries.espresso - androidTestImplementation testLibraries.hilt - androidTestImplementation testLibraries.kotlinCoroutines - androidTestImplementation testLibraries.mockWebServer + androidTestImplementation libs.bundles.androidx.test + androidTestImplementation libs.barista + androidTestImplementation libs.bundles.espresso + androidTestImplementation libs.hilt.test + androidTestImplementation libs.bundles.kotlin.coroutines.test + androidTestImplementation libs.mock.web.server - kspAndroidTest testLibraries.hiltCompiler + kspAndroidTest libs.hilt.compiler.test } diff --git a/giftcard/build.gradle b/giftcard/build.gradle index 43aec15b48..35b2f76d31 100644 --- a/giftcard/build.gradle +++ b/giftcard/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "giftcard" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.giftcard' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -47,14 +47,14 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':cse')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/googlepay/build.gradle b/googlepay/build.gradle index a00b361b4a..ecd8f4e789 100644 --- a/googlepay/build.gradle +++ b/googlepay/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.googlepay' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -40,15 +40,15 @@ dependencies { api project(':sessions-core') // Dependencies - api libraries.googlePay.playServicesWallet + api libs.google.pay.play.services.wallet //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':action-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..342b5e7584 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,189 @@ +[versions] +# SDK +compile-sdk = "34" +target-sdk = "34" +min-sdk = "21" + +# App version, only used for example app, no need to increment +version-code = "1" +# The version-name format is "major.minor.patch(-(alpha|beta|rc)[0-9]{2}){0,1}" (e.g. 3.0.0, 3.1.1-alpha04 or 3.1.4-rc01 etc). +version-name = "5.7.0" + +# Build script +android-gradle-plugin = "8.5.1" +kotlin = "1.9.24" +ksp = "1.9.24-1.0.20" +dokka = "1.9.20" +hilt = "2.52" +compose-compiler = "1.5.14" + +# Code quality +detekt = "1.23.7" +jacoco = "0.8.12" +ktlint = "1.3.1" +sonarqube = "5.0.0.4638" +binary-compatibility-validator = "0.16.0" + +# Android dependencies +activity = "1.9.2" +annotation = "1.8.0" +appcompat = "1.7.0" +autofill = "1.3.0-alpha01" +browser = "1.8.0" +coroutines = "1.8.1" +fragment = "1.8.3" +lifecycle = "2.8.3" +material = "1.12.0" +recyclerview = "1.3.2" +constraintlayout = "2.1.4" + +# Compose dependencies +compose-activity = "1.9.2" +compose-bom = "2024.06.00" +compose-hilt = "1.2.0" +compose-viewmodel = "2.8.3" + +# Adyen dependencies +adyen3ds2 = "2.2.20" + +# External dependencies +cash-app-pay = "2.5.0" +google-pay-compose-button = "1.0.0" +okhttp = "4.12.0" +play-services-wallet = "19.4.0" +twint = "8.0.0" +wechat-pay = "6.8.0" + +# Example app +leak-canary = "2.14" +moshi-adapters = "1.15.1" +moshi-kotlin-adapter = "1.15.1" +okhttp-logging = "4.12.0" +preference = "1.2.1" +retrofit2 = "2.11.0" + +# Tests +arch-core-testing = "2.2.0" +barista = "4.3.0" +espresso = "3.6.1" +json = "20240303" +jose4j = "0.9.6" +junit-jupiter = "5.11.1" +konsist = "0.16.1" +lint = "31.7.0" +mockito-kotlin = "5.4.0" +mockito = "5.12.0" +robolectric = "4.13" +test-ext = "1.2.1" +test-rules = "1.6.1" +turbine = "1.1.0" +uiautomator = "2.3.0" + +[libraries] + +# Production libraries +adyen3ds2 = { group = "com.adyen.threeds", name = "adyen-3ds2", version.ref = "adyen3ds2" } +androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } +androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +androidx-autofill = { group = "androidx.autofill", name = "autofill", version.ref = "autofill" } +androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "browser" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } +androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" } +androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" } +androidx-preference = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" } +androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" } +cash-app-pay = { group = "app.cash.paykit", name = "core", version.ref = "cash-app-pay" } +compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "compose-activity" } +compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" } +compose-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "compose-hilt" } +compose-material = { group = "androidx.compose.material3", name = "material3" } +compose-ui-main = { group = "androidx.compose.ui", name = "ui" } +compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +compose-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "compose-viewmodel" } +google-pay-compose-button = { group = "com.google.pay.button", name = "compose-pay-button", version.ref = "google-pay-compose-button" } +google-pay-play-services-wallet = { group = "com.google.android.gms", name = "play-services-wallet", version.ref = "play-services-wallet" } +hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } +hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" } +kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } +kotlin-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +leak-canary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leak-canary" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +moshi-adapters = { group = "com.squareup.moshi", name = "moshi-adapters", version.ref = "moshi-adapters" } +moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "moshi-kotlin-adapter" } +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp-logging" } +parcelize = { group = "org.jetbrains.kotlin", name = "kotlin-parcelize-runtime", version.ref = "kotlin" } +retrofit-main = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit2" } +retrofit-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit2" } +wechat = { group = "com.tencent.mm.opensdk", name = "wechat-sdk-android-without-mta", version.ref = "wechat-pay" } +detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } +ktlint-cli = { group = "com.pinterest.ktlint", name = "ktlint-cli", version.ref = "ktlint" } +twint = { group = "ch.twint.payment.sdk", name = "android-sdk", version.ref = "twint" } + +# Test libraries +androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "test-rules" } +androidx-test-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "test-ext" } +androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" } +androidx-test-lifecycle = { group = "androidx.arch.core", name = "core-testing", version.ref = "arch-core-testing" } +barista = { group = "com.adevinta.android", name = "barista", version.ref = "barista" } +espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" } +espresso-intents = { group = "androidx.test.espresso", name = "espresso-intents", version.ref = "espresso" } +hilt-test = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } +hilt-compiler-test = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } +jose4j = { group = "org.bitbucket.b_c", name = "jose4j", version.ref = "jose4j" } +json = { group = "org.json", name = "json", version.ref = "json" } +junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" } +junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" } +junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit-jupiter" } +junit-vintage-engine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit-jupiter" } +konsist = { group = "com.lemonappdev", name = "konsist", version.ref = "konsist" } +kotlinx-test-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } +cash-app-turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" } +lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" } +lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" } +lint-tests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "lint" } +mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } +mockito-android-main = { group = "org.mockito", name = "mockito-android", version.ref = "mockito" } +mock-web-server = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref = "okhttp" } +robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } + +[bundles] + +# Production bundles +androidx-lifecycle = ["androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel-ktx"] +compose-ui = ["compose-ui-main", "compose-ui-graphics", "compose-ui-tooling-preview"] +kotlin-coroutines = ["kotlin-coroutines-core", "kotlin-coroutines-android"] +moshi = ["moshi-adapters", "moshi-kotlin"] +retrofit = ["retrofit-main", "retrofit-converter-moshi"] + +# Test bundles +androidx-test = ["androidx-test-rules", "androidx-test-junit-ktx", "androidx-test-uiautomator"] +espresso = ["espresso-contrib", "espresso-core", "espresso-intents"] +junit = ["junit-jupiter-api", "junit-jupiter-engine", "junit-jupiter-params", "junit-vintage-engine"] +kotlin-coroutines-test = ["kotlinx-test-coroutines", "cash-app-turbine"] +mockito = ["mockito-junit-jupiter", "mockito-kotlin"] +mockito-android = ["mockito-android-main", "mockito-kotlin"] + +[plugins] +android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } +android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } +kotlin = { id = "kotlin" } +kotlin-android = { id = "kotlin-android" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } +kotlin-parcelize = { id = "kotlin-parcelize" } +jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" } +jacoco = { id = "jacoco" } +binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" } + + diff --git a/ideal/build.gradle b/ideal/build.gradle index 437407889b..e838d0b77c 100644 --- a/ideal/build.gradle +++ b/ideal/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.ideal' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -38,14 +38,14 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/instant/build.gradle b/instant/build.gradle index 409beb93b7..93582e131b 100644 --- a/instant/build.gradle +++ b/instant/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.instant' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -33,13 +33,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/issuer-list/build.gradle b/issuer-list/build.gradle index da4d191bf4..fa3fe1fcf6 100644 --- a/issuer-list/build.gradle +++ b/issuer-list/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.issuerlist' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -43,8 +43,8 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests testImplementation project(':3ds2') @@ -53,7 +53,7 @@ dependencies { testImplementation project(':wechatpay') testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/lint/build.gradle b/lint/build.gradle index d82d0023db..478ebc79a9 100644 --- a/lint/build.gradle +++ b/lint/build.gradle @@ -7,7 +7,7 @@ */ plugins { - id 'kotlin' + alias libs.plugins.kotlin } java { @@ -20,11 +20,11 @@ kotlin { } dependencies { - compileOnly testLibraries.lintApi + compileOnly libs.lint.api - testImplementation testLibraries.junit5 - testImplementation testLibraries.lint - testImplementation testLibraries.lintTests + testImplementation libs.bundles.junit + testImplementation libs.lint + testImplementation libs.lint.tests } jar { diff --git a/mbway/build.gradle b/mbway/build.gradle index a13216c40e..2bc16bdc5e 100644 --- a/mbway/build.gradle +++ b/mbway/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "mbway" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.mbway' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -42,13 +42,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/meal-voucher-fr/build.gradle b/meal-voucher-fr/build.gradle index dcdce4b80c..2862605b79 100644 --- a/meal-voucher-fr/build.gradle +++ b/meal-voucher-fr/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "meal-voucher-fr" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.mealvoucherfr' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -47,7 +47,7 @@ dependencies { testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/molpay/build.gradle b/molpay/build.gradle index 70ff6332be..b935fb7bd4 100644 --- a/molpay/build.gradle +++ b/molpay/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.molpay' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -38,9 +38,9 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests - testImplementation testLibraries.junit5 + testImplementation libs.bundles.junit } diff --git a/online-banking-core/build.gradle b/online-banking-core/build.gradle index a9fa18f9a6..0ff5e4cbdc 100644 --- a/online-banking-core/build.gradle +++ b/online-banking-core/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "online-banking-core" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingcore' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -42,17 +42,17 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview - implementation libraries.material - implementation libraries.androidx.browser + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview + implementation libs.material + implementation libs.androidx.browser //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/online-banking-cz/build.gradle b/online-banking-cz/build.gradle index 888b7b47f1..073afa8b7e 100644 --- a/online-banking-cz/build.gradle +++ b/online-banking-cz/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "online-banking-cz" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingcz' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -36,6 +36,6 @@ dependencies { api project(':action-core') api project(':online-banking-core') - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito } diff --git a/online-banking-jp/build.gradle b/online-banking-jp/build.gradle index 1ba2949c95..ca2516b26f 100644 --- a/online-banking-jp/build.gradle +++ b/online-banking-jp/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingjp' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -31,6 +31,6 @@ android { dependencies { api project(':econtext') - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito } diff --git a/online-banking-pl/build.gradle b/online-banking-pl/build.gradle index 716b7ede01..b0c1350a69 100644 --- a/online-banking-pl/build.gradle +++ b/online-banking-pl/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "online-banking-pl" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingpl' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -37,9 +37,9 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests - testImplementation testLibraries.junit5 + testImplementation libs.bundles.junit } diff --git a/online-banking-sk/build.gradle b/online-banking-sk/build.gradle index 2f755d3e8b..e005e381a8 100644 --- a/online-banking-sk/build.gradle +++ b/online-banking-sk/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "online-banking-sk" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingsk' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -36,6 +36,6 @@ dependencies { api project(':action-core') api project(':online-banking-core') - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito } diff --git a/openbanking/build.gradle b/openbanking/build.gradle index f0dc2b4e04..b7ad88e42a 100644 --- a/openbanking/build.gradle +++ b/openbanking/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.openbanking' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -38,9 +38,9 @@ dependencies { api project(':issuer-list') // Dependencies - implementation libraries.androidx.appcompat - implementation libraries.androidx.recyclerview + implementation libs.androidx.appcompat + implementation libs.androidx.recyclerview //Tests - testImplementation testLibraries.junit5 + testImplementation libs.bundles.junit } diff --git a/paybybank/build.gradle b/paybybank/build.gradle index f9eec2e72c..e39bd2fd84 100644 --- a/paybybank/build.gradle +++ b/paybybank/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.paybybank' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -36,13 +36,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/payeasy/build.gradle b/payeasy/build.gradle index 0e7fdea793..5b436e35c6 100644 --- a/payeasy/build.gradle +++ b/payeasy/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.payeasy' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -31,6 +31,6 @@ android { dependencies { api project(':econtext') - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito } diff --git a/qr-code/build.gradle b/qr-code/build.gradle index 1ac3804f31..f7ca3fd1f1 100644 --- a/qr-code/build.gradle +++ b/qr-code/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "qr-code" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.qrcode' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -44,14 +44,14 @@ dependencies { api project(':ui-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/redirect/build.gradle b/redirect/build.gradle index 3dc705ed90..7a72b97a60 100644 --- a/redirect/build.gradle +++ b/redirect/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.redirect' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -47,8 +47,8 @@ dependencies { testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/sepa/build.gradle b/sepa/build.gradle index 820dea5ca0..fd76c289d3 100644 --- a/sepa/build.gradle +++ b/sepa/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.sepa' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -47,13 +47,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/sessions-core/build.gradle b/sessions-core/build.gradle index 8b4a64e7fb..e0d2ad81e7 100644 --- a/sessions-core/build.gradle +++ b/sessions-core/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "sessions-core" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.sessions.core' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -35,14 +35,11 @@ dependencies { // Checkout api project(':components-core') - // Dependencies - api libraries.kotlinCoroutines - //Tests testImplementation testFixtures(project(':test-core')) - testImplementation testLibraries.androidx.lifecycle - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito - testImplementation testLibraries.robolectric + testImplementation libs.androidx.test.lifecycle + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito + testImplementation libs.robolectric } diff --git a/settings.gradle b/settings.gradle index 05d6c3e282..2956b9a7a4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,6 +7,7 @@ pluginManagement { } plugins { + // this has to be declared here directly because settings.gradle cannot reference version catalogs id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } diff --git a/seven-eleven/build.gradle b/seven-eleven/build.gradle index ba39c6a106..c105ae979e 100644 --- a/seven-eleven/build.gradle +++ b/seven-eleven/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -13,11 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.seveneleven' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -31,6 +31,6 @@ android { dependencies { api project(':econtext') - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito } diff --git a/test-core/build.gradle b/test-core/build.gradle index 178abed755..9c47be7123 100644 --- a/test-core/build.gradle +++ b/test-core/build.gradle @@ -7,19 +7,19 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android } apply from: "${rootDir}/config/gradle/codeQuality.gradle" android { namespace 'com.adyen.checkout.test' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -32,9 +32,9 @@ android { dependencies { testFixturesImplementation project(':checkout-core') - testFixturesImplementation libraries.androidx.lifecycle - testFixturesImplementation testLibraries.junit5 - testFixturesImplementation testLibraries.kotlinCoroutines + testFixturesImplementation libs.bundles.androidx.lifecycle + testFixturesImplementation libs.bundles.junit + testFixturesImplementation libs.bundles.kotlin.coroutines.test } // Disable test tasks, because this module only contains test utils. diff --git a/twint-action/build.gradle b/twint-action/build.gradle index 2c9309373c..9891e4ad78 100644 --- a/twint-action/build.gradle +++ b/twint-action/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "twint-action" @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.twint.action' - compileSdkVersion compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -42,14 +40,14 @@ dependencies { api project(':ui-core') // Dependencies - implementation libraries.twint + implementation libs.twint //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/twint/build.gradle b/twint/build.gradle index 7169456782..00dcd4742b 100644 --- a/twint/build.gradle +++ b/twint/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "twint" @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.twint' - compileSdkVersion compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -49,8 +47,8 @@ dependencies { testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/ui-core/build.gradle b/ui-core/build.gradle index 7208adf1ba..1a1b20d91c 100644 --- a/ui-core/build.gradle +++ b/ui-core/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.ui.core' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -45,18 +45,18 @@ dependencies { api project(':components-core') // Dependencies - implementation libraries.androidx.appcompat - api libraries.androidx.autofill - api libraries.androidx.constraintlayout - implementation libraries.androidx.recyclerview - api libraries.material - implementation libraries.androidx.browser + implementation libs.androidx.appcompat + api libs.androidx.autofill + api libs.androidx.constraintlayout + implementation libs.androidx.recyclerview + api libs.material + implementation libs.androidx.browser //Tests - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.robolectric - testImplementation testLibraries.mockito + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.robolectric + testImplementation libs.bundles.mockito } diff --git a/upi/build.gradle b/upi/build.gradle index d6c8943999..6292559afc 100644 --- a/upi/build.gradle +++ b/upi/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "upi" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.upi' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -42,13 +42,13 @@ dependencies { api project(':sessions-core') // Dependencies - implementation libraries.material + implementation libs.material //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.junit5 - testImplementation testLibraries.kotlinCoroutines - testImplementation testLibraries.mockito + testImplementation libs.bundles.junit + testImplementation libs.bundles.kotlin.coroutines.test + testImplementation libs.bundles.mockito } diff --git a/voucher/build.gradle b/voucher/build.gradle index 9e54bc5de6..65a102b761 100644 --- a/voucher/build.gradle +++ b/voucher/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } // Maven artifact @@ -21,11 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.voucher' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -45,13 +45,13 @@ dependencies { api project(':ui-core') // Dependencies - implementation libraries.androidx.browser + implementation libs.androidx.browser //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test } diff --git a/wechatpay/build.gradle b/wechatpay/build.gradle index 7452afd523..f1d00f53de 100644 --- a/wechatpay/build.gradle +++ b/wechatpay/build.gradle @@ -7,9 +7,9 @@ */ plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' + alias libs.plugins.android.library + alias libs.plugins.kotlin.android + alias libs.plugins.kotlin.parcelize } ext.mavenArtifactId = "wechatpay" @@ -20,11 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.wechatpay' - compileSdk compile_sdk_version + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk min_sdk_version - targetSdk target_sdk_version + minSdk libs.versions.min.sdk.get().toInteger() + targetSdk libs.versions.target.sdk.get().toInteger() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" @@ -40,14 +40,14 @@ dependencies { api project(':ui-core') // Dependencies - implementation libraries.wechat + implementation libs.wechat //Tests testImplementation testFixtures(project(':test-core')) testImplementation testFixtures(project(':components-core')) testImplementation testFixtures(project(':ui-core')) - testImplementation testLibraries.json - testImplementation testLibraries.junit5 - testImplementation testLibraries.mockito - testImplementation testLibraries.kotlinCoroutines + testImplementation libs.json + testImplementation libs.bundles.junit + testImplementation libs.bundles.mockito + testImplementation libs.bundles.kotlin.coroutines.test }