Release 6.1.1.

build.gradle

@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"
     }
 }

gradle.properties

@@ -10,15 +10,15 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 POM_GROUP_ID=com.ingenico.connect.gateway
 POM_ARTIFACT_ID=connect-sdk-client-android
-POM_VERSION=6.1.0
+POM_VERSION=6.1.1
 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

ingenicoconnect-sdk/build.gradle

@@ -11,6 +11,8 @@ plugins {
 }
 
 android {
+    namespace 'com.ingenico.connect.gateway.sdk.client.android.sdk'
+
     compileSdkVersion 33
 
     defaultConfig {
@@ -22,11 +24,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    lintOptions {
+    lint {
         abortOnError false
         lintConfig file('lint.xml')
     }
@@ -39,11 +41,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.gms:play-services-wallet:19.1.0'
+    implementation 'com.google.android.gms:play-services-wallet:19.2.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:4.9.0'
+    testImplementation 'org.mockito:mockito-core:5.4.0'
 
     // RX
     implementation "io.reactivex.rxjava3:rxjava:3.1.6"
@@ -53,7 +55,7 @@ dependencies {
     // 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.10.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
     implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
     implementation 'com.google.code.gson:gson:2.10.1'
 }
@@ -69,14 +71,17 @@ task javadoc(type: Javadoc) {
     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) {

ingenicoconnect-sdk/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
   ~ Copyright (c) 2022 Global Collect Services B.V
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ingenico.connect.gateway.sdk.client.android.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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

@@ -20,8 +20,8 @@ import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.schedulers.Schedulers
 
 /**
- * Entrypoint for the ConnectSDK. Can only be used with a valid Client Session that was obtained via
- * the Server to Server Create Client Session API.
+ * Entrypoint for the ConnectSDK.
+ * Can only be used with a valid Client Session that was obtained via the Server to Server Create Client Session API.
  */
 object ConnectSDK {
 
@@ -37,11 +37,11 @@ object ConnectSDK {
      * Initializes the ConnectSDK.
      * This method has to be called before doing anything else with the SDK.
      *
-     * @param connectSDKConfiguration The ConnectSDK configuration properties, such as communication
-     * parameters obtained from the Server to Server Create Client Session API.
+     * @param connectSDKConfiguration the ConnectSDK configuration properties,
+     *        such as communication parameters obtained from the Server to Server Create Client Session API
      *
-     * @param paymentConfiguration The payment configuration properties, such as the amount for the
-     * payment, countryCode and other settings.
+     * @param paymentConfiguration the payment configuration properties,
+     *        such as the amount for the payment, countryCode and other settings
      */
     fun initialize(
         connectSDKConfiguration: ConnectSDKConfiguration,
@@ -53,11 +53,11 @@ object ConnectSDK {
     }
 
     /**
-     * Returns an instance of ClientApi. Use the ClientApi class to make requests to the Connect
-     * gateway.
+     * Returns an instance of ClientApi. Use the ClientApi class to make requests to the Connect gateway.
      *
-     * @return ClientApi instance.
-     * @throws ClientApiNotInitializedException if ClientApi has not been initialized.
+     * @return ClientApi instance
+     *
+     * @throws ClientApiNotInitializedException if ClientApi has not been initialized
      */
     fun getClientApi(): ClientApi {
         if (this::clientApi.isInitialized) {
@@ -70,7 +70,8 @@ object ConnectSDK {
     /**
      * Returns the ConnectSDKConfiguration that was provided in the initialize method.
      *
-     * @return ConnectSDKConfiguration instance.
+     * @return ConnectSDKConfiguration instance
+     *
      * @throws ConnectSDKNotInitializedException if the ConnectSDK has not been initialized.
      */
     fun getConnectSdkConfiguration(): ConnectSDKConfiguration {
@@ -82,9 +83,10 @@ object ConnectSDK {
     }
 
     /**
-     * Returns the PaymentConfiguration that was provided in the initialize method.
+     * Returns the [PaymentConfiguration] that was provided in the initialize method.
+     *
+     * @return [PaymentConfiguration] instance
      *
-     * @return PaymentConfiguration instance.
      * @throws ConnectSDKNotInitializedException if the ConnectSDK has not been initialized.
      */
     fun getPaymentConfiguration(): PaymentConfiguration {
@@ -96,11 +98,11 @@ object ConnectSDK {
     }
 
     /**
-     * Encrypts the data in the provided paymentRequest instance.
+     * Encrypts the data in the provided [PaymentRequest] instance.
      *
-     * @param paymentRequest The paymentRequest which contains the values that were entered by the user.
-     * @param onSuccess Called when the payment request is successful encrypted.
-     * @param onFailure Called when an unexpected error occurred.
+     * @param paymentRequest the [PaymentRequest] which contains the values that were entered by the user
+     * @param onSuccess called when the [PaymentRequest] is successfully encrypted
+     * @param onFailure called when an unexpected error occurred
      */
     fun encryptPaymentRequest(
         paymentRequest: PaymentRequest,