Merge branch 'master' into greenkeeper/prettier-1.4.2

* master:
  restart the app with react-native-restart
  add react-native-restart to xcode
  add react-native-restart to gradle
  add react-native-restart to package.json
  only install codepush for deploy builds
  remove moniker from settings
  remove the setting of "allaboutolaf" in ios builds
  remove the setting of "allaboutolaf" in android builds
  remove "allaboutolaf" key from package.json
  change where version comes from
  remove newline
  remove indent
  Remove codepush entirely

Author: hawkrives

android/app/build.gradle

@@ -71,7 +71,6 @@ project.ext.react = [
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
-apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -185,7 +184,6 @@ if (propFile.canRead()) {
 dependencies {
     // please keep this list sorted
     compile project(':bugsnag-react-native')
-    compile project(':react-native-code-push')
     compile project(':react-native-custom-tabs')
     compile project(':react-native-device-info')
     compile project(':react-native-google-analytics-bridge')
@@ -194,6 +192,7 @@ dependencies {
     compile project(':react-native-maps')
     compile project(':react-native-network-info')
     compile project(':react-native-onesignal')
+    compile project(':react-native-restart')
     compile project(':react-native-vector-icons')
     compile project(':react-native-view-shot')
     // this is for react-native itself

android/app/src/main/java/com/allaboutolaf/MainApplication.java

@@ -7,6 +7,7 @@
 
 // keep these sorted alphabetically
 import com.airbnb.android.react.maps.MapsPackage;
+import com.avishayil.rnrestart.ReactNativeRestartPackage;
 import com.bugsnag.BugsnagReactNative;
 import com.BV.LinearGradient.LinearGradientPackage;
 import com.facebook.react.ReactApplication;
@@ -19,7 +20,6 @@
 import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
 import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
 import com.learnium.RNDeviceInfo.RNDeviceInfo;
-import com.microsoft.codepush.react.CodePush;
 import com.oblador.keychain.KeychainPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.pusherman.networkinfo.RNNetworkInfoPackage;
@@ -33,11 +33,6 @@
 public class MainApplication extends Application implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    protected String getJSBundleFile() {
-      return CodePush.getJSBundleFile();
-    }
-
     @Override
     public boolean getUseDeveloperSupport() {
       return BuildConfig.DEBUG;
@@ -49,13 +44,13 @@ protected List<ReactPackage> getPackages() {
         new MainReactPackage(),
         // please keep these sorted alphabetically
         BugsnagReactNative.getPackage(),
-        new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG),
         new CustomTabsPackage(),
         new GoogleAnalyticsBridgePackage(),
         new KeychainPackage(),
         new LinearGradientPackage(),
         new MapsPackage(),
         new ReactNativeOneSignalPackage(),
+        new ReactNativeRestartPackage(),
         new RNDeviceInfo(),
         new RNNetworkInfoPackage(),
         new RNViewShotPackage(),

android/app/src/main/res/values/strings.xml

@@ -1,4 +1,3 @@
 <resources>
-    <string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey">5jvlQ5-xBItoSRqf-D-3hqdEsPTLEJN_nzUOz</string>
     <string name="app_name">All About Olaf</string>
 </resources>

android/settings.gradle

@@ -5,9 +5,6 @@ include ':app'
 include ':bugsnag-react-native'
 project(':bugsnag-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/bugsnag-react-native/android')
 
-include ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
-
 include ':react-native-custom-tabs'
 project(':react-native-custom-tabs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-custom-tabs/android')
 
@@ -32,6 +29,9 @@ project(':react-native-network-info').projectDir = new File(rootProject.projectD
 include ':react-native-onesignal'
 project(':react-native-onesignal').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-onesignal/android')
 
+include ':react-native-restart'
+project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
+
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 

fastlane/README.md

@@ -78,11 +78,6 @@ Run the appropriate action on CI
 fastlane android set_version
 ```
 Include the build number in the version string
-### android codepush
-```
-fastlane android codepush
-```
-
 ### android matchesque
 ```
 fastlane android matchesque
@@ -122,11 +117,6 @@ Upload dYSM symbols to Bugsnag from Apple
 fastlane ios ci-run
 ```
 Run iOS builds or tests, as appropriate
-### ios codepush
-```
-fastlane ios codepush
-```
-
 ### ios set_version
 ```
 fastlane ios set_version

fastlane/lib/util.rb

@@ -68,11 +68,3 @@ def auto_beta
 
   beta #if last_commit != current_commit
 end
-
-def codepush_cli(app:, channel: 'nightly', install_target: '~2.3 || ~2.3.0-beta')
-  target = "--targetBinaryVersion '#{install_target}'"
-  # `fastlane x` runs in the ./fastlane folder, so we have to go up a level
-  Dir.chdir("..") do
-    sh("code-push release-react '#{app}' ios -d '#{channel}' #{target}")
-  end
-end

fastlane/platforms/android.rb

@@ -8,7 +8,7 @@
            build_type: 'Release',
            print_command: true,
            print_command_output: true)
-    
+
     UI.message lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS]
   end
 
@@ -31,18 +31,10 @@
     # set the app version
     set_version
 
-    # set where this build came from
-    set_package_data(data: {
-      allaboutolaf: {
-        source: 'beta',
-      },
-    })
-
     # and run
     should_deploy = ENV['run_deploy'] == '1'
     if should_deploy
       auto_beta
-      codepush
     else
       build
     end
@@ -56,10 +48,6 @@
     set_package_data(data: { version: "#{version}" })
   end
 
-  lane :codepush do
-    codepush_cli(app: 'AllAboutOlaf-Android')
-  end
-
   desc 'extract the android keys from the match repo'
   lane :matchesque do
     match_dir = clone_match

fastlane/platforms/ios.rb

@@ -44,27 +44,15 @@
     # set the app version
     set_version
 
-    # set where this build came from
-    set_package_data(data: {
-      allaboutolaf: {
-        source: 'beta',
-      },
-    })
-
     # and run
     should_deploy = ENV['run_deploy'] == '1'
     if should_deploy
       auto_beta
-      codepush
     else
       build
     end
   end
 
-  lane :codepush do
-    codepush_cli(app: 'AllAboutOlaf-iOS')
-  end
-
   desc 'Include the build number in the version string'
   lane :set_version do |options|
     version = options[:version] || current_bundle_version
@@ -84,7 +72,7 @@
     create_keychain(name: keychain,
                     password: password,
                     timeout: 3600)
-    
+
     # Set up code signing correctly
     # (more information: https://codesigning.guide)
     match(type: 'appstore', readonly: true)