Merge pull request #486 from gini/PM-85-PM-84-PM-92_Upgrade_AGP_8_4_2

Pm 85 pm 84 pm 92 upgrade agp 8 4 2
gini · Jul 11, 2024 · eedde29 · eedde29
2 parents 40973fd + 9daed17
commit eedde29
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 17 deletions.
diff --git a/bank-api-library/library/build.gradle.kts b/bank-api-library/library/build.gradle.kts
@@ -19,7 +19,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -113,7 +114,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
             listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri", "testHealthApiUri")))
     }
 

diff --git a/bank-sdk/sdk/build.gradle.kts b/bank-sdk/sdk/build.gradle.kts
@@ -26,7 +26,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -147,8 +148,9 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
-            listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri")))
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
+            listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri"))
+        )
     }
 
     destinations.put(

diff --git a/capture-sdk/default-network/build.gradle.kts b/capture-sdk/default-network/build.gradle.kts
@@ -25,7 +25,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -119,7 +120,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
             listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri")))
     }
 

diff --git a/capture-sdk/sdk/build.gradle.kts b/capture-sdk/sdk/build.gradle.kts
@@ -24,7 +24,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/core-api-library/library/build.gradle.kts b/core-api-library/library/build.gradle.kts
@@ -16,7 +16,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt b/core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import net.gini.android.core.api.response.PaymentRequestResponse
+import net.gini.android.core.api.response.PaymentResponse
 import net.gini.android.core.api.test.DocumentRemoteSourceForTests
 import net.gini.android.core.api.test.MockGiniApiType
 import okhttp3.RequestBody
@@ -213,6 +214,14 @@ class DocumentRemoteSourceTest {
             return Response.success(listOf(PaymentRequestResponse(null, null, "", "", null, "", "", "")))
         }
 
+        override suspend fun getPayment(
+            bearer: Map<String, String>,
+            id: String
+        ): Response<PaymentResponse> {
+            bearerAuthHeader = bearer["Authorization"]
+            return Response.success(PaymentResponse("", "", "", null, "", "" ))
+        }
+
         override suspend fun getFile(bearer: Map<String, String>, location: String): Response<ResponseBody> {
             bearerAuthHeader = bearer["Authorization"]
             return Response.success("response".toResponseBody())

diff --git a/core-api-library/shared-tests/build.gradle.kts b/core-api-library/shared-tests/build.gradle.kts
@@ -14,7 +14,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 android-compileSdk = "34"
 android-minSdk = "21"
-android-targetSdk = "33"
+android-targetSdk = "34"
 kotlin = "1.8.20"
-android-gradle-plugin = "8.2.1"
+android-gradle-plugin = "8.4.2"
 dokka = "1.7.20"
 androidx-lifecycle = "2.7.0"
 androidx-camera = "1.3.1"
@@ -83,7 +83,7 @@ mlkit-textrecognition = "com.google.android.gms:play-services-mlkit-text-recogni
 apachecommons-imaging = "org.apache.commons:commons-imaging:1.0-alpha2"
 completableFuture = "org.glassfish.jersey.bundles.repackaged:jersey-jsr166e:2.25.1"
 truth = "com.google.truth:truth:1.1.3"
-robolectric = "org.robolectric:robolectric:4.9"
+robolectric = "org.robolectric:robolectric:4.12.2"
 dexter = "com.karumi:dexter:6.2.3"
 logback-android-core = "com.github.tony19:logback-android-core:1.1.1-6"
 logback-android-classic = "com.github.tony19:logback-android-classic:1.1.1-6"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Sep 29 16:01:46 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-api-library/library/build.gradle.kts b/health-api-library/library/build.gradle.kts
@@ -24,7 +24,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -124,7 +125,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {
 
     doFirst {
         propertiesMap.clear()
-        propertiesMap.putAll(readLocalPropertiesToMap(project,
+        propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
             listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri", "testBankApiUri")))
     }
 

diff --git a/health-sdk/sdk/build.gradle.kts b/health-sdk/sdk/build.gradle.kts
@@ -19,7 +19,8 @@ android {
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.android.targetSdk.get().toInt()
 
         // Use the test runner with JUnit4 support
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"