Support Android 15 (#274)

* Bump Android Target version. * Update CHANGELOG. * Add robolectric.properties file to project since Robolectric does not support Android 15. * Add TODO. * Bump Robolectric version. * Change sdk version in Robolectric. * Add robolectric config settings for CardPayments. * Add robolectric config for PayPalWebPayments module. * Bump robolectric target sdk. * Revert "Bump robolectric target sdk." This reverts commit 4914ca6.
paypal · Sep 3, 2024 · d9b5a10 · d9b5a10
1 parent 7285f90
commit d9b5a10
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## unreleased
 
+* All Modules
+  * Upgrade compileSdkVersion and targetSdkVersion to API 35
 * CardPayments
   * Deprecate `CardResult.liabilityShift` property
   * Deprecate `CardResult.deepLinkUrl` property

diff --git a/CardPayments/src/test/resources/robolectric.properties b/CardPayments/src/test/resources/robolectric.properties
@@ -0,0 +1,2 @@
+# TODO: remove this file when Robolectric supports API level 35 (Android 15)
+sdk=33
diff --git a/CorePayments/src/test/resources/robolectric.properties b/CorePayments/src/test/resources/robolectric.properties
@@ -0,0 +1,2 @@
+# TODO: remove this file when Robolectric supports API level 35 (Android 15)
+sdk=33
diff --git a/PayPalWebPayments/src/test/resources/robolectric.properties b/PayPalWebPayments/src/test/resources/robolectric.properties
@@ -0,0 +1,2 @@
+# TODO: remove this file when Robolectric supports API level 35 (Android 15)
+sdk=33
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
             "sdkVersionName"      : "1.5.1-SNAPSHOT",
             "demoAppVersionCode"  : 4,
             "androidMinSdkVersion": 21,
-            "androidTargetVersion": 30
+            "androidTargetVersion": 35
     ]
 
     ext.versions = [
@@ -70,7 +70,7 @@ buildscript {
             "androidxTestUiAutomator"     : "androidx.test.uiautomator:uiautomator:2.2.0",
             "mockk"                       : "io.mockk:mockk:1.13.5",
             "kotlinxAndroidCoroutinesTest": "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1",
-            "robolectric"                 : "org.robolectric:robolectric:4.10.3",
+            "robolectric"                 : "org.robolectric:robolectric:4.13",
             "jsonAssert"                  : "org.skyscreamer:jsonassert:1.4.0",
             "striktMockk"                 : "io.strikt:strikt-mockk:0.30.1",
             "striktCore"                  : "io.strikt:strikt-core:0.30.1",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# TODO: remove this file when Robolectric supports API level 35 (Android 15)
		sdk=33