From c3fc337e98a84f9f7ab0284d583c283bd96a234a Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Wed, 22 Jan 2025 17:44:33 -0800
Subject: [PATCH] Moving to v63.0

---
 external/shared                                             | 2 +-
 libs/SalesforceSDK/res/values/strings.xml                   | 2 +-
 .../src/com/salesforce/androidsdk/push/PushService.kt       | 6 +-----
 .../com/salesforce/androidsdk/rest/ApiVersionStrings.java   | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/external/shared b/external/shared
index 7448a6978d..ad7e7699e2 160000
--- a/external/shared
+++ b/external/shared
@@ -1 +1 @@
-Subproject commit 7448a6978df79121e1a9110b3c996025e0bde65a
+Subproject commit ad7e7699e2bbf613a88b100b763b01695d82e5ab
diff --git a/libs/SalesforceSDK/res/values/strings.xml b/libs/SalesforceSDK/res/values/strings.xml
index 2b0d65ba87..0c7766c3c1 100644
--- a/libs/SalesforceSDK/res/values/strings.xml
+++ b/libs/SalesforceSDK/res/values/strings.xml
@@ -12,5 +12,5 @@
     <string name="oauth_display_type">touch</string>
 
     <!-- Default API version used by the SDK and sample apps -->
-    <string name="api_version">v60.0</string>
+    <string name="api_version">v63.0</string>
 </resources>
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/push/PushService.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/push/PushService.kt
index 7156a8d2fc..4ab375a039 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/push/PushService.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/push/PushService.kt
@@ -252,11 +252,7 @@ open class PushService {
             }
 
             getRestClient(account)?.let { restClient ->
-                val apiVersion = ApiVersionStrings.getVersionNumber(SalesforceSDKManager.getInstance().appContext)
-                // TODO remove once MSDK default api version is 61 or greater
-                if (apiVersion >= "v61.0") {
-                    fields[CIPHER_NAME] = Encryptor.CipherMode.RSA_OAEP_SHA256.name
-                }
+                fields[CIPHER_NAME] = Encryptor.CipherMode.RSA_OAEP_SHA256.name
 
                 var status = REGISTRATION_STATUS_FAILED
                 val response = onSendRegisterPushNotificationRequest(fields, restClient)
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ApiVersionStrings.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ApiVersionStrings.java
index ff8601ff04..533d9d10f5 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ApiVersionStrings.java
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ApiVersionStrings.java
@@ -37,7 +37,7 @@
  */
 public class ApiVersionStrings {
 
-    public static final String VERSION_NUMBER = "v60.0";
+    public static final String VERSION_NUMBER = "v63.0";
     public static final String API_PREFIX = "/services/data/";
 
     public static String getBasePath() {