Release 6.2.0.

Author: IngenicoEPayments

build.gradle

@@ -6,15 +6,15 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"
     }
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

documentation/Migration Guide v5 to v6.md

@@ -131,7 +131,6 @@ This is the full list of classes that have become deprecated related to the arch
 - `BasicPaymentProductGroupsAsyncTask`
 - `BasicPaymentProductsAsyncTask`
 - `ConvertAmountAsyncTask`
-- `CustomerDetailsAsyncTask`
 - `EncryptDataAsyncTask`
 - `IinLookupAsyncTask`
 - `LoadImageAsyncTask`
@@ -198,17 +197,11 @@ The following methods and constructors had their arguments or return types chang
 - Constructors in `AmountOfMoney`:
     - `AmountOfMoney(Long amount, CurrencyCode currencyCode)`
 - Methods in `Session`:
-    - `getCustomerDetails(Context context, String productId, CountryCode countryCode, List<KeyValuePair> values, OnCustomerDetailsCallCompleteListener listener)`
     - `getDirectoryForPaymentProductId(String productId, CurrencyCode currencyCode, CountryCode countryCode, Context context, OnPaymentProductDirectoryCallCompleteListener listener)`
 - Methods in `C2sCommunicator`:
-    - `getCustomerDetails(String productId, CountryCode countryCode, List<KeyValuePair> values, Context context)`
     - `getPaymentProductDirectory(String productId, CurrencyCode currencyCode, CountryCode countryCode, Context context)`
 - Constructor in `PaymentProductDirectoryAsyncTask`:
     - `PaymentProductDirectoryAsyncTask(String productId, CurrencyCode currencyCode, CountryCode countryCode, Context context, C2sCommunicator communicator, OnPaymentProductDirectoryCallCompleteListener listener)`
-- Constructor in `CustomerDetailsRequest`:
-    - `CustomerDetailsRequest(CountryCode countryCode, List<KeyValuePair> values)`
-- Method in `CustomerDetailsRequest`:
-    - `setCountryCode(CountryCode countryCode)`
 - Constructor in `PaymentItemCacheKey`:
     - `PaymentItemCacheKey(Long amount, CountryCode countryCode, CurrencyCode currencyCode, boolean isRecurring, String paymentProductId)`
 
@@ -218,8 +211,6 @@ The following getters have been marked deprecated, and should no longer be used:
     - `getCurrencyCodeString()`
 - `IinDetailsResponse`:
     - `getCountryCodeString()`
-- `CustomerDetailsRequest`:
-    - `getCountryCodeString()`
 - `PaymentContext`:
     - `getCountryCodeString()`
 - `PaymentItemCacheKey`:

gradle.properties

@@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 # org.gradle.parallel=true
 POM_GROUP_ID=com.ingenico.connect.gateway
 POM_ARTIFACT_ID=connect-sdk-client-android
-POM_VERSION=6.1.5
+POM_VERSION=6.2.0
 POM_NAME=connect-sdk-client-android
 POM_DESCRIPTION=SDK to communicate with the Ingenico ePayments platform using the Ingenico Connect Client API
 POM_URL=https://github.com/Ingenico-ePayments/connect-sdk-client-android

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Sep 20 14:52:46 CEST 2019
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

ingenicoconnect-sdk/build.gradle

@@ -13,13 +13,12 @@ plugins {
 android {
     namespace 'com.ingenico.connect.gateway.sdk.client.android.sdk'
 
-    compileSdkVersion 33
-
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
         versionCode 1
-        versionName "1.0"
+        versionName "6.2.0"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -38,58 +37,40 @@ android {
             minifyEnabled false
         }
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
-    implementation 'com.google.android.gms:play-services-wallet:19.2.0'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'com.google.android.gms:play-services-wallet:19.2.1'
+    implementation 'org.apache.commons:commons-lang3:3.13.0'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.4.0'
+    testImplementation 'org.mockito:mockito-core:5.9.0'
 
     // RX
-    implementation "io.reactivex.rxjava3:rxjava:3.1.6"
+    implementation "io.reactivex.rxjava3:rxjava:3.1.8"
     implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
 
     // Network
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
     implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
     implementation 'com.google.code.gson:gson:2.10.1'
 }
 
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    archiveClassifier.set("sources")
-}
-
-task javadoc(type: Javadoc) {
-    dependsOn "generateReleaseRFile"
-    dependsOn "compileReleaseKotlin"
-    failOnError false
-    configurations.implementation.setCanBeResolved(true)
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.implementation
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set("javadoc")
-    from javadoc.destinationDir
-}
-
 afterEvaluate {
-    javadoc.classpath += files(android.libraryVariants.collect { variant ->
-        variant.javaCompileProvider.get().classpath.files
-    })
     publishing {
         publications {
             mavenJava(MavenPublication) {
                 from components.release
-                artifact sourcesJar
-                artifact javadocJar
 
                 groupId = POM_GROUP_ID
                 artifactId = POM_ARTIFACT_ID

ingenicoconnect-sdk/src/main/java/com/ingenico/connect/gateway/sdk/client/android/sdk/ClientApi.kt

@@ -8,22 +8,19 @@ import android.graphics.drawable.Drawable
 import com.ingenico.connect.gateway.sdk.client.android.sdk.configuration.ConnectSDKConfiguration
 import com.ingenico.connect.gateway.sdk.client.android.sdk.configuration.PaymentConfiguration
 import com.ingenico.connect.gateway.sdk.client.android.sdk.drawable.GetDrawableFromUrl
-import com.ingenico.connect.gateway.sdk.client.android.sdk.model.CustomerDetailsResponse
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.PaymentProductDirectoryResponse
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.PublicKeyResponse
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.ThirdPartyStatus
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.iin.IinDetailsResponse
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.paymentproduct.BasicPaymentItems
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.paymentproduct.BasicPaymentProducts
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.paymentproduct.BasicPaymentProductGroups
-import com.ingenico.connect.gateway.sdk.client.android.sdk.model.paymentproduct.KeyValuePair
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.paymentproduct.PaymentProduct
 import com.ingenico.connect.gateway.sdk.client.android.sdk.model.paymentproduct.PaymentProductGroup
 import com.ingenico.connect.gateway.sdk.client.android.sdk.network.ApiError
 import com.ingenico.connect.gateway.sdk.client.android.sdk.network.Failure
 import com.ingenico.connect.gateway.sdk.client.android.sdk.network.Success
 import com.ingenico.connect.gateway.sdk.client.android.sdk.network.extension.subscribeAndMapNetworkResponse
-import com.ingenico.connect.gateway.sdk.client.android.sdk.product.GetCustomerDetails
 import com.ingenico.connect.gateway.sdk.client.android.sdk.product.GetPaymentItems
 import com.ingenico.connect.gateway.sdk.client.android.sdk.product.GetPaymentProduct
 import com.ingenico.connect.gateway.sdk.client.android.sdk.product.GetPaymentProductDirectory
@@ -190,45 +187,6 @@ class ClientApi(
         compositeDisposable.add(disposable)
     }
 
-    /**
-     * Gets the customer details as a [CustomerDetailsResponse] from the gateway.
-     *
-     * @param paymentProductId the paymentProductId of the product
-     *        for which the customer details need to be retrieved from the server
-     * @param countryCode the code of the country where the customer resides
-     * @param values a list of keys with a value used to retrieve the details of a customer.
-     *        Depending on the country code, different keys are required
-     * @param onSuccess calls this parameter when customer details
-     *        are successfully fetched as a [CustomerDetailsResponse]
-     * @param onApiError calls this parameter when an api error is returned by the server
-     * @param onFailure calls this parameter when an unexpected error thrown
-     */
-    @Suppress("LongParameterList")
-    fun getCustomerDetails(
-        paymentProductId: String,
-        countryCode: String,
-        values: List<KeyValuePair>,
-        onSuccess: Success<CustomerDetailsResponse>,
-        onApiError: ApiError,
-        onFailure: Failure
-    ) {
-        val disposable = GetCustomerDetails().invoke(
-            connectSDKConfiguration,
-            paymentProductId,
-            countryCode,
-            values
-        )
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribeAndMapNetworkResponse(
-                { (onSuccess::success)(it) },
-                { (onApiError::apiError)(it) },
-                { (onFailure::failure)(it) }
-            )
-
-        compositeDisposable.add(disposable)
-    }
-
     /**
      * Gets payment product directories as a [PaymentProductDirectoryResponse] from the gateway.
      * Mainly used for IDEAL payments.