From fa30ae31ff0c6653fdac2e6e1a71732ffa7de082 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Wed, 16 Mar 2016 10:44:17 -0700 Subject: [PATCH 1/4] Adding RNPM/Android doc --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e7cb9aa..5d28e2c 100644 --- a/README.md +++ b/README.md @@ -282,7 +282,7 @@ After installing the plugin and syncing your Android Studio project with Gradle, ... } ``` - + ### Plugin Configuration (Android - React Native v0.18.0+) *NOTE: These instructions are specific to apps that are using React Native v0.18.0+. If you are using v0.15.0-v0.17.0, then refer to the previous section.* @@ -324,6 +324,27 @@ After installing the plugin and syncing your Android Studio project with Gradle, ... } ``` + +3. If you used RNPM to install/link the CodePush plugin, there are a two additional changes you'll need to make due to the fact thsat RNPM makes some assupmtions about the CodePush plugin that aren't currently true. Otherwise, skip to step #3: + + ```java + ... + // 1. Remove the following import statement + import com.microsoft.codepush.react.CodePushReactPackage; + ... + public class MainActivity extends ReactActivity { + ... + @Override + protected List getPackages() { + return Arrays.asList( + ... + new CodePushReactPackage() // 2. Remove this line + ... + ); + } + ... + } + ``` 2. Ensure that the `android.defaultConfig.versionName` property in your `android/app/build.gradle` file is set to a semver compliant value. Note that if the value provided is missing a patch version, the CodePush server will assume it is `0`, i.e. `1.0` will be treated as `1.0.0`. From 6b72563e2d11c35649d37de7d772917eb39197a7 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Wed, 16 Mar 2016 10:44:56 -0700 Subject: [PATCH 2/4] Fixing number --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d28e2c..dbad2ab 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ After installing the plugin and syncing your Android Studio project with Gradle, } ``` -3. If you used RNPM to install/link the CodePush plugin, there are a two additional changes you'll need to make due to the fact thsat RNPM makes some assupmtions about the CodePush plugin that aren't currently true. Otherwise, skip to step #3: +2. If you used RNPM to install/link the CodePush plugin, there are a two additional changes you'll need to make due to the fact thsat RNPM makes some assupmtions about the CodePush plugin that aren't currently true. Otherwise, skip to step #3: ```java ... @@ -346,7 +346,7 @@ After installing the plugin and syncing your Android Studio project with Gradle, } ``` -2. Ensure that the `android.defaultConfig.versionName` property in your `android/app/build.gradle` file is set to a semver compliant value. Note that if the value provided is missing a patch version, the CodePush server will assume it is `0`, i.e. `1.0` will be treated as `1.0.0`. +3. Ensure that the `android.defaultConfig.versionName` property in your `android/app/build.gradle` file is set to a semver compliant value. Note that if the value provided is missing a patch version, the CodePush server will assume it is `0`, i.e. `1.0` will be treated as `1.0.0`. ```gradle android { From fb8ec76b5a9fbec9426522cddfb9bee7308b9d66 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Wed, 16 Mar 2016 10:48:14 -0700 Subject: [PATCH 3/4] Fixing typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dbad2ab..8b6e08f 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ After installing the plugin and syncing your Android Studio project with Gradle, } ``` -2. If you used RNPM to install/link the CodePush plugin, there are a two additional changes you'll need to make due to the fact thsat RNPM makes some assupmtions about the CodePush plugin that aren't currently true. Otherwise, skip to step #3: +2. If you used RNPM to install/link the CodePush plugin, there are two additional changes you'll need to make due to the fact that RNPM makes some assumptions about the CodePush plugin that we don't currently support. If you're not using RNPM then simply skip to step #3: ```java ... From f04feadf6efdd464a6af6c7a0076d8042628af3c Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Wed, 16 Mar 2016 10:49:46 -0700 Subject: [PATCH 4/4] Verbiage tweak --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b6e08f..37b72a6 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ After installing the plugin and syncing your Android Studio project with Gradle, } ``` -2. If you used RNPM to install/link the CodePush plugin, there are two additional changes you'll need to make due to the fact that RNPM makes some assumptions about the CodePush plugin that we don't currently support. If you're not using RNPM then simply skip to step #3: +2. If you used RNPM to install/link the CodePush plugin, there are two additional changes you'll need to make due to the fact that RNPM makes some assumptions about 3rd party modules that we don't currently support. If you're not using RNPM then simply skip to step #3: ```java ...