Merge pull request #9 from afterpay/maintenance/update-from-upstream-…

…4.2.0

Maintenance: update from upstream 4.2.0

.editorconfig

@@ -8,6 +8,10 @@ indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
+
 [*.md]
 trim_trailing_whitespace = false
 

.github/workflows/build-and-test.yml

@@ -12,12 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: 11
+          distribution: 'zulu'
 
       - name: Lint
         run: ./gradlew afterpay:lintDebug afterpay:ktlint
@@ -30,12 +31,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: 11
+          distribution: 'zulu'
 
       - name: Build and Lint
         run: ./gradlew example:buildDebug example:lintDebug example:ktlint

.github/workflows/release-snapshot.yml

@@ -9,12 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: 11
+          distribution: 'zulu'
 
       - name: Clean repository before building SDK
         run: ./gradlew clean

.github/workflows/release.yml

@@ -9,12 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: 11
+          distribution: 'zulu'
 
       - name: Remove SNAPSHOT from version
         run: sed -i 's/-SNAPSHOT//g' gradle.properties

afterpay/consumer-rules.pro

@@ -1,5 +1,4 @@
 -keepattributes *Annotation*, InnerClasses
--dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
 
 # kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
 -keepclassmembers class kotlinx.serialization.json.** {

afterpay/src/main/kotlin/com/afterpay/android/Afterpay.kt

@@ -15,6 +15,7 @@ import com.afterpay.android.internal.getCancellationStatusExtraV3
 import com.afterpay.android.internal.getOrderTokenExtra
 import com.afterpay.android.internal.getRegionLanguage
 import com.afterpay.android.internal.getResultDataExtra
+import com.afterpay.android.internal.putCheckoutShouldLoadRedirectUrls
 import com.afterpay.android.internal.putCheckoutUrlExtra
 import com.afterpay.android.internal.putCheckoutV2OptionsExtra
 import com.afterpay.android.internal.putCheckoutV3OptionsExtra
@@ -75,10 +76,11 @@ object Afterpay {
      * Afterpay checkout.
      */
     @JvmStatic
-    fun createCheckoutIntent(context: Context, checkoutUrl: String): Intent {
+    fun createCheckoutIntent(context: Context, checkoutUrl: String, loadRedirectUrls: Boolean = false): Intent {
         val url = if (enabled) { checkoutUrl } else { "LANGUAGE_NOT_SUPPORTED" }
         return Intent(context, AfterpayCheckoutActivity::class.java)
             .putCheckoutUrlExtra(url)
+            .putCheckoutShouldLoadRedirectUrls(loadRedirectUrls)
     }
 
     /**
@@ -89,7 +91,7 @@ object Afterpay {
     @JvmStatic
     fun createCheckoutV2Intent(
         context: Context,
-        options: AfterpayCheckoutV2Options = AfterpayCheckoutV2Options()
+        options: AfterpayCheckoutV2Options = AfterpayCheckoutV2Options(),
     ): Intent = Intent(context, AfterpayCheckoutV2Activity::class.java)
         .putCheckoutV2OptionsExtra(options)
 
@@ -125,14 +127,14 @@ object Afterpay {
         maximumAmount: String,
         currencyCode: String,
         locale: Locale,
-        environment: AfterpayEnvironment
+        environment: AfterpayEnvironment,
     ) {
         configuration = Configuration(
             minimumAmount = minimumAmount?.toBigDecimal(),
             maximumAmount = maximumAmount.toBigDecimal(),
             currency = Currency.getInstance(currencyCode),
             locale = locale.clone() as Locale,
-            environment = environment
+            environment = environment,
         ).also { validateConfiguration(it) }
     }
 
@@ -192,7 +194,7 @@ object Afterpay {
         orderTotal: OrderTotal,
         items: Array<CheckoutV3Item> = arrayOf(),
         buyNow: Boolean,
-        configuration: CheckoutV3Configuration? = checkoutV3Configuration
+        configuration: CheckoutV3Configuration? = checkoutV3Configuration,
     ): Intent {
         requireNotNull(configuration) {
             "`configuration` must be set via `setCheckoutV3Configuration` or passed into this function"
@@ -207,7 +209,7 @@ object Afterpay {
             buyNow = buyNow,
             checkoutPayload = Json.encodeToString(checkoutRequest),
             checkoutUrl = configuration.v3CheckoutUrl,
-            confirmUrl = configuration.v3CheckoutConfirmationUrl
+            confirmUrl = configuration.v3CheckoutConfirmationUrl,
         )
 
         return Intent(context, AfterpayCheckoutV3Activity::class.java)
@@ -221,7 +223,7 @@ object Afterpay {
     fun updateMerchantReferenceV3(
         merchantReference: String,
         tokens: CheckoutV3Tokens,
-        configuration: CheckoutV3Configuration? = checkoutV3Configuration
+        configuration: CheckoutV3Configuration? = checkoutV3Configuration,
     ): Result<Unit> {
         requireNotNull(configuration) {
             "`configuration` must be set via `setCheckoutV3Configuration` or passed into this function"
@@ -231,13 +233,13 @@ object Afterpay {
             merchantReference,
             token = tokens.token,
             ppaConfirmToken = tokens.ppaConfirmToken,
-            singleUseCardToken = tokens.singleUseCardToken
+            singleUseCardToken = tokens.singleUseCardToken,
         )
 
         return ApiV3.requestUnit(
             configuration.v3CheckoutUrl,
             ApiV3.HttpVerb.PUT,
-            payload
+            payload,
         )
     }
 
@@ -256,7 +258,7 @@ object Afterpay {
             updateMerchantReferenceV3(merchantReference, tokens, configuration)
                 .fold(
                     onSuccess = { null },
-                    onFailure = { throw it }
+                    onFailure = { throw it },
                 )
         }
     }
@@ -266,7 +268,7 @@ object Afterpay {
      */
     @JvmSynthetic
     fun fetchMerchantConfigurationV3(
-        configuration: CheckoutV3Configuration? = checkoutV3Configuration
+        configuration: CheckoutV3Configuration? = checkoutV3Configuration,
     ): Result<Configuration> {
         requireNotNull(configuration) {
             "`configuration` must be set via `setCheckoutV3Configuration` or passed into this function"
@@ -279,7 +281,7 @@ object Afterpay {
                     maximumAmount = it.maximumAmount.amount,
                     currency = Currency.getInstance(configuration.region.currencyCode),
                     locale = configuration.region.locale,
-                    environment = configuration.environment
+                    environment = configuration.environment,
                 )
             }
     }
@@ -291,7 +293,7 @@ object Afterpay {
     @JvmStatic
     @JvmOverloads
     fun fetchMerchantConfigurationV3Async(
-        configuration: CheckoutV3Configuration? = checkoutV3Configuration
+        configuration: CheckoutV3Configuration? = checkoutV3Configuration,
     ): CompletableFuture<Configuration> {
         requireNotNull(configuration) {
             "`configuration` must be set via `setCheckoutV3Configuration` or passed into this function"
@@ -305,13 +307,13 @@ object Afterpay {
                         maximumAmount = it.maximumAmount.amount,
                         currency = Currency.getInstance(configuration.region.currencyCode),
                         locale = configuration.region.locale,
-                        environment = configuration.environment
+                        environment = configuration.environment,
                     )
                 }
 
             result.fold(
                 onSuccess = { it },
-                onFailure = { throw it }
+                onFailure = { throw it },
             )
         }
     }

afterpay/src/main/kotlin/com/afterpay/android/AfterpayCheckoutV2Handler.kt

@@ -10,11 +10,11 @@ interface AfterpayCheckoutV2Handler {
 
     fun shippingAddressDidChange(
         address: ShippingAddress,
-        onProvideShippingOptions: (ShippingOptionsResult) -> Unit
+        onProvideShippingOptions: (ShippingOptionsResult) -> Unit,
     )
 
     fun shippingOptionDidChange(
         shippingOption: ShippingOption,
-        onProvideShippingOption: (ShippingOptionUpdateResult?) -> Unit
+        onProvideShippingOption: (ShippingOptionUpdateResult?) -> Unit,
     )
 }

afterpay/src/main/kotlin/com/afterpay/android/AfterpayCheckoutV2Options.kt

@@ -7,13 +7,13 @@ data class AfterpayCheckoutV2Options(
     val pickup: Boolean? = null,
     val buyNow: Boolean? = null,
     val shippingOptionRequired: Boolean? = null,
-    val enableSingleShippingOptionUpdate: Boolean? = null
+    val enableSingleShippingOptionUpdate: Boolean? = null,
 ) : Parcelable {
     constructor(parcel: Parcel) : this(
         parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
         parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
         parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
-        parcel.readValue(Boolean::class.java.classLoader) as? Boolean
+        parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
     )
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {

afterpay/src/main/kotlin/com/afterpay/android/AfterpayEnvironment.kt

@@ -5,5 +5,5 @@ import java.util.Locale
 enum class AfterpayEnvironment {
     SANDBOX, PRODUCTION;
 
-    override fun toString(): String = name.toLowerCase(Locale.ROOT)
+    override fun toString(): String = name.lowercase(Locale.ROOT)
 }

afterpay/src/main/kotlin/com/afterpay/android/CancellationStatus.kt

@@ -12,5 +12,5 @@ enum class CancellationStatus {
 enum class CancellationStatusV3 {
     USER_INITIATED,
     CONFIGURATION_ERROR,
-    REQUEST_ERROR
+    REQUEST_ERROR,
 }

afterpay/src/main/kotlin/com/afterpay/android/internal/AfterpayCheckoutCompletion.kt

@@ -5,13 +5,13 @@ import kotlinx.serialization.Serializable
 @Serializable
 internal data class AfterpayCheckoutCompletion(
     val status: Status,
-    val orderToken: String
+    val orderToken: String,
 ) {
 
     @Suppress("UNUSED_PARAMETER")
     @Serializable
     internal enum class Status(statusString: String) {
         SUCCESS("SUCCESS"),
-        CANCELLED("CANCELLED")
+        CANCELLED("CANCELLED"),
     }
 }

afterpay/src/main/kotlin/com/afterpay/android/internal/AfterpayCheckoutMessage.kt

@@ -24,20 +24,20 @@ internal sealed class AfterpayCheckoutMessage {
 
         fun fromShippingOptionsResult(
             result: ShippingOptionsResult,
-            meta: AfterpayCheckoutMessageMeta
+            meta: AfterpayCheckoutMessageMeta,
         ): AfterpayCheckoutMessage = when (result) {
             is ShippingOptionsErrorResult -> CheckoutErrorMessage(meta, result.error.name)
             is ShippingOptionsSuccessResult -> ShippingOptionsMessage(meta, result.shippingOptions)
         }
 
         fun fromShippingOptionUpdateResult(
             result: ShippingOptionUpdateResult?,
-            meta: AfterpayCheckoutMessageMeta
+            meta: AfterpayCheckoutMessageMeta,
         ): AfterpayCheckoutMessage = when (result) {
             is ShippingOptionUpdateErrorResult -> CheckoutErrorMessage(meta, result.error.name)
             is ShippingOptionUpdateSuccessResult -> ShippingOptionUpdateMessage(
                 meta,
-                result.shippingOptionUpdate
+                result.shippingOptionUpdate,
             )
             null -> EmptyPayloadMessage(meta)
         }
@@ -48,53 +48,53 @@ internal sealed class AfterpayCheckoutMessage {
 @SerialName("onMessage")
 internal data class CheckoutLogMessage(
     override val meta: AfterpayCheckoutMessageMeta,
-    val payload: CheckoutLog
+    val payload: CheckoutLog,
 ) : AfterpayCheckoutMessage() {
 
     @Serializable
     internal data class CheckoutLog(
         val severity: String,
-        val message: String
+        val message: String,
     )
 }
 
 @Serializable
 @SerialName("onError")
 internal data class CheckoutErrorMessage(
     override val meta: AfterpayCheckoutMessageMeta,
-    val error: String
+    val error: String,
 ) : AfterpayCheckoutMessage()
 
 @Serializable
 @SerialName("onShippingAddressChange")
 internal data class ShippingAddressMessage(
     override val meta: AfterpayCheckoutMessageMeta,
-    val payload: ShippingAddress
+    val payload: ShippingAddress,
 ) : AfterpayCheckoutMessage()
 
 @Serializable
 @SerialName("onShippingOptionChange")
 internal data class ShippingOptionMessage(
     override val meta: AfterpayCheckoutMessageMeta,
-    val payload: ShippingOption
+    val payload: ShippingOption,
 ) : AfterpayCheckoutMessage()
 
 @Serializable
 @SerialName("onShippingOptionUpdateChange")
 internal data class ShippingOptionUpdateMessage(
     override val meta: AfterpayCheckoutMessageMeta,
-    val payload: ShippingOptionUpdate?
+    val payload: ShippingOptionUpdate?,
 ) : AfterpayCheckoutMessage()
 
 @Serializable
 @SerialName("onShippingOptionsChange")
 internal data class ShippingOptionsMessage(
     override val meta: AfterpayCheckoutMessageMeta,
-    val payload: List<ShippingOption>
+    val payload: List<ShippingOption>,
 ) : AfterpayCheckoutMessage()
 
 @Serializable
 @SerialName("onEmptyPayload")
 internal data class EmptyPayloadMessage(
-    override val meta: AfterpayCheckoutMessageMeta
+    override val meta: AfterpayCheckoutMessageMeta,
 ) : AfterpayCheckoutMessage()