Merge 2cb5ead into 0e9683d

ibm-bluemix-mobile-services · Nov 19, 2019 · 62992f1 · 62992f1
2 parents 0e9683d + 2cb5ead
commit 62992f1
Show file tree

Hide file tree

Showing 16 changed files with 546 additions and 523 deletions.
diff --git a/BMSPush.podspec b/BMSPush.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
   s.name         = 'BMSPush'
 
-  s.version      = '3.4.4'
+  s.version      = '3.5.0'
 
   s.summary      = 'Swift client side Push SDK for IBM Bluemix Push notifications services'
   s.homepage     = 'https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push'

diff --git a/Podfile.lock b/Podfile.lock
@@ -7,7 +7,7 @@ DEPENDENCIES:
   - BMSCore (~> 2.4)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - BMSAnalyticsAPI
     - BMSCore
 
@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e80a7d7ad79933b8fc203a435b3e57055e1352bc
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.4
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Target Support Files/BMSAnalyticsAPI/BMSAnalyticsAPI.xcconfig b/Pods/Target Support Files/BMSAnalyticsAPI/BMSAnalyticsAPI.xcconfig
diff --git a/Pods/Target Support Files/BMSCore/BMSCore.xcconfig b/Pods/Target Support Files/BMSCore/BMSCore.xcconfig
diff --git a/Pods/Target Support Files/Pods-BMSPush/Pods-BMSPush.debug.xcconfig b/Pods/Target Support Files/Pods-BMSPush/Pods-BMSPush.debug.xcconfig
diff --git a/Pods/Target Support Files/Pods-BMSPush/Pods-BMSPush.release.xcconfig b/Pods/Target Support Files/Pods-BMSPush/Pods-BMSPush.release.xcconfig
diff --git a/Pods/Target Support Files/Pods-BMSPushHostApp/Pods-BMSPushHostApp-frameworks.sh b/Pods/Target Support Files/Pods-BMSPushHostApp/Pods-BMSPushHostApp-frameworks.sh
diff --git a/Pods/Target Support Files/Pods-BMSPushHostApp/Pods-BMSPushHostApp.debug.xcconfig b/Pods/Target Support Files/Pods-BMSPushHostApp/Pods-BMSPushHostApp.debug.xcconfig
diff --git a/Pods/Target Support Files/Pods-BMSPushHostApp/Pods-BMSPushHostApp.release.xcconfig b/Pods/Target Support Files/Pods-BMSPushHostApp/Pods-BMSPushHostApp.release.xcconfig
diff --git a/Pods/Target Support Files/Pods-BMSPushTests/Pods-BMSPushTests-frameworks.sh b/Pods/Target Support Files/Pods-BMSPushTests/Pods-BMSPushTests-frameworks.sh
diff --git a/Pods/Target Support Files/Pods-BMSPushTests/Pods-BMSPushTests.debug.xcconfig b/Pods/Target Support Files/Pods-BMSPushTests/Pods-BMSPushTests.debug.xcconfig
diff --git a/Pods/Target Support Files/Pods-BMSPushTests/Pods-BMSPushTests.release.xcconfig b/Pods/Target Support Files/Pods-BMSPushTests/Pods-BMSPushTests.release.xcconfig
diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ myBMSClient.initialize(bluemixRegion: "Location where your app Hosted")
 
 ##### bluemixRegion
 
-- Specifies the location where the app hosted. You can either use one of three values - `BMSClient.Region.usSouth`, `BMSClient.Region.unitedKingdom`, `BMSClient.Region.germany` and `BMSClient.Region.sydney` OR specify the region manually .
+- Specifies the location where the app hosted. You can either use one of three values - `BMSClient.Region.usSouth`, `BMSClient.Region.unitedKingdom`, `BMSClient.Region.germany`, `BMSClient.Region.sydney` and `BMSClient.Region.jpTok` OR specify the region manually .
 
 >**Note**:  If you are using dedicated service please use `overrideServerHost` and add `bluemixRegion` any value.
 

diff --git a/Source/BMSPushUrlBuilder.swift b/Source/BMSPushUrlBuilder.swift
@@ -21,7 +21,7 @@ import BMSCore
 
         internal  let FORWARDSLASH = "/";
         internal  let IMFPUSH = "imfpush";
-       // internal let JPIMFPUSH = "jp-tok.imfpush.cloud.ibm.com"
+        internal let JPIMFPUSH = "jp-tok.imfpush.cloud.ibm.com"
         internal  let V1 = "v1";
         internal  let APPS = "apps";
         internal  let AMPERSAND = "&";
@@ -64,11 +64,9 @@ import BMSCore
                     else{
                         reWritedomain = "stage1-dev.ng.bluemix.net"
                     }
-                }
-                /*else if BMSClient.sharedInstance.bluemixRegion == BMSClient.Region.jpTok {
+                } else if BMSClient.sharedInstance.bluemixRegion == BMSClient.Region.jpTok {
                     pwUrl_ += JPIMFPUSH
-                }*/
-                else{
+                } else{
                     pwUrl_ += IMFPUSH
                     pwUrl_ += BMSClient.sharedInstance.bluemixRegion!
                     reWritedomain = ""