Merge pull request #2655 from wmathurin/dev

Moving to v63.0
forcedotcom · Jan 23, 2025 · 124cd89 · 124cd89
2 parents 1a11e22 + c3fc337
commit 124cd89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/external/shared b/external/shared
diff --git 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
@@ -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
@@ -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() {
+1 −1		libs/force.js
+1 −1		samples/contactexplorer/index.html
+1 −1		samples/smartstoreexplorer/index.html
+5 −5		test/SFForceJSTestSuite.js