Merge pull request #1314 from Adyen/renovate/all-dependencies

Update all-dependencies

build.gradle

@@ -17,43 +17,35 @@ ext {
     checkoutRedirectScheme = "adyencheckout"
 }
 
-allprojects {
-    tasks.withType(Test) {
-        useJUnitPlatform()
-    }
-}
-
 subprojects {
-    project.afterEvaluate {
-        def javaVersion = 11
-        def isAndroid = plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")
-        if (isAndroid) {
-            android {
-                compileOptions {
-                    sourceCompatibility = javaVersion
-                    targetCompatibility = javaVersion
-                }
+    def javaVersion = 11
+
+    plugins.withType(com.android.build.gradle.BasePlugin).configureEach {
+        android {
+            compileOptions {
+                sourceCompatibility = javaVersion
+                targetCompatibility = javaVersion
             }
         }
+    }
 
-        if (plugins.hasPlugin("kotlin-android")) {
-            kotlin {
-                jvmToolchain(javaVersion)
-            }
+    plugins.withType(org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper).configureEach {
+        kotlin {
+            jvmToolchain(javaVersion)
         }
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             freeCompilerArgs += [
-                '-opt-in=kotlin.RequiresOptIn'
+                '-opt-in=kotlin.RequiresOptIn',
             ]
         }
     }
-}
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+    tasks.withType(Test).configureEach {
+        useJUnitPlatform()
+    }
 }
 
 apply from: file('config/gradle/dependencyGraph.gradle')

cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegate.kt

@@ -296,7 +296,7 @@ constructor(
         val onFileData = grants.find { it.type == GrantType.EXTENDED }?.let {
             CashAppPayOnFileData(
                 grantId = it.id,
-                cashTag = customerResponseData.customerProfile?.cashTag,
+                cashTag = customerResponseData.customerProfile?.cashTag?.toString(),
                 customerId = customerResponseData.customerProfile?.id
             )
         }

cashapppay/src/main/res/layout/cash_app_pay_button_view.xml

@@ -10,8 +10,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <app.cash.paykit.core.ui.CashAppPayLightButton
+    <app.cash.paykit.core.ui.CashAppPayButton
         android:id="@+id/payButton"
+        style="@style/AdyenCheckout.CashAppPay.Button"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_marginStart="16dp"

cashapppay/src/main/res/values-night/styles.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2023 Adyen N.V.
+  ~
+  ~ This file is open source and available under the MIT license. See the LICENSE file for more info.
+  ~
+  ~ Created by oscars on 25/8/2023.
+  -->
+
+<resources>
+    <style name="AdyenCheckout.CashAppPay.Button" parent="CAPButtonStyle.Dark" />
+</resources>

cashapppay/src/main/res/values/styles.xml

@@ -27,4 +27,6 @@
         <item name="android:layout_marginStart">8dp</item>
         <item name="android:layout_marginEnd">8dp</item>
     </style>
+
+    <style name="AdyenCheckout.CashAppPay.Button" parent="CAPButtonStyle.Light" />
 </resources>

cashapppay/src/test/java/com/adyen/checkout/cashapppay/internal/ui/DefaultCashAppPayDelegateTest.kt

@@ -12,6 +12,7 @@ import app.cash.paykit.core.CashAppPay
 import app.cash.paykit.core.CashAppPayFactory
 import app.cash.paykit.core.CashAppPayState
 import app.cash.paykit.core.models.common.Action
+import app.cash.paykit.core.models.pii.PiiString
 import app.cash.paykit.core.models.response.CustomerProfile
 import app.cash.paykit.core.models.response.CustomerResponseData
 import app.cash.paykit.core.models.response.Grant
@@ -388,7 +389,7 @@ internal class DefaultCashAppPayDelegateTest(
                 createGrant(GrantType.ONE_TIME),
                 createGrant(GrantType.EXTENDED)
             )
-            whenever(mockResponse.customerProfile) doReturn CustomerProfile("customerId", "cashTag")
+            whenever(mockResponse.customerProfile) doReturn CustomerProfile("customerId", PiiString("cashTag"))
             delegate.cashAppPayStateDidChange(CashAppPayState.Approved(mockResponse))
 
             val actual = testFlow.latestValue
@@ -412,7 +413,7 @@ internal class DefaultCashAppPayDelegateTest(
                 createGrant(GrantType.ONE_TIME),
                 createGrant(GrantType.EXTENDED)
             )
-            whenever(mockResponse.customerProfile) doReturn CustomerProfile("customerId", "cashTag")
+            whenever(mockResponse.customerProfile) doReturn CustomerProfile("customerId", PiiString("cashTag"))
             delegate.cashAppPayStateDidChange(CashAppPayState.Approved(mockResponse))
 
             verify(submitHandler).onSubmit(testFlow.latestValue)

components-compose/build.gradle

@@ -36,6 +36,13 @@ android {
         compose true
     }
 
+    kotlinOptions {
+        freeCompilerArgs += [
+            '-P',
+            'plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.9.10'
+        ]
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = compose_compiler_version
     }

dependencies.gradle

@@ -20,47 +20,47 @@ ext {
 
     // Build Script
     android_gradle_plugin_version = '8.1.1'
-    kotlin_version = '1.8.22'
-    detekt_gradle_plugin_version = "1.23.0"
+    kotlin_version = '1.9.10'
+    detekt_gradle_plugin_version = "1.23.1"
     dokka_version = "1.8.20"
-    hilt_version = "2.46.1"
-    compose_compiler_version = '1.4.8'
+    hilt_version = "2.47"
+    compose_compiler_version = '1.5.2'
 
     // Code quality
-    detekt_version = "1.23.0"
+    detekt_version = "1.23.1"
     ktlint_version = '0.50.0'
 
     // Android Dependencies
     annotation_version = "1.6.0"
     appcompat_version = "1.6.1"
-    browser_version = "1.5.0"
+    browser_version = "1.6.0"
     coroutines_version = "1.6.4"
-    fragment_version = "1.6.0"
+    fragment_version = "1.6.1"
     lifecycle_version = "2.5.1"
     material_version = "1.9.0"
-    recyclerview_version = "1.3.0"
+    recyclerview_version = "1.3.1"
     constraintlayout_version = '2.1.4'
 
     // Compose Dependencies
     compose_activity_version = '1.7.2'
-    compose_bom_version = '2023.06.01'
+    compose_bom_version = '2023.08.00'
     compose_viewmodel_version = '2.6.1'
 
     // Adyen Dependencies
     adyen3ds2_version = "2.2.15"
 
     // External Dependencies
-    cash_app_pay_version = '2.2.0'
+    cash_app_pay_version = '2.3.0'
     okhttp_version = "4.11.0"
     play_services_wallet_version = '19.2.0'
-    wechat_pay_version = "6.6.4"
+    wechat_pay_version = "6.8.0"
 
     // Example app
     leak_canary_version = '2.12'
     moshi_adapters_version = '1.14.0'
     moshi_kotlin_adapter_version = '1.14.0'
     okhttp_logging_version = "4.11.0"
-    preference_version = "1.2.0"
+    preference_version = "1.2.1"
     retrofit2_version = '2.9.0'
 
     // Tests

drop-in-compose/build.gradle

@@ -36,6 +36,13 @@ android {
         compose true
     }
 
+    kotlinOptions {
+        freeCompilerArgs += [
+            '-P',
+            'plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.9.10'
+        ]
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = compose_compiler_version
     }