Merge pull request #1516 from Adyen/update/android-gradle-plugin

Gradle improvements
Adyen · Mar 19, 2024 · ff744c4 · ff744c4
2 parents a2ccfdc + 533ef40
commit ff744c4
Show file tree

Hide file tree

Showing 68 changed files with 1,664 additions and 9,317 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,14 +11,5 @@
     <ManuallySuppressedIssues>
     </ManuallySuppressedIssues>
     <CurrentIssues>
-        <ID>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</ID>
-        <ID>ForbiddenComment:CardView.kt$CardView$// TODO: 29/01/2021 get this logic from OutputData</ID>
-        <ID>ForbiddenComment:VoucherAction.kt$VoucherAction$// TODO: remove url when it's fixed from backend side</ID>
-        <ID>ForbiddenComment:ActionComponentDialogFragment.kt$ActionComponentDialogFragment$// TODO: trigger download image flow when user accept storage permission after checking permission type</ID>
-        <ID>ForbiddenComment:ActionComponentDialogFragment.kt$ActionComponentDialogFragment$// TODO: checkout_rationale_title_storage_permission and checkout_rationale_message_storage_permission</ID>
-        <ID>ForbiddenComment:ActionComponentDialogFragment.kt$ActionComponentDialogFragment$// TODO: can be reused based on required permission</ID>
-        <ID>ForbiddenComment:DefaultVoucherDelegate.kt$DefaultVoucherDelegate$// TODO: remove action.url when it's fixed from backend side</ID>
-        <ID>ForbiddenComment:CheckoutSessionInitializer.kt$CheckoutSessionInitializer$// TODO: Once Backend provides the correct amount in the SessionSetupResponse use that in SessionDetails instead of</ID>
-        <ID>ForbiddenComment:SessionDetails.kt$// TODO: Once Backend provides the correct amount in the SessionSetupResponse use that in SessionDetails</ID>
     </CurrentIssues>
 </SmellBaseline>
diff --git a/config/gradle/versionName.gradle → config/gradle/buildConfig.gradle b/config/gradle/versionName.gradle → 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
diff --git 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
@@ -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
@@ -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