diff --git a/.github/workflows/generate_dependency_graph.yml b/.github/workflows/generate_dependency_graph.yml index a58817f3e8..724419dc54 100644 --- a/.github/workflows/generate_dependency_graph.yml +++ b/.github/workflows/generate_dependency_graph.yml @@ -9,9 +9,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + + # Setup Java 17 + # https://github.com/marketplace/actions/setup-java-jdk + - name: Set up JDK + uses: actions/setup-java@v4 with: - ref: ${{ github.head_ref }} - fetch-depth: 0 + distribution: 'zulu' + java-version: 17 + cache: 'gradle' - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@v1 @@ -30,4 +36,4 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ github.head_ref }} + branch: ${{ github.ref }} diff --git a/3ds2/build.gradle b/3ds2/build.gradle index fd202313f6..a034923583 100644 --- a/3ds2/build.gradle +++ b/3ds2/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.adyen3ds2' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/ach/build.gradle b/ach/build.gradle index 68059afd78..953cb6ff44 100644 --- a/ach/build.gradle +++ b/ach/build.gradle @@ -12,13 +12,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.ach' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/action-core/build.gradle b/action-core/build.gradle index a5368082be..b2c6de067c 100644 --- a/action-core/build.gradle +++ b/action-core/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.action.core' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/action/build.gradle b/action/build.gradle index 6f5e7bfc93..51d9376945 100644 --- a/action/build.gradle +++ b/action/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.action' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/await/build.gradle b/await/build.gradle index 93a826031d..6354a30f92 100644 --- a/await/build.gradle +++ b/await/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.await' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/bacs/build.gradle b/bacs/build.gradle index d50e338122..60fe8a0c86 100644 --- a/bacs/build.gradle +++ b/bacs/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.bacs' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/bcmc/build.gradle b/bcmc/build.gradle index 75ae403ba8..907610efe0 100644 --- a/bcmc/build.gradle +++ b/bcmc/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.bcmc' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/blik/build.gradle b/blik/build.gradle index 96636feda0..27e5dee456 100644 --- a/blik/build.gradle +++ b/blik/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.blik' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/boleto/build.gradle b/boleto/build.gradle index 26297d34c5..db3eb10a96 100644 --- a/boleto/build.gradle +++ b/boleto/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.boleto' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/card/build.gradle b/card/build.gradle index d1b10a6949..ae7ecbcb5d 100644 --- a/card/build.gradle +++ b/card/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.card' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt index 27c1ee85fc..6ab1e427c9 100644 --- a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt +++ b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt @@ -302,7 +302,7 @@ class CardView @JvmOverloads constructor( ) setDualBrandedCardImages(detectedCardTypes, cardOutputData.cardNumberState.validation) - // TODO: 29/01/2021 get this logic from OutputData + // TODO 29/01/2021 get this logic from OutputData val isAmex = detectedCardTypes.any { it.cardBrand == CardBrand(cardType = CardType.AMERICAN_EXPRESS) } binding.editTextCardNumber.setAmexCardFormat(isAmex) diff --git a/cashapppay/build.gradle b/cashapppay/build.gradle index e48ef3fab4..b368bda3b7 100644 --- a/cashapppay/build.gradle +++ b/cashapppay/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.cashapppay' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/checkout-core/build.gradle b/checkout-core/build.gradle index 4aa77ddbce..02ca7d14d9 100644 --- a/checkout-core/build.gradle +++ b/checkout-core/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.core' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/components-compose/build.gradle b/components-compose/build.gradle index fe541590e6..4d6f3892b6 100644 --- a/components-compose/build.gradle +++ b/components-compose/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.components.compose' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/components-core/build.gradle b/components-core/build.gradle index 64822b57d0..dbbc3facd4 100644 --- a/components-core/build.gradle +++ b/components-core/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.components.core' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/components-core/src/main/java/com/adyen/checkout/components/core/action/VoucherAction.kt b/components-core/src/main/java/com/adyen/checkout/components/core/action/VoucherAction.kt index 36134e38e9..fac826e819 100644 --- a/components-core/src/main/java/com/adyen/checkout/components/core/action/VoucherAction.kt +++ b/components-core/src/main/java/com/adyen/checkout/components/core/action/VoucherAction.kt @@ -33,7 +33,7 @@ data class VoucherAction( var alternativeReference: String? = null, var merchantName: String? = null, var merchantReference: String? = null, - // TODO: remove url when it's fixed from backend side + // TODO remove url when it's fixed from backend side var url: String? = null, var downloadUrl: String? = null, var instructionsUrl: String? = null, diff --git a/config/detekt/detekt-baseline.xml b/config/detekt/detekt-baseline.xml index c59c4cf892..91a8740e51 100644 --- a/config/detekt/detekt-baseline.xml +++ b/config/detekt/detekt-baseline.xml @@ -11,14 +11,5 @@ - ForbiddenComment:Logger.kt$Logger$// TODO: 14/02/2019 The idea is for this class to have a system where we can send a stream of logs to the merchant - ForbiddenComment:CardView.kt$CardView$// TODO: 29/01/2021 get this logic from OutputData - ForbiddenComment:VoucherAction.kt$VoucherAction$// TODO: remove url when it's fixed from backend side - ForbiddenComment:ActionComponentDialogFragment.kt$ActionComponentDialogFragment$// TODO: trigger download image flow when user accept storage permission after checking permission type - ForbiddenComment:ActionComponentDialogFragment.kt$ActionComponentDialogFragment$// TODO: checkout_rationale_title_storage_permission and checkout_rationale_message_storage_permission - ForbiddenComment:ActionComponentDialogFragment.kt$ActionComponentDialogFragment$// TODO: can be reused based on required permission - ForbiddenComment:DefaultVoucherDelegate.kt$DefaultVoucherDelegate$// TODO: remove action.url when it's fixed from backend side - ForbiddenComment:CheckoutSessionInitializer.kt$CheckoutSessionInitializer$// TODO: Once Backend provides the correct amount in the SessionSetupResponse use that in SessionDetails instead of - ForbiddenComment:SessionDetails.kt$// TODO: Once Backend provides the correct amount in the SessionSetupResponse use that in SessionDetails diff --git a/config/gradle/versionName.gradle b/config/gradle/buildConfig.gradle similarity index 85% rename from config/gradle/versionName.gradle rename to config/gradle/buildConfig.gradle index 21cb75cc9f..f43cf2bbcb 100644 --- a/config/gradle/versionName.gradle +++ b/config/gradle/buildConfig.gradle @@ -10,5 +10,8 @@ android { defaultConfig { buildConfigField "String", "CHECKOUT_VERSION", "\"$version_name\"" } -} + buildFeatures { + buildConfig true + } +} diff --git a/config/gradle/ci.gradle b/config/gradle/ci.gradle deleted file mode 100644 index 96c11a7606..0000000000 --- a/config/gradle/ci.gradle +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2019 Adyen N.V. - * - * This file is open source and available under the MIT license. See the LICENSE file for more info. - * - * Created by ran on 6/2/2019. - */ - -// Notice: The connected android tests are disabled on CI, since Android Studio doesn't -// officially support macOS Mojave which runs on the Jenkins server. -// Re-enable it after Android Studio will officially support macOS Mojave, -// or Android releases will run on a dedicated Jenkins server which runs macOS -// that supports Android Studio. -task ci(dependsOn: ['check', 'test', 'connectedAndroidTest']) { - description = "Continiues integration task dependes on 'check' 'test' and 'runConnectedAndroidTest' tasks." - group = "verification" -} \ No newline at end of file diff --git a/config/gradle/dependencyGraph.gradle b/config/gradle/dependencyGraph.gradle index b22a19f8e5..954843f391 100644 --- a/config/gradle/dependencyGraph.gradle +++ b/config/gradle/dependencyGraph.gradle @@ -1,5 +1,5 @@ // From: https://github.com/tfcporciuncula/readme-graph/blob/master/gradle/projectDependencyGraph.gradle -task dependencyGraph { +tasks.register("dependencyGraph") { doLast { def dot = new File(rootProject.rootDir, 'dependency-graph/project.dot') dot.parentFile.mkdirs() @@ -43,7 +43,7 @@ task dependencyGraph { javaProjects.add(project) } - project.configurations.all { config -> + project.configurations.configureEach { config -> config.dependencies .withType(ProjectDependency) .collect { it.dependencyProject } @@ -97,7 +97,7 @@ task dependencyGraph { dot << '\n # Dependencies\n\n' dependencies.forEach { key, traits -> - dot << " \"${key.first.path}\" -> \"${key.second.path}\"" + dot << " \"${key.v1.path}\" -> \"${key.v2.path}\"" if (!traits.isEmpty()) { dot << " [${traits.join(", ")}]" } diff --git a/config/gradle/dokka.gradle b/config/gradle/dokka.gradle index e74946e12f..9494fbbfba 100644 --- a/config/gradle/dokka.gradle +++ b/config/gradle/dokka.gradle @@ -10,7 +10,8 @@ project.plugins.withId("kotlin-android") { apply plugin: "org.jetbrains.dokka" - task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { + tasks.register("javadocJar", Jar) { + dependsOn tasks.named("dokkaJavadoc") archiveClassifier.set('javadoc') from dokkaJavadoc.outputDirectory } diff --git a/config/gradle/dokkaRoot.gradle b/config/gradle/dokkaRoot.gradle index 7091bca5b6..8ce02b9404 100644 --- a/config/gradle/dokkaRoot.gradle +++ b/config/gradle/dokkaRoot.gradle @@ -9,7 +9,7 @@ apply plugin: "org.jetbrains.dokka" tasks.named("dokkaHtmlMultiModule") { - def dokkaDir = "$rootProject.buildDir/docs" + def dokkaDir = "${rootProject.layout.buildDirectory.get().asFile}/docs" outputDirectory.set(file(dokkaDir)) doLast { copy { diff --git a/config/gradle/runConnectedAndroidTest.gradle b/config/gradle/runConnectedAndroidTest.gradle deleted file mode 100644 index 52199acbe1..0000000000 --- a/config/gradle/runConnectedAndroidTest.gradle +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2019 Adyen N.V. - * - * This file is open source and available under the MIT license. See the LICENSE file for more info. - * - * Created by ran on 8/2/2019. - */ - -task runConnectedAndroidTest(type: Exec) { - description = "Runs connected android test on dedicated AVDs." - group = "verification" - - final projectDir = "$rootProject.projectDir" - final scriptsDir = "$projectDir/config/scripts" - final moduleName = "$project.name" - final moduleVersion = "$project.version_name" - - workingDir "$scriptsDir" - - // TODO disabling instrumented tests until we can make them reliable -// commandLine './run_connected_android_test.sh', "$moduleName", "$moduleVersion" -} \ No newline at end of file diff --git a/config/gradle/sharedTasks.gradle b/config/gradle/sharedTasks.gradle index 84248bbd4a..2c21cbdb1e 100644 --- a/config/gradle/sharedTasks.gradle +++ b/config/gradle/sharedTasks.gradle @@ -7,8 +7,6 @@ * Created by caiof on 11/2/2019. */ -apply from: "${rootDir}/config/gradle/versionName.gradle" +apply from: "${rootDir}/config/gradle/buildConfig.gradle" apply from: "${rootDir}/config/gradle/codeQuality.gradle" -apply from: "${rootDir}/config/gradle/ci.gradle" apply from: "${rootDir}/config/gradle/release.gradle" -apply from: "${rootDir}/config/gradle/runConnectedAndroidTest.gradle" diff --git a/config/gradle/sources.gradle b/config/gradle/sources.gradle index b7eada6e03..ee680912c8 100644 --- a/config/gradle/sources.gradle +++ b/config/gradle/sources.gradle @@ -6,11 +6,11 @@ * Created by ran on 6/2/2019. */ -task androidSourcesJar(type: Jar) { +tasks.register("androidSourcesJar", Jar) { archiveClassifier.set('sources') if (project.plugins.findPlugin("com.android.library")) { from android.sourceSets.main.java.srcDirs } else { from sourceSets.main.java.srcDirs } -} \ No newline at end of file +} diff --git a/config/module/template/build.gradle b/config/module/template/build.gradle index 9440cc3aa3..a9cdb3bf30 100644 --- a/config/module/template/build.gradle +++ b/config/module/template/build.gradle @@ -10,11 +10,11 @@ ext.mavenArtifactDescription = "Adyen checkout #module_name component client for apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version + minSdk min_sdk_version + targetSdk target_sdk_version versionCode version_code versionName version_name diff --git a/convenience-stores-jp/build.gradle b/convenience-stores-jp/build.gradle index 5c0c334f07..a0f8579628 100644 --- a/convenience-stores-jp/build.gradle +++ b/convenience-stores-jp/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.conveniencestoresjp' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/cse/build.gradle b/cse/build.gradle index b901eb3604..031932101a 100644 --- a/cse/build.gradle +++ b/cse/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.cse' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/dependencies.gradle b/dependencies.gradle index 26558cdeef..5aac14a54c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -19,7 +19,7 @@ ext { version_name = "5.3.0" // Build Script - android_gradle_plugin_version = '8.2.0' + android_gradle_plugin_version = '8.3.0' kotlin_version = '1.9.22' detekt_gradle_plugin_version = "1.23.5" dokka_version = "1.9.10" diff --git a/dependency-graph/project.dot b/dependency-graph/project.dot index 337a0c94f2..964df7374d 100644 --- a/dependency-graph/project.dot +++ b/dependency-graph/project.dot @@ -6,17 +6,25 @@ digraph { # Projects ":3ds2" [fillcolor="#baffc9"]; + ":ach" [fillcolor="#baffc9"]; ":action" [fillcolor="#baffc9"]; + ":action-core" [fillcolor="#baffc9"]; ":await" [fillcolor="#baffc9"]; ":bacs" [fillcolor="#baffc9"]; ":bcmc" [fillcolor="#baffc9"]; ":blik" [fillcolor="#baffc9"]; + ":boleto" [fillcolor="#baffc9"]; ":card" [fillcolor="#baffc9"]; + ":cashapppay" [fillcolor="#baffc9"]; ":checkout-core" [fillcolor="#baffc9"]; + ":components-compose" [fillcolor="#baffc9"]; ":components-core" [fillcolor="#baffc9"]; + ":convenience-stores-jp" [fillcolor="#baffc9"]; ":cse" [fillcolor="#baffc9"]; ":dotpay" [fillcolor="#baffc9"]; ":drop-in" [fillcolor="#baffc9"]; + ":drop-in-compose" [fillcolor="#baffc9"]; + ":econtext" [fillcolor="#baffc9"]; ":entercash" [fillcolor="#baffc9"]; ":eps" [fillcolor="#baffc9"]; ":example-app" [fillcolor="#baffc9"]; @@ -29,16 +37,20 @@ digraph { ":molpay" [fillcolor="#baffc9"]; ":online-banking-core" [fillcolor="#baffc9"]; ":online-banking-cz" [fillcolor="#baffc9"]; + ":online-banking-jp" [fillcolor="#baffc9"]; ":online-banking-pl" [fillcolor="#baffc9"]; ":online-banking-sk" [fillcolor="#baffc9"]; ":openbanking" [fillcolor="#baffc9"]; ":paybybank" [fillcolor="#baffc9"]; + ":payeasy" [fillcolor="#baffc9"]; ":qr-code" [fillcolor="#baffc9"]; ":redirect" [fillcolor="#baffc9"]; ":sepa" [fillcolor="#baffc9"]; ":sessions-core" [fillcolor="#baffc9"]; + ":seven-eleven" [fillcolor="#baffc9"]; ":test-core" [fillcolor="#baffc9"]; ":ui-core" [fillcolor="#baffc9"]; + ":upi" [fillcolor="#baffc9"]; ":voucher" [fillcolor="#baffc9"]; ":wechatpay" [fillcolor="#baffc9"]; @@ -46,52 +58,26 @@ digraph { # Dependencies - ":3ds2" -> ":ui-core" - ":3ds2" -> ":3ds2" - ":3ds2" -> ":test-core" [style=dotted] - ":action" -> ":3ds2" - ":action" -> ":await" - ":action" -> ":qr-code" - ":action" -> ":redirect" - ":action" -> ":wechatpay" - ":action" -> ":voucher" - ":action" -> ":action" - ":action" -> ":test-core" [style=dotted] - ":await" -> ":ui-core" - ":await" -> ":await" - ":await" -> ":test-core" [style=dotted] - ":bacs" -> ":action" + ":bacs" -> ":action-core" ":bacs" -> ":ui-core" + ":bacs" -> ":sessions-core" ":bacs" -> ":bacs" ":bacs" -> ":test-core" [style=dotted] - ":bcmc" -> ":action" - ":bcmc" -> ":card" - ":bcmc" -> ":bcmc" - ":bcmc" -> ":test-core" [style=dotted] - ":blik" -> ":action" + ":blik" -> ":action-core" ":blik" -> ":ui-core" + ":blik" -> ":sessions-core" ":blik" -> ":blik" ":blik" -> ":test-core" [style=dotted] - ":card" -> ":action" - ":card" -> ":cse" - ":card" -> ":ui-core" - ":card" -> ":sessions-core" - ":card" -> ":card" - ":card" -> ":test-core" [style=dotted] - ":checkout-core" -> ":checkout-core" - ":components-core" -> ":checkout-core" - ":components-core" -> ":components-core" - ":components-core" -> ":test-core" [style=dotted] - ":cse" -> ":checkout-core" - ":cse" -> ":cse" - ":dotpay" -> ":action" - ":dotpay" -> ":issuer-list" - ":dotpay" -> ":dotpay" - ":drop-in" -> ":action" + ":drop-in" -> ":3ds2" + ":drop-in" -> ":ach" + ":drop-in" -> ":action-core" ":drop-in" -> ":bacs" ":drop-in" -> ":bcmc" + ":drop-in" -> ":boleto" ":drop-in" -> ":blik" ":drop-in" -> ":card" + ":drop-in" -> ":cashapppay" + ":drop-in" -> ":convenience-stores-jp" ":drop-in" -> ":dotpay" ":drop-in" -> ":entercash" ":drop-in" -> ":eps" @@ -102,90 +88,192 @@ digraph { ":drop-in" -> ":mbway" ":drop-in" -> ":molpay" ":drop-in" -> ":online-banking-cz" + ":drop-in" -> ":online-banking-jp" ":drop-in" -> ":online-banking-pl" ":drop-in" -> ":online-banking-sk" ":drop-in" -> ":openbanking" + ":drop-in" -> ":payeasy" ":drop-in" -> ":paybybank" ":drop-in" -> ":sepa" + ":drop-in" -> ":seven-eleven" ":drop-in" -> ":sessions-core" + ":drop-in" -> ":upi" + ":drop-in" -> ":wechatpay" ":drop-in" -> ":drop-in" ":drop-in" -> ":test-core" [style=dotted] - ":entercash" -> ":action" - ":entercash" -> ":issuer-list" - ":entercash" -> ":entercash" - ":eps" -> ":action" - ":eps" -> ":issuer-list" - ":eps" -> ":eps" - ":example-app" -> ":example-app" - ":example-app" -> ":drop-in" [style=dotted] - ":giftcard" -> ":action" - ":giftcard" -> ":cse" - ":giftcard" -> ":ui-core" - ":giftcard" -> ":giftcard" - ":giftcard" -> ":test-core" [style=dotted] - ":googlepay" -> ":action" - ":googlepay" -> ":components-core" - ":googlepay" -> ":googlepay" - ":googlepay" -> ":test-core" [style=dotted] - ":ideal" -> ":action" - ":ideal" -> ":issuer-list" - ":ideal" -> ":ideal" - ":instant" -> ":action" - ":instant" -> ":components-core" + ":online-banking-core" -> ":action-core" + ":online-banking-core" -> ":ui-core" + ":online-banking-core" -> ":sessions-core" + ":online-banking-core" -> ":online-banking-core" + ":online-banking-core" -> ":test-core" [style=dotted] + ":voucher" -> ":ui-core" + ":voucher" -> ":voucher" + ":voucher" -> ":test-core" [style=dotted] + ":ach" -> ":action-core" + ":ach" -> ":ui-core" + ":ach" -> ":cse" + ":ach" -> ":sessions-core" + ":ach" -> ":ach" + ":ach" -> ":test-core" [style=dotted] + ":boleto" -> ":action-core" + ":boleto" -> ":ui-core" + ":boleto" -> ":sessions-core" + ":boleto" -> ":boleto" + ":boleto" -> ":test-core" [style=dotted] + ":dotpay" -> ":action-core" + ":dotpay" -> ":issuer-list" + ":dotpay" -> ":dotpay" + ":qr-code" -> ":ui-core" + ":qr-code" -> ":qr-code" + ":qr-code" -> ":test-core" [style=dotted] + ":action-core" -> ":await" + ":action-core" -> ":qr-code" + ":action-core" -> ":redirect" + ":action-core" -> ":voucher" + ":action-core" -> ":3ds2" [style=dotted] + ":action-core" -> ":wechatpay" [style=dotted] + ":action-core" -> ":action-core" + ":action-core" -> ":test-core" [style=dotted] + ":checkout-core" -> ":checkout-core" + ":components-core" -> ":checkout-core" + ":components-core" -> ":components-core" + ":components-core" -> ":test-core" [style=dotted] + ":instant" -> ":action-core" + ":instant" -> ":sessions-core" ":instant" -> ":instant" ":instant" -> ":test-core" [style=dotted] - ":issuer-list" -> ":action" + ":issuer-list" -> ":action-core" ":issuer-list" -> ":ui-core" + ":issuer-list" -> ":sessions-core" ":issuer-list" -> ":issuer-list" + ":issuer-list" -> ":3ds2" [style=dotted] ":issuer-list" -> ":test-core" [style=dotted] - ":mbway" -> ":action" + ":issuer-list" -> ":wechatpay" [style=dotted] + ":molpay" -> ":action-core" + ":molpay" -> ":issuer-list" + ":molpay" -> ":molpay" + ":mbway" -> ":action-core" ":mbway" -> ":ui-core" + ":mbway" -> ":sessions-core" ":mbway" -> ":mbway" ":mbway" -> ":test-core" [style=dotted] - ":molpay" -> ":action" - ":molpay" -> ":issuer-list" - ":molpay" -> ":molpay" - ":online-banking-core" -> ":action" - ":online-banking-core" -> ":ui-core" - ":online-banking-core" -> ":online-banking-core" - ":online-banking-core" -> ":test-core" [style=dotted] - ":online-banking-cz" -> ":action" - ":online-banking-cz" -> ":online-banking-core" - ":online-banking-cz" -> ":online-banking-cz" - ":online-banking-pl" -> ":action" + ":seven-eleven" -> ":econtext" + ":seven-eleven" -> ":seven-eleven" + ":await" -> ":ui-core" + ":await" -> ":await" + ":await" -> ":test-core" [style=dotted] + ":online-banking-pl" -> ":action-core" ":online-banking-pl" -> ":issuer-list" ":online-banking-pl" -> ":online-banking-pl" - ":online-banking-sk" -> ":action" - ":online-banking-sk" -> ":online-banking-core" - ":online-banking-sk" -> ":online-banking-sk" - ":openbanking" -> ":action" - ":openbanking" -> ":issuer-list" - ":openbanking" -> ":openbanking" - ":paybybank" -> ":action" + ":action" -> ":3ds2" + ":action" -> ":action-core" + ":action" -> ":wechatpay" + ":action" -> ":action" + ":action" -> ":test-core" [style=dotted] + ":test-core" -> ":test-core" + ":test-core" -> ":checkout-core" [style=dotted] + ":online-banking-cz" -> ":action-core" + ":online-banking-cz" -> ":online-banking-core" + ":online-banking-cz" -> ":online-banking-cz" + ":paybybank" -> ":action-core" ":paybybank" -> ":components-core" ":paybybank" -> ":issuer-list" + ":paybybank" -> ":sessions-core" ":paybybank" -> ":paybybank" ":paybybank" -> ":test-core" [style=dotted] - ":qr-code" -> ":ui-core" - ":qr-code" -> ":qr-code" - ":qr-code" -> ":test-core" [style=dotted] + ":example-app" -> ":example-app" + ":example-app" -> ":drop-in" [style=dotted] + ":example-app" -> ":components-compose" [style=dotted] ":redirect" -> ":ui-core" ":redirect" -> ":redirect" ":redirect" -> ":test-core" [style=dotted] - ":sepa" -> ":action" + ":online-banking-jp" -> ":econtext" + ":online-banking-jp" -> ":online-banking-jp" + ":ideal" -> ":action-core" + ":ideal" -> ":issuer-list" + ":ideal" -> ":ideal" + ":components-compose" -> ":components-core" + ":components-compose" -> ":sessions-core" + ":components-compose" -> ":ui-core" + ":components-compose" -> ":components-compose" + ":giftcard" -> ":action-core" + ":giftcard" -> ":cse" + ":giftcard" -> ":ui-core" + ":giftcard" -> ":sessions-core" + ":giftcard" -> ":giftcard" + ":giftcard" -> ":test-core" [style=dotted] + ":econtext" -> ":ui-core" + ":econtext" -> ":action-core" + ":econtext" -> ":sessions-core" + ":econtext" -> ":econtext" + ":econtext" -> ":3ds2" [style=dotted] + ":econtext" -> ":test-core" [style=dotted] + ":econtext" -> ":wechatpay" [style=dotted] + ":3ds2" -> ":ui-core" + ":3ds2" -> ":3ds2" + ":3ds2" -> ":test-core" [style=dotted] + ":entercash" -> ":action-core" + ":entercash" -> ":issuer-list" + ":entercash" -> ":entercash" + ":eps" -> ":action-core" + ":eps" -> ":issuer-list" + ":eps" -> ":eps" + ":openbanking" -> ":action-core" + ":openbanking" -> ":issuer-list" + ":openbanking" -> ":openbanking" + ":convenience-stores-jp" -> ":econtext" + ":convenience-stores-jp" -> ":convenience-stores-jp" + ":convenience-stores-jp" -> ":test-core" [style=dotted] + ":googlepay" -> ":3ds2" + ":googlepay" -> ":action-core" + ":googlepay" -> ":components-core" + ":googlepay" -> ":sessions-core" + ":googlepay" -> ":googlepay" + ":googlepay" -> ":test-core" [style=dotted] + ":upi" -> ":action-core" + ":upi" -> ":ui-core" + ":upi" -> ":sessions-core" + ":upi" -> ":upi" + ":upi" -> ":test-core" [style=dotted] + ":drop-in-compose" -> ":drop-in" + ":drop-in-compose" -> ":drop-in-compose" + ":cashapppay" -> ":action-core" + ":cashapppay" -> ":components-core" + ":cashapppay" -> ":sessions-core" + ":cashapppay" -> ":ui-core" + ":cashapppay" -> ":cashapppay" + ":cashapppay" -> ":test-core" [style=dotted] + ":payeasy" -> ":econtext" + ":payeasy" -> ":payeasy" + ":cse" -> ":checkout-core" + ":cse" -> ":cse" + ":sepa" -> ":action-core" ":sepa" -> ":ui-core" + ":sepa" -> ":sessions-core" ":sepa" -> ":sepa" ":sepa" -> ":test-core" [style=dotted] - ":sessions-core" -> ":components-core" - ":sessions-core" -> ":sessions-core" - ":sessions-core" -> ":test-core" [style=dotted] - ":test-core" -> ":test-core" ":ui-core" -> ":components-core" ":ui-core" -> ":ui-core" - ":voucher" -> ":ui-core" - ":voucher" -> ":voucher" - ":voucher" -> ":test-core" [style=dotted] ":wechatpay" -> ":ui-core" ":wechatpay" -> ":wechatpay" ":wechatpay" -> ":test-core" [style=dotted] + ":bcmc" -> ":3ds2" + ":bcmc" -> ":action-core" + ":bcmc" -> ":card" + ":bcmc" -> ":sessions-core" + ":bcmc" -> ":bcmc" + ":bcmc" -> ":test-core" [style=dotted] + ":online-banking-sk" -> ":action-core" + ":online-banking-sk" -> ":online-banking-core" + ":online-banking-sk" -> ":online-banking-sk" + ":sessions-core" -> ":components-core" + ":sessions-core" -> ":sessions-core" + ":sessions-core" -> ":test-core" [style=dotted] + ":card" -> ":3ds2" + ":card" -> ":action-core" + ":card" -> ":cse" + ":card" -> ":ui-core" + ":card" -> ":sessions-core" + ":card" -> ":card" + ":card" -> ":test-core" [style=dotted] } diff --git a/dependency-graph/project.dot.png b/dependency-graph/project.dot.png index cb34edec47..0c4d9a9c65 100644 Binary files a/dependency-graph/project.dot.png and b/dependency-graph/project.dot.png differ diff --git a/dotpay/build.gradle b/dotpay/build.gradle index 3c38341e1e..dd4376d7dc 100644 --- a/dotpay/build.gradle +++ b/dotpay/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.dotpay' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/drop-in-compose/build.gradle b/drop-in-compose/build.gradle index 6cefd510b4..b6d9386957 100644 --- a/drop-in-compose/build.gradle +++ b/drop-in-compose/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.dropin.compose' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/drop-in/build.gradle b/drop-in/build.gradle index b30a953acc..085efd47b2 100644 --- a/drop-in/build.gradle +++ b/drop-in/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.dropin' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/econtext/build.gradle b/econtext/build.gradle index 6f6d5f89ab..67715bcc74 100644 --- a/econtext/build.gradle +++ b/econtext/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.econtext' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/entercash/build.gradle b/entercash/build.gradle index a828f8ee6d..c794d5f23a 100644 --- a/entercash/build.gradle +++ b/entercash/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.entercash' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/eps/build.gradle b/eps/build.gradle index d93edaf52f..e9a92f9234 100644 --- a/eps/build.gradle +++ b/eps/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.eps' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/example-app/build.gradle b/example-app/build.gradle index caa4f4dcb5..474f8e830d 100644 --- a/example-app/build.gradle +++ b/example-app/build.gradle @@ -14,7 +14,6 @@ plugins { } apply from: "${rootDir}/config/gradle/codeQuality.gradle" -apply from: "${rootDir}/config/gradle/ci.gradle" if (file("local.gradle").exists()) { apply from: "local.gradle" @@ -29,20 +28,15 @@ def isIDEBuild() { return project.properties['android.injected.invoked.from.ide'] == 'true' } -// This runConnectedAndroidTest.gradle script is applied, -// so it will be possible to run the example app connected android tests -// in Jenkins release process. -apply from: "${rootDir}/config/gradle/runConnectedAndroidTest.gradle" - android { - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { applicationId "com.adyen.checkout.example" namespace "com.adyen.checkout.example" - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version + minSdk min_sdk_version + targetSdk target_sdk_version versionCode version_code versionName version_name @@ -63,6 +57,7 @@ android { buildFeatures { compose true viewBinding true + buildConfig true } composeOptions { diff --git a/giftcard/build.gradle b/giftcard/build.gradle index 7b25e98f9e..2182400f76 100644 --- a/giftcard/build.gradle +++ b/giftcard/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.giftcard' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/googlepay/build.gradle b/googlepay/build.gradle index be28dc94a0..1d499b1379 100644 --- a/googlepay/build.gradle +++ b/googlepay/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.googlepay' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/gradle.properties b/gradle.properties index 62eaa483d3..abee3a5a78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,6 @@ android.nonTransitiveRClass=false # Disable some unused build features in the Android Gradle Plugin to improve build speed. android.defaults.buildfeatures.aidl=false -android.defaults.buildfeatures.buildconfig=true android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 07db8ca071..9121c8a89c 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -20,23 +20,7 @@ - - - - - - - - - - - - - - - - @@ -49,22 +33,6 @@ - - - - - - - - - - - - - - - - @@ -81,14 +49,6 @@ - - - - - - - - @@ -97,38 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -137,48 +65,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -195,14 +86,6 @@ - - - - - - - - @@ -243,21 +126,10 @@ - - - - - - - - - - - @@ -312,22 +184,6 @@ - - - - - - - - - - - - - - - - @@ -349,14 +205,6 @@ - - - - - - - - @@ -378,14 +226,6 @@ - - - - - - - - @@ -466,22 +306,6 @@ - - - - - - - - - - - - - - - - @@ -546,49 +370,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -597,14 +383,6 @@ - - - - - - - - @@ -613,14 +391,6 @@ - - - - - - - - @@ -629,14 +399,6 @@ - - - - - - - - @@ -645,46 +407,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -693,14 +415,6 @@ - - - - - - - - @@ -709,14 +423,6 @@ - - - - - - - - @@ -725,14 +431,6 @@ - - - - - - - - @@ -741,14 +439,6 @@ - - - - - - - - @@ -757,24 +447,11 @@ - - - - - - - - - - - - - @@ -783,14 +460,6 @@ - - - - - - - - @@ -799,14 +468,6 @@ - - - - - - - - @@ -815,14 +476,6 @@ - - - - - - - - @@ -831,14 +484,6 @@ - - - - - - - - @@ -847,14 +492,6 @@ - - - - - - - - @@ -876,51 +513,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -929,30 +521,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -961,46 +529,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1009,30 +537,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1041,56 +545,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1099,30 +553,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1131,46 +561,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,108 +569,20 @@ - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1291,14 +593,6 @@ - - - - - - - - @@ -1307,46 +601,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1355,30 +609,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1387,24 +617,11 @@ - - - - - - - - - - - - - @@ -1413,24 +630,11 @@ - - - - - - - - - - - - - @@ -1439,14 +643,6 @@ - - - - - - - - @@ -1455,14 +651,6 @@ - - - - - - - - @@ -1471,46 +659,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1519,30 +667,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1551,37 +675,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1590,30 +683,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1623,9 +692,6 @@ - - - @@ -1699,14 +765,6 @@ - - - - - - - - @@ -1762,14 +820,6 @@ - - - - - - - - @@ -1831,148 +881,28 @@ - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + @@ -2023,14 +953,6 @@ - - - - - - - - @@ -2047,14 +969,6 @@ - - - - - - - - @@ -2092,30 +1006,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2132,30 +1022,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2225,14 +1091,6 @@ - - - - - - - - @@ -2249,14 +1107,6 @@ - - - - - - - - @@ -2265,22 +1115,6 @@ - - - - - - - - - - - - - - - - @@ -2305,14 +1139,6 @@ - - - - - - - - @@ -2329,24 +1155,11 @@ - - - - - - - - - - - - - @@ -2363,14 +1176,6 @@ - - - - - - - - @@ -2379,22 +1184,6 @@ - - - - - - - - - - - - - - - - @@ -2403,14 +1192,6 @@ - - - - - - - - @@ -2420,9 +1201,6 @@ - - - @@ -2440,14 +1218,6 @@ - - - - - - - - @@ -2477,14 +1247,6 @@ - - - - - - - - @@ -2501,14 +1263,6 @@ - - - - - - - - @@ -2517,14 +1271,6 @@ - - - - - - - - @@ -2541,14 +1287,6 @@ - - - - - - - - @@ -2573,24 +1311,11 @@ - - - - - - - - - - - - - @@ -2607,14 +1332,6 @@ - - - - - - - - @@ -2623,22 +1340,6 @@ - - - - - - - - - - - - - - - - @@ -2647,14 +1348,6 @@ - - - - - - - - @@ -2671,14 +1364,6 @@ - - - - - - - - @@ -2687,24 +1372,11 @@ - - - - - - - - - - - - - @@ -2721,14 +1393,6 @@ - - - - - - - - @@ -2793,14 +1457,6 @@ - - - - - - - - @@ -2809,14 +1465,6 @@ - - - - - - - - @@ -2862,22 +1510,6 @@ - - - - - - - - - - - - - - - - @@ -2902,11 +1534,6 @@ - - - - - @@ -2924,21 +1551,10 @@ - - - - - - - - - - - @@ -3192,22 +1808,6 @@ - - - - - - - - - - - - - - - - @@ -3216,22 +1816,6 @@ - - - - - - - - - - - - - - - - @@ -3285,22 +1869,6 @@ - - - - - - - - - - - - - - - - @@ -3317,5504 +1885,1791 @@ - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - + + - - - + + + - - - - + + - - - + + + - - - - + + - - - + + + - - + + - - - - - - + + + - - - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - + + - - - + + + - - - - + + - - - + + + - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - - - - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - + + - - - - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - + + - - - - - - + + + - - + + - - - - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -8825,46 +3680,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8873,46 +3688,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8921,46 +3696,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8969,46 +3704,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9017,46 +3712,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9065,46 +3720,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9113,46 +3728,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9161,46 +3736,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9209,46 +3744,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9257,90 +3752,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -9351,110 +3821,105 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - - - - - + + - - - + + + - - + + - - - + + + - - + + @@ -9611,17 +4076,9 @@ - - - - - - - - - - - + + + @@ -9632,11 +4089,6 @@ - - - - - @@ -9652,22 +4104,14 @@ - - - - - - - - - - - + + + @@ -9686,11 +4130,6 @@ - - - - - @@ -9701,11 +4140,6 @@ - - - - - @@ -9721,14 +4155,6 @@ - - - - - - - - @@ -9793,14 +4219,6 @@ - - - - - - - - @@ -9838,6 +4256,14 @@ + + + + + + + + @@ -9846,22 +4272,22 @@ - - - + + + - - + + - - - + + + - - - + + + @@ -9932,14 +4358,6 @@ - - - - - - - - @@ -9948,11 +4366,6 @@ - - - - - @@ -10011,14 +4424,6 @@ - - - - - - - - @@ -10038,14 +4443,6 @@ - - - - - - - - @@ -10062,11 +4459,6 @@ - - - - - @@ -10077,14 +4469,6 @@ - - - - - - - - @@ -10101,14 +4485,6 @@ - - - - - - - - @@ -10125,14 +4501,6 @@ - - - - - - - - @@ -10170,30 +4538,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10202,14 +4546,6 @@ - - - - - - - - @@ -10218,14 +4554,6 @@ - - - - - - - - @@ -10234,46 +4562,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10282,60 +4570,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -10346,30 +4586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10378,30 +4594,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10410,30 +4602,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10442,30 +4610,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10474,30 +4618,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10506,62 +4626,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10570,50 +4634,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10630,38 +4655,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10670,38 +4663,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10710,38 +4671,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10750,39 +4679,16 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -10791,22 +4697,6 @@ - - - - - - - - - - - - - - - - @@ -10815,22 +4705,6 @@ - - - - - - - - - - - - - - - - @@ -10839,46 +4713,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10887,14 +4721,6 @@ - - - - - - - - @@ -10903,38 +4729,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10943,38 +4737,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10983,46 +4745,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11031,14 +4753,6 @@ - - - - - - - - @@ -11047,38 +4761,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11087,125 +4769,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - + + @@ -11216,38 +4793,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11256,38 +4801,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11296,38 +4809,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11336,38 +4817,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11376,38 +4825,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11416,38 +4833,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11456,38 +4841,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11496,38 +4849,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11536,38 +4857,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11577,9 +4866,6 @@ - - - @@ -11600,54 +4886,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11656,14 +4894,6 @@ - - - - - - - - @@ -11672,12 +4902,12 @@ - - - + + + - - + + @@ -11688,46 +4918,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11736,14 +4926,6 @@ - - - - - - - - @@ -11752,38 +4934,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11792,219 +4942,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -12016,9 +4991,6 @@ - - - @@ -12026,17 +4998,6 @@ - - - - - - - - - - - @@ -12082,66 +5043,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12154,16 +5061,6 @@ - - - - - - - - - - @@ -12177,14 +5074,6 @@ - - - - - - - - @@ -12193,38 +5082,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12233,14 +5095,6 @@ - - - - - - - - @@ -12250,9 +5104,6 @@ - - - @@ -12273,6 +5124,14 @@ + + + + + + + + @@ -12281,14 +5140,6 @@ - - - - - - - - @@ -12302,38 +5153,16 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -12342,14 +5171,6 @@ - - - - - - - - @@ -12359,9 +5180,6 @@ - - - @@ -12382,36 +5200,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + @@ -12422,38 +5216,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12462,38 +5224,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12502,26 +5232,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -12632,11 +5342,6 @@ - - - - - @@ -12711,14 +5416,6 @@ - - - - - - - - @@ -12732,11 +5429,6 @@ - - - - - @@ -12747,14 +5439,6 @@ - - - - - - - - @@ -12771,11 +5455,6 @@ - - - - - @@ -12786,14 +5465,6 @@ - - - - - - - - @@ -12810,22 +5481,6 @@ - - - - - - - - - - - - - - - - @@ -12858,6 +5513,16 @@ + + + + + + + + + + @@ -13022,14 +5687,6 @@ - - - - - - - - @@ -13043,11 +5700,6 @@ - - - - - @@ -13096,22 +5748,6 @@ - - - - - - - - - - - - - - - - @@ -13120,22 +5756,6 @@ - - - - - - - - - - - - - - - - @@ -13144,22 +5764,6 @@ - - - - - - - - - - - - - - - - @@ -13168,22 +5772,6 @@ - - - - - - - - - - - - - - - - @@ -13192,14 +5780,6 @@ - - - - - - - - @@ -13208,22 +5788,6 @@ - - - - - - - - - - - - - - - - @@ -13232,22 +5796,6 @@ - - - - - - - - - - - - - - - - @@ -13256,22 +5804,6 @@ - - - - - - - - - - - - - - - - @@ -13280,22 +5812,6 @@ - - - - - - - - - - - - - - - - @@ -13304,22 +5820,6 @@ - - - - - - - - - - - - - - - - @@ -13328,22 +5828,6 @@ - - - - - - - - - - - - - - - - @@ -13352,22 +5836,6 @@ - - - - - - - - - - - - - - - - @@ -13384,22 +5852,6 @@ - - - - - - - - - - - - - - - - @@ -13408,22 +5860,6 @@ - - - - - - - - - - - - - - - - @@ -13440,14 +5876,6 @@ - - - - - - - - @@ -13477,11 +5905,6 @@ - - - - - @@ -13559,29 +5982,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ideal/build.gradle b/ideal/build.gradle index 8dc44eb7d5..089fe7fa0b 100644 --- a/ideal/build.gradle +++ b/ideal/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.ideal' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/instant/build.gradle b/instant/build.gradle index 1d39816e90..3e641b5001 100644 --- a/instant/build.gradle +++ b/instant/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.instant' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/issuer-list/build.gradle b/issuer-list/build.gradle index a8d453883a..fa5cabdb27 100644 --- a/issuer-list/build.gradle +++ b/issuer-list/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.issuerlist' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/mbway/build.gradle b/mbway/build.gradle index 861d9acaba..dc51b3a268 100644 --- a/mbway/build.gradle +++ b/mbway/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.mbway' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/molpay/build.gradle b/molpay/build.gradle index f7320fbf47..70ff6332be 100644 --- a/molpay/build.gradle +++ b/molpay/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.molpay' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/online-banking-core/build.gradle b/online-banking-core/build.gradle index 87fc835666..c3a05feca8 100644 --- a/online-banking-core/build.gradle +++ b/online-banking-core/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingcore' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/online-banking-cz/build.gradle b/online-banking-cz/build.gradle index 85e1887d24..888b7b47f1 100644 --- a/online-banking-cz/build.gradle +++ b/online-banking-cz/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingcz' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/online-banking-jp/build.gradle b/online-banking-jp/build.gradle index c3164191d3..1ba2949c95 100644 --- a/online-banking-jp/build.gradle +++ b/online-banking-jp/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingjp' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/online-banking-pl/build.gradle b/online-banking-pl/build.gradle index 2480d386b2..716b7ede01 100644 --- a/online-banking-pl/build.gradle +++ b/online-banking-pl/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingpl' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/online-banking-sk/build.gradle b/online-banking-sk/build.gradle index 636107cfb4..2f755d3e8b 100644 --- a/online-banking-sk/build.gradle +++ b/online-banking-sk/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.onlinebankingsk' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/openbanking/build.gradle b/openbanking/build.gradle index 7b0946477c..f0dc2b4e04 100644 --- a/openbanking/build.gradle +++ b/openbanking/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.openbanking' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/paybybank/build.gradle b/paybybank/build.gradle index 584c54a845..c53dd0e344 100644 --- a/paybybank/build.gradle +++ b/paybybank/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.paybybank' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/payeasy/build.gradle b/payeasy/build.gradle index 96198eb90f..0e7fdea793 100644 --- a/payeasy/build.gradle +++ b/payeasy/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.payeasy' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/qr-code/build.gradle b/qr-code/build.gradle index 69f0f11616..a46d987823 100644 --- a/qr-code/build.gradle +++ b/qr-code/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.qrcode' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/redirect/build.gradle b/redirect/build.gradle index 58fcfad67f..4345164b38 100644 --- a/redirect/build.gradle +++ b/redirect/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.redirect' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/sepa/build.gradle b/sepa/build.gradle index faefbd1a57..d1fa975eae 100644 --- a/sepa/build.gradle +++ b/sepa/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.sepa' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/sessions-core/build.gradle b/sessions-core/build.gradle index 832563c3bf..2ba8299302 100644 --- a/sessions-core/build.gradle +++ b/sessions-core/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.sessions.core' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/sessions-core/src/main/java/com/adyen/checkout/sessions/core/internal/CheckoutSessionInitializer.kt b/sessions-core/src/main/java/com/adyen/checkout/sessions/core/internal/CheckoutSessionInitializer.kt index 820383414d..7d7ee9fb8a 100644 --- a/sessions-core/src/main/java/com/adyen/checkout/sessions/core/internal/CheckoutSessionInitializer.kt +++ b/sessions-core/src/main/java/com/adyen/checkout/sessions/core/internal/CheckoutSessionInitializer.kt @@ -33,7 +33,7 @@ internal class CheckoutSessionInitializer( private val sessionService = SessionService(httpClient) private val sessionRepository = SessionRepository(sessionService, clientKey) - // TODO: Once Backend provides the correct amount in the SessionSetupResponse use that in SessionDetails instead of + // TODO Once Backend provides the correct amount in the SessionSetupResponse use that in SessionDetails instead of // override Amount suspend fun setupSession(overrideAmount: Amount?): CheckoutSessionResult = withContext(coroutineDispatcher) { sessionRepository.setupSession( diff --git a/seven-eleven/build.gradle b/seven-eleven/build.gradle index 2ad81046b2..ba39c6a106 100644 --- a/seven-eleven/build.gradle +++ b/seven-eleven/build.gradle @@ -13,13 +13,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.seveneleven' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/test-core/build.gradle b/test-core/build.gradle index 449f5dcf46..0864c0a35f 100644 --- a/test-core/build.gradle +++ b/test-core/build.gradle @@ -15,13 +15,11 @@ apply from: "${rootDir}/config/gradle/codeQuality.gradle" android { namespace 'com.adyen.checkout.test' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/ui-core/build.gradle b/ui-core/build.gradle index 6d3a94fe7f..1349d07031 100644 --- a/ui-core/build.gradle +++ b/ui-core/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.ui.core' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/upi/build.gradle b/upi/build.gradle index 380cbcc773..e579e62cb1 100644 --- a/upi/build.gradle +++ b/upi/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.upi' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro" diff --git a/voucher/build.gradle b/voucher/build.gradle index 6e689999ae..f61bd7005d 100644 --- a/voucher/build.gradle +++ b/voucher/build.gradle @@ -21,13 +21,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.voucher' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/voucher/src/main/java/com/adyen/checkout/voucher/internal/ui/DefaultVoucherDelegate.kt b/voucher/src/main/java/com/adyen/checkout/voucher/internal/ui/DefaultVoucherDelegate.kt index c3d95e8a1e..05ce6555e0 100644 --- a/voucher/src/main/java/com/adyen/checkout/voucher/internal/ui/DefaultVoucherDelegate.kt +++ b/voucher/src/main/java/com/adyen/checkout/voucher/internal/ui/DefaultVoucherDelegate.kt @@ -113,7 +113,7 @@ internal class DefaultVoucherDelegate( action: VoucherAction, config: VoucherPaymentMethodConfig ) { - // TODO: remove action.url when it's fixed from backend side + // TODO remove action.url when it's fixed from backend side val downloadUrl = action.downloadUrl ?: action.url val storeAction = downloadUrl?.let { url -> VoucherStoreAction.DownloadPdf(url) diff --git a/wechatpay/build.gradle b/wechatpay/build.gradle index 09b0a7ab0a..a35ff51ca2 100644 --- a/wechatpay/build.gradle +++ b/wechatpay/build.gradle @@ -20,13 +20,11 @@ apply from: "${rootDir}/config/gradle/sharedTasks.gradle" android { namespace 'com.adyen.checkout.wechatpay' - compileSdkVersion compile_sdk_version + compileSdk compile_sdk_version defaultConfig { - minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version - versionCode version_code - versionName version_name + minSdk min_sdk_version + targetSdk target_sdk_version testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles "consumer-rules.pro"