@appzung/react-native-code-push 8.3.2 → 10.0.0-rc1

package/docs/setup-ios.md

@@ -1,11 +1,12 @@
 ## iOS Setup
 
-Once you've acquired the CodePush plugin, you need to integrate it into the Xcode project of your React Native app and configure it correctly. To do this, take the following steps:
-​
-### Plugin Installation and Configuration for React Native 0.60 version and above (iOS)
+* [Plugin Installation and Configuration](#plugin-installation-and-configuration)
+* [Code Signing setup](#code-signing-setup)
+
+### Plugin Installation and Configuration
 
 1. Run `cd ios && pod install && cd ..` to install all the necessary CocoaPods dependencies.
-​
+
 2. Open up the `AppDelegate.m` file, and add an import statement for the CodePush headers:
 
    ```objective-c
@@ -42,189 +43,36 @@ Once you've acquired the CodePush plugin, you need to integrate it into the Xcod
    }
    ```
 
-5. Add the Deployment key to `Info.plist`:
-
-   To let the CodePush runtime know which deployment it should query for updates against, open your app's `Info.plist` file and add a new entry named `CodePushDeploymentKey`, whose value is the key of the deployment you want to configure this app against (like the key for the `Staging` deployment for the `FooBar` app). You can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k` in the AppCenter CLI (the `-k` flag is necessary since keys aren't displayed by default) and copying the value of the `Key` column which corresponds to the deployment you want to use (see below). Note that using the deployment's name (like Staging) will not work. That "friendly name" is intended only for authenticated management usage from the CLI, and not for public consumption within your app.
-
-   ![Deployment list](https://cloud.githubusercontent.com/assets/116461/11601733/13011d5e-9a8a-11e5-9ce2-b100498ffb34.png)
-
-   In order to effectively make use of the `Staging` and `Production` deployments that were created along with your CodePush app, refer to the [multi-deployment testing](../README.md#multi-deployment-testing) docs below before actually moving your app's usage of CodePush into production.
-
-   *Note: If you need to dynamically use a different deployment, you can also override your deployment key in JS code using [Code-Push options](./api-js.md#CodePushOptions)*
-
-### Plugin Installation for React Native lower than 0.60 (iOS)
-
-In order to accommodate as many developer preferences as possible, the CodePush plugin supports iOS installation via three mechanisms:
-
-1. [**RNPM**](#plugin-installation-ios---rnpm) - [React Native Package Manager (RNPM)](https://github.com/rnpm/rnpm) is an awesome tool that provides the simplest installation experience possible for React Native plugins. If you're already using it, or you want to use it, then we recommend this approach.
-
-2. [**CocoaPods**](#plugin-installation-ios---cocoapods) - If you're building a native iOS app that is embedding React Native into it, or you simply prefer using [CocoaPods](https://cocoapods.org), then we recommend using the Podspec file that we ship as part of our plugin.
-
-3. [**"Manual"**](#plugin-installation-ios---manual) - If you don't want to depend on any additional tools or are fine with a few extra installation steps (it's a one-time thing), then go with this approach.
-
-#### Plugin Installation (iOS - RNPM)
-
-1. As of v0.27 of React Native, `rnpm link` has already been merged into the React Native CLI. Simply run:
-    ```
-    react-native link react-native-code-push
-    ```
-
-    If your app uses a version of React Native that is lower than v0.27, run the following:
-    ```
-    rnpm link react-native-code-push
-    ```
-
-    *Note: If you don't already have RNPM installed, you can do so by simply running `npm i -g rnpm` and then executing the above command. If you already have RNPM installed, make sure you have v1.9.0+ in order to benefit from this one step install.*
-
-2. You will be prompted for the deployment key you'd like to use. If you don't already have it, you can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k`, or you can choose to ignore it (by simply hitting `<ENTER>`) and add it in later. To get started, we would recommend just using your `Staging` deployment key, so that you can test out the CodePush end-to-end.
-
-And that's it! Isn't RNPM awesome? :)
-
-#### Plugin Installation (iOS - CocoaPods)
-
-1. Add the ReactNative and CodePush plugin dependencies to your `Podfile`, pointing at the path where NPM installed it
-
-    ```
-    # React Native requirements
-    pod 'React', :path => '../node_modules/react-native', :subspecs => [
-       'Core',
-       'CxxBridge', # Include this for RN >= 0.47
-       'DevSupport', # Include this to enable In-App Devmenu if RN >= 0.43
-       'RCTText',
-       'RCTNetwork',
-       'RCTWebSocket', # Needed for debugging
-       'RCTAnimation', # Needed for FlatList and animations running on native UI thread
-       # Add any other subspecs you want to use in your project
-    ]
-    # Explicitly include Yoga if you are using RN >= 0.42.0
-    pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-    pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-    pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-    pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-      
-    # CodePush plugin dependency
-    pod 'CodePush', :path => '../node_modules/react-native-code-push'
-    ```
-
-    *NOTE: The above path needs to be relative to your app's `Podfile`, so adjust it as necessary.*
-
-    *NOTE: `JWT` library should be >= version 3.0.x*
-
-2. Run `pod install`
-
-*NOTE: The CodePush `.podspec` depends on the `React` pod, and so in order to ensure that it can correctly use the version of React Native that your app is built with, please make sure to define the `React` dependency in your app's `Podfile` as explained [here](https://facebook.github.io/react-native/docs/integration-with-existing-apps.html#podfile).*
-
-#### Plugin Installation (iOS - Manual)
-
-1. Open your app's Xcode project
-
-2. Find the `CodePush.xcodeproj` file within the `node_modules/react-native-code-push/ios` directory (or `node_modules/react-native-code-push` for <=`1.7.3-beta` installations) and drag it into the `Libraries` node in Xcode
-
-    ![Add CodePush to project](https://cloud.githubusercontent.com/assets/8598682/13368613/c5c21422-dca0-11e5-8594-c0ec5bde9d81.png)
-
-3. Select the project node in Xcode and select the "Build Phases" tab of your project configuration.
-
-4. Drag `libCodePush.a` from `Libraries/CodePush.xcodeproj/Products` into the "Link Binary With Libraries" section of your project's "Build Phases" configuration.
-
-    ![Link CodePush during build](https://cloud.githubusercontent.com/assets/516559/10322221/a75ea066-6c31-11e5-9d88-ff6f6a4d6968.png)
-
-5. Click the plus sign underneath the "Link Binary With Libraries" list and select the `libz.tbd` library underneath the `iOS 9.1` node.
-
-    ![Libz reference](https://cloud.githubusercontent.com/assets/116461/11605042/6f786e64-9aaa-11e5-8ca7-14b852f808b1.png)
-
-    *Note: Alternatively, if you prefer, you can add the `-lz` flag to the `Other Linker Flags` field in the `Linking` section of the `Build Settings`.*
-
-
-### Plugin Configuration for React Native lower than 0.60 (iOS)
-
-*NOTE: If you used RNPM or `react-native link` to automatically link the plugin, these steps have already been done for you so you may skip this section.*
-
-Once your Xcode project has been setup to build/link the CodePush plugin, you need to configure your app to consult CodePush for the location of your JS bundle, since it is responsible for synchronizing it with updates that are released to the CodePush server. To do this, perform the following steps:
-
-1. Open up the `AppDelegate.m` file, and add an import statement for the CodePush headers:
-
-    ```objective-c
-    #import <CodePush/CodePush.h>
-    ```
-
-For React Native 0.59 - 0.59.10:
-
-2. Find the following line of code, which sets the source URL for bridge for production releases:
-
-    ```objective-c
-    return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-    ```
-
-3. Replace it with this line:
+5. Add the Release channel public ID to `Info.plist`:
 
-    ```objective-c
-    return [CodePush bundleURL];
-    ```
+   To let the CodePush runtime know which release channel it should query for updates against, open your app's `Info.plist` file and add a new entry named `CodePushReleaseChannelPublicId`, whose value is the public ID of the release channel you want to configure this app against. You can retrieve this value by running `appzung release-channels list` in the AppZung CLI and copying the value of the `Public ID` column.
 
-For React Native 0.58 and below:
+   You may want to refer to the [multiple environments](./advanced-usage.md#multiple-environments) docs before actually moving your app's usage of CodePush into production.
 
-2. Find the following line of code, which loads your JS Bundle from the app binary for production releases:
+   *Note: If you need to dynamically use a different release channel, you can also override your release channel public ID in JS code using [Code-Push options](./api-js.md#CodePushOptions)*
 
-    ```objective-c
-    jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-    ```
-
-3. Replace it with this line:
-
-    ```objective-c
-    jsCodeLocation = [CodePush bundleURL];
-    ```
-
-This change configures your app to always load the most recent version of your app's JS bundle. On the first launch, this will correspond to the file that was compiled with the app. However, after an update has been pushed via CodePush, this will return the location of the most recently installed update.
-
-*NOTE: The `bundleURL` method assumes your app's JS bundle is named `main.jsbundle`. If you have configured your app to use a different file name, simply call the `bundleURLForResource:` method (which assumes you're using the `.jsbundle` extension) or `bundleURLForResource:withExtension:` method instead, in order to overwrite that default behavior*
-
-Typically, you're only going to want to use CodePush to resolve your JS bundle location within release builds, and therefore, we recommend using the `DEBUG` pre-processor macro to dynamically switch between using the packager server and CodePush, depending on whether you are debugging or not. This will make it much simpler to ensure you get the right behavior you want in production, while still being able to use the Chrome Dev Tools, live reload, etc. at debug-time.
-
-For React Native 0.59 - 0.59.10:
-
-```objective-c
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
-{
-  #if DEBUG
-    return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-  #else
-    return [CodePush bundleURL];
-  #endif
-}
-```
-
-For React Native 0.49 - 0.58:
+### Code Signing setup
 
-```objective-c
-NSURL *jsCodeLocation;
+You can self sign bundles during release and verify its signature before installation of update.
 
-#ifdef DEBUG
-    jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-#else
-    jsCodeLocation = [CodePush bundleURL];
-#endif
-```
+In order to configure Public Key for bundle verification you need to add record in `Info.plist` with name `CodePushSigningPublicKey` and string value of public key content. Example:
 
-For React Native 0.48 and below:
+```xml
+<plist version="1.0">
+  <dict>
+    <!-- ...other configs... -->
 
-```objective-c
-NSURL *jsCodeLocation;
+    <key>CodePushSigningPublicKey</key>
+        <string>-----BEGIN PUBLIC KEY-----
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANkWYydPuyOumR/sn2agNBVDnzyRpM16NAUpYPGxNgjSEp0etkDNgzzdzyvyl+OsAGBYF3jCxYOXozum+uV5hQECAwEAAQ==
+-----END PUBLIC KEY-----</string>
 
-#ifdef DEBUG
-    jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
-#else
-    jsCodeLocation = [CodePush bundleURL];
-#endif
+    <!-- ...other configs... -->
+  </dict>
+</plist>
 ```
 
-To let the CodePush runtime know which deployment it should query for updates against, open your app's `Info.plist` file and add a new entry named `CodePushDeploymentKey`, whose value is the key of the deployment you want to configure this app against (like the key for the `Staging` deployment for the `FooBar` app). You can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k` in the AppCenter CLI (the `-k` flag is necessary since keys aren't displayed by default) and copying the value of the `Key` column which corresponds to the deployment you want to use (see below). Note that using the deployment's name (like Staging) will not work. That "friendly name" is intended only for authenticated management usage from the CLI, and not for public consumption within your app.
-
-![Deployment list](https://cloud.githubusercontent.com/assets/116461/11601733/13011d5e-9a8a-11e5-9ce2-b100498ffb34.png)
-
-In order to effectively make use of the `Staging` and `Production` deployments that were created along with your CodePush app, refer to the [multi-deployment testing](../README.md#multi-deployment-testing) docs below before actually moving your app's usage of CodePush into production.
-
-### HTTP exception domains configuration (iOS)
+### (optional) HTTP exception domains configuration
 
 CodePush plugin makes HTTPS requests to the following domains:
 
@@ -255,25 +103,3 @@ If you want to change the default HTTP security configuration for any of these d
 Before doing anything, please [read the docs][ats] first.
 
 [ats]: https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html#//apple_ref/doc/uid/TP40009251-SW33
-
-### Code Signing setup
-
-Starting with CLI version **2.1.0** you can self sign bundles during release and verify its signature before installation of update. For more info about Code Signing please refer to [relevant code-push documentation section](https://github.com/microsoft/code-push/tree/v3.0.1/cli#code-signing).
-
-In order to configure Public Key for bundle verification you need to add record in `Info.plist` with name `CodePushPublicKey` and string value of public key content. Example:
-
-```xml
-<plist version="1.0">
-  <dict>
-    <!-- ...other configs... -->
-
-    <key>CodePushPublicKey</key>
-        <string>-----BEGIN PUBLIC KEY-----
-MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANkWYydPuyOumR/sn2agNBVDnzyRpM16NAUpYPGxNgjSEp0etkDNgzzdzyvyl+OsAGBYF3jCxYOXozum+uV5hQECAwEAAQ==
------END PUBLIC KEY-----</string>
-
-    <!-- ...other configs... -->
-  </dict>
-</plist>
-```
-

package/docs/setup-windows.md

@@ -2,13 +2,11 @@
 
 Once you've acquired the CodePush plugin, you need to integrate it into the Visual Studio project of your React Native app and configure it correctly. To do this, take the following steps:
 
-### Plugin Installation and Configuration for React Native Windows 0.63.6 version and above
-
-#### Plugin Installation (Windows-npx)
+### Plugin Installation (Windows-npx)
 
 Once the plugin has been downloaded, run `npx react-native autolink-windows` in your application's root directory to automatically add the CodePush c++ project to your application's windows solution file.
 
-#### Plugin Configuration (Windows)
+### Plugin Configuration (Windows)
 
 1. Replace the following files located at `windows/<app name>` with those in the CodePushDemoAppCpp example app in this repo found at `Examples/CodePushDemoAppCpp/windows/CodePushDemoAppCpp`:
    1. app.h
@@ -17,7 +15,7 @@ Once the plugin has been downloaded, run `npx react-native autolink-windows` in
 
 2. In the above files, replace any occurance of `CodePushDemoAppCpp` with the name of your application
 
-3. Enter your application's app version and deployment key to the `configMap` object at the top of your app's `OnLaunched` method in `App.cpp`:
+3. Enter your application's app version and release channel public ID to the `configMap` object at the top of your app's `OnLaunched` method in `App.cpp`:
 
 ```c++
 ...
@@ -26,18 +24,18 @@ void App::OnLaunched(activation::LaunchActivatedEventArgs const& e)
     winrt::Microsoft::CodePush::ReactNative::CodePushConfig::SetHost(Host());
     auto configMap{ winrt::single_threaded_map<hstring, hstring>() };
     configMap.Insert(L"appVersion", L"1.0.0");
-    configMap.Insert(L"deploymentKey", L"<app deployment key>");
+    configMap.Insert(L"releaseChannelPublicId", L"<app release channel public id>");
     winrt::Microsoft::CodePush::ReactNative::CodePushConfig::Init(configMap);
 ...
 }
 ...
 ```
 
-#### Plugin Configuration (Windows) C#
+### Plugin Configuration (Windows) C#
 
 1. add name space `Microsoft.CodePush` to `App.xaml.cs`
 
-2. add app version and deployment key to `configMap` at the start of your app's `OnLaunched` method in `App.xaml.cs`.
+2. add app version and release channel public ID to `configMap` at the start of your app's `OnLaunched` method in `App.xaml.cs`.
 
 ```c#
 using Microsoft.CodePush;
@@ -48,74 +46,9 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
     Microsoft.CodePush.ReactNative.CodePushConfig.SetHost(Host);
     IDictionary<string, string> configMap = new Dictionary<string, string>();
     configMap.Add("appVersion", "1.0.0");
-    configMap.Add("deploymentKey", "deployment key");
+    configMap.Add("releaseChannelPublicId", "release channel public id");
     Microsoft.CodePush.ReactNative.CodePushConfig.Init(configMap);
 ...
 }
 ...
 ```
-
-
-### Plugin Installation and Configuration for React Native Windows lower than 0.60
-
-#### Plugin Installation (Windows)
-
-1. Open the Visual Studio solution located at `windows-legacy\<AppName>\<AppName>.sln` within your app
-
-2. Right-click the solution node in the `Solution Explorer` window and select the `Add -> Existing Project...` menu item
-
-   ![Add Project](https://cloud.githubusercontent.com/assets/116461/14467164/ddf6312e-008e-11e6-8a10-44a8b44b5dfc.PNG)
-
-3. Browse to the `node_modules\react-native-code-push\windows` directory, select the `CodePush.csproj` file and click `OK`
-
-4. Back in the `Solution Explorer`, right-click the project node that is named after your app, and select the `Add -> Reference...` menu item
-
-   ![Add Reference](https://cloud.githubusercontent.com/assets/116461/14467154/d833bc98-008e-11e6-8e95-09864b1f05ef.PNG)
-
-5. Select the `Projects` tab on the left hand side, check the `CodePush` item and then click `OK`
-
-   ![Add Reference Dialog](https://cloud.githubusercontent.com/assets/116461/14467147/cb805b6e-008e-11e6-964f-f856c59b65af.PNG)
-
-#### Plugin Configuration (Windows)
-
-After installing the plugin, you need to configure your app to consult CodePush for the location of your JS bundle, since it will "take control" of managing the current and all future versions. To do this, update the `MainReactNativeHost.cs` file to use CodePush via the following changes:
-
-```c#
-...
-// 1. Import the CodePush namespace
-using CodePush.ReactNative;
-...
-class MainReactNativeHost : ReactNativeHost
-{
-    // 2. Declare a private instance variable for the CodePushModule instance.
-    private CodePushReactPackage codePushReactPackage;
-
-    // 3. Update the JavaScriptBundleFile property to initalize the CodePush runtime,
-    // specifying the right deployment key, then use it to return the bundle URL from
-    // CodePush instead of statically from the binary. If you don't already have your
-    // deployment key, you can run "appcenter codepush deployment list -a <ownerName>/<appName> -k" to retrieve it.
-    protected override string JavaScriptBundleFile
-    {
-        get
-        {
-            codePushReactPackage = new CodePushReactPackage("deployment-key-here", this);
-            return codePushReactPackage.GetJavaScriptBundleFile();
-        }
-    }
-
-    // 4. Add the codePushReactPackage instance to the list of existing packages.
-    protected override List<IReactPackage> Packages
-    {
-        get
-        {
-            return new List<IReactPackage>
-            {
-                new MainReactPackage(),
-                ...
-                codePushReactPackage
-            };
-        }
-    }
-    ...
-}
-```

package/ios/CodePush/CodePush.h

@@ -51,10 +51,10 @@
 
 /*
  * This method allows dynamically setting the app's
- * deployment key, in addition to setting it via
- * the Info.plist file's CodePushDeploymentKey setting.
+ * release channel public ID, in addition to setting it via
+ * the Info.plist file's CodePushReleaseChannelPublicId setting.
  */
-+ (void)setDeploymentKey:(NSString *)deploymentKey;
++ (void)setReleaseChannelPublicId:(NSString *)releaseChannelPublicId;
 
 /*
  * This method checks to see whether a specific package hash
@@ -100,7 +100,7 @@
 @property (copy) NSString *appVersion;
 @property (readonly) NSString *buildVersion;
 @property (readonly) NSDictionary *configuration;
-@property (copy) NSString *deploymentKey;
+@property (copy) NSString *releaseChannelPublicId;
 @property (copy) NSString *serverURL;
 @property (copy) NSString *publicKey;
 

package/ios/CodePush/CodePush.m

@@ -5,6 +5,7 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
+#import <React/RCTReloadCommand.h>
 #else // back compatibility for RN version < 0.40
 #import "RCTAssert.h"
 #import "RCTBridgeModule.h"
@@ -31,7 +32,7 @@
     long long _latestExpectedContentLength;
     long long _latestReceivedConentLength;
     BOOL _didUpdateProgress;
-    
+
     BOOL _allowed;
     BOOL _restartInProgress;
     NSMutableArray *_restartQueue;
@@ -214,9 +215,9 @@ static NSString *const LatestRollbackCountKey = @"count";
     [CodePushConfig current].appVersion = appVersion;
 }
 
-+ (void)setDeploymentKey:(NSString *)deploymentKey
++ (void)setReleaseChannelPublicId:(NSString *)releaseChannelPublicId
 {
-    [CodePushConfig current].deploymentKey = deploymentKey;
+    [CodePushConfig current].releaseChannelPublicId = releaseChannelPublicId;
 }
 
 /*
@@ -376,7 +377,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     _allowed = YES;
     _restartInProgress = NO;
     _restartQueue = [NSMutableArray arrayWithCapacity:1];
-    
+
     self = [super init];
     if (self) {
         [self initializeUpdateAfterRestart];
@@ -540,7 +541,7 @@ static NSString *const LatestRollbackCountKey = @"count";
             [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
         }
 
-        [super.bridge reload];
+        RCTTriggerReloadCommandListeners(@"react-native-code-push: Restart");
     });
 }
 
@@ -582,7 +583,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     if ([[self class] isFailedHash:[failedPackage objectForKey:PackageHashKey]]) {
         return;
     }
-    
+
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
     if (failedUpdates == nil) {
@@ -800,7 +801,7 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
  * This is the native side of the CodePush.getConfiguration method. It isn't
  * currently exposed via the "react-native-code-push" module, and is used
  * internally only by the CodePush.checkForUpdate method in order to get the
- * app version, as well as the deployment key that was configured in the Info.plist file.
+ * app version, as well as the release channel public ID that was configured in the Info.plist file.
  */
 RCT_EXPORT_METHOD(getConfiguration:(RCTPromiseResolveBlock)resolve
                           rejecter:(RCTPromiseRejectBlock)reject)
@@ -913,7 +914,7 @@ RCT_EXPORT_METHOD(installUpdate:(NSDictionary*)updatePackage
                                                          selector:@selector(applicationDidBecomeActive)
                                                              name:UIApplicationDidBecomeActiveNotification
                                                            object:RCTSharedApplication()];
-                                                           
+
                 [[NSNotificationCenter defaultCenter] addObserver:self
                                                          selector:@selector(applicationWillEnterForeground)
                                                              name:UIApplicationWillEnterForegroundNotification
@@ -1032,7 +1033,7 @@ RCT_EXPORT_METHOD(restartApp:(BOOL)onlyIfUpdateIsPending
 
 /*
  * This method clears CodePush's downloaded updates.
- * It is needed to switch to a different deployment if the current deployment is more recent.
+ * It is needed to switch to a different release channel if the current release channel is more recent.
  * Note: we don’t recommend to use this method in scenarios other than that (CodePush will call this method
  * automatically when needed in other cases) as it could lead to unpredictable behavior.
  */

package/ios/CodePush/CodePushConfig.m

@@ -10,7 +10,7 @@ static CodePushConfig *_currentConfig;
 static NSString * const AppVersionConfigKey = @"appVersion";
 static NSString * const BuildVersionConfigKey = @"buildVersion";
 static NSString * const ClientUniqueIDConfigKey = @"clientUniqueId";
-static NSString * const DeploymentKeyConfigKey = @"deploymentKey";
+static NSString * const ReleaseChannelPublicIDConfigKey = @"releaseChannelPublicId";
 static NSString * const ServerURLConfigKey = @"serverUrl";
 static NSString * const PublicKeyKey = @"publicKey";
 
@@ -33,10 +33,10 @@ static NSString * const PublicKeyKey = @"publicKey";
 
     NSString *appVersion = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
     NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
-    NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
+    NSString *releaseChannelPublicId = [infoDictionary objectForKey:@"CodePushReleaseChannelPublicId"];
     NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"];
-    NSString *publicKey = [infoDictionary objectForKey:@"CodePushPublicKey"];
-    
+    NSString *publicKey = [infoDictionary objectForKey:@"CodePushSigningPublicKey"];
+
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSString *clientUniqueId = [userDefaults stringForKey:ClientUniqueIDConfigKey];
     if (clientUniqueId == nil) {
@@ -55,8 +55,11 @@ static NSString * const PublicKeyKey = @"publicKey";
     if (buildVersion) [_configDictionary setObject:buildVersion forKey:BuildVersionConfigKey];
     if (serverURL) [_configDictionary setObject:serverURL forKey:ServerURLConfigKey];
     if (clientUniqueId) [_configDictionary setObject:clientUniqueId forKey:ClientUniqueIDConfigKey];
-    if (deploymentKey) [_configDictionary setObject:deploymentKey forKey:DeploymentKeyConfigKey];
-    if (publicKey) [_configDictionary setObject:publicKey forKey:PublicKeyKey];
+    if (releaseChannelPublicId) [_configDictionary setObject:releaseChannelPublicId forKey:ReleaseChannelPublicIDConfigKey];
+    if (publicKey) {
+        CPLog(@"Executing CodePush with a signing public key.");
+        [_configDictionary setObject:publicKey forKey:PublicKeyKey];
+    }
 
     return self;
 }
@@ -76,9 +79,9 @@ static NSString * const PublicKeyKey = @"publicKey";
     return _configDictionary;
 }
 
-- (NSString *)deploymentKey
+- (NSString *)releaseChannelPublicId
 {
-    return [_configDictionary objectForKey:DeploymentKeyConfigKey];
+    return [_configDictionary objectForKey:ReleaseChannelPublicIDConfigKey];
 }
 
 - (NSString *)serverURL
@@ -101,9 +104,9 @@ static NSString * const PublicKeyKey = @"publicKey";
     [_configDictionary setValue:appVersion forKey:AppVersionConfigKey];
 }
 
-- (void)setDeploymentKey:(NSString *)deploymentKey
+- (void)setReleaseChannelPublicId:(NSString *)releaseChannelPublicId
 {
-    [_configDictionary setValue:deploymentKey forKey:DeploymentKeyConfigKey];
+    [_configDictionary setValue:releaseChannelPublicId forKey:ReleaseChannelPublicIDConfigKey];
 }
 
 - (void)setServerURL:(NSString *)serverURL
@@ -111,6 +114,6 @@ static NSString * const PublicKeyKey = @"publicKey";
     [_configDictionary setValue:serverURL forKey:ServerURLConfigKey];
 }
 
-//no setter for PublicKey, because it's need to be hard coded within Info.plist for safety
+//no setter for SigningPublicKey, because it's need to be hard coded within Info.plist for safety
 
 @end