Fix bundling issue, update versions, add launch options (#11)

Petter Hesselberg · web-flow · commit 34ddd7e600a2 · 2019-06-11T10:19:57.000+01:00
Fix the bundling issue by adding intermediate assets folder to source set
Pass launch options to display build type (debug/release)
Update to React Native 0.59.0; add 64-bit support
Read "bundle in debug" from gradle.properties
Generate BuildConfig.USE_DEVELOPER_SUPPORT
Improve documentation
Additional nullability annotations
diff --git a/README.md b/README.md
@@ -53,9 +53,7 @@ The `TextInput` box appears only in the Android version. Since both platforms us
 * If it complains about connecting to the dev server, run `adb reverse tcp:8081 tcp:8081`
 * If it crashes while opening the ReactNative controls, try to modify the following phone settings:
 **Android Settings -> Apps -> Settings once again (the gear) to go to Configure Apps view -> Draw over other apps -> Allow React Native Android Activity Demo to draw over other apps**. (The demo app *should* ask for this automatically, though.)
-* To embed the bundle in the apk (and not have to run the packager), do two changes:
-  * In `MainApplication`, make `getUseDeveloperSupport` return `false`.
-  * In `app/build.gradle`, set `bundleInDebug: true`.
+* To embed the bundle in the apk (and not have to run the packager), set `bundleInDebug=true` in `android/gradle.properties`.
 
 ### iOS
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -14,67 +14,72 @@ import com.android.build.OutputFile
  * as expected, because the following workaround doesn't apply in that case:
  * https://github.com/facebook/react-native/pull/21408
  */
+
+def bundleInDebug = hasProperty("bundleInDebug") && Boolean.valueOf(property("bundleInDebug"))
+def useDevSupport = !bundleInDebug
+
 project.ext.react = [
-  // The name of the generated asset file containing your JS bundle
-  // bundleAssetName: "index.android.bundle",
+        // The name of the generated asset file containing your JS bundle
+        // bundleAssetName: "index.android.bundle",
 
-  // The entry file for bundle generation
-  // entryFile: "index.android.js",
+        // The entry file for bundle generation
+        // entryFile: "index.android.js",
 
-  // Whether to bundle JS and assets in debug mode. Set this to false if you want to load
-  // JavaScript from a bundler, true if you want to embed the bundle in the apk.
-  bundleInDebug: false,
+        // Whether to bundle JS and assets in debug mode. Set this to false if you want to load
+        // JavaScript from a bundler, true if you want to embed the bundle in the apk.
+        // Do not change it here; change the property value in gradle.properties instead.
+        bundleInDebug  : bundleInDebug,
 
-  // Whether to bundle JS and assets in release mode
-  bundleInRelease: true,
+        // Whether to bundle JS and assets in release mode
+        bundleInRelease: true,
 
-  // Whether to bundle JS and assets in another build variant (if configured).
-  // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
-  // The configuration property can be in the following formats
-  //         'bundleIn${productFlavor}${buildType}'
-  //         'bundleIn${buildType}'
-  // bundleInFreeDebug: true,
-  // bundleInPaidRelease: true,
-  // bundleInBeta: true,
+        // Whether to bundle JS and assets in another build variant (if configured).
+        // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+        // The configuration property can be in the following formats
+        //         'bundleIn${productFlavor}${buildType}'
+        //         'bundleIn${buildType}'
+        // bundleInBeta: true,
 
-  // The root of your project, i.e. where "package.json" lives
-  // root: "../../",
+        // The root of your project, i.e. where "package.json" lives
+        // root: "../../",
 
-  // Where to put the JS bundle asset in debug mode
-  // jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+        // Where to put the JS bundle asset in debug mode
+        // jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
 
-  // Where to put the JS bundle asset in release mode
-  // jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+        // Where to put the JS bundle asset in release mode
+        // jsBundleDirRelease: "$buildDir/intermediates/assets/release",
 
-  // Where to put drawable resources / React Native assets, e.g. the ones you use via
-  // require('./image.png')), in debug mode
-  // resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+        // Where to put drawable resources / React Native assets, e.g. the ones you use via
+        // require('./image.png')), in debug mode
+        // resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
 
-  // Where to put drawable resources / React Native assets, e.g. the ones you use via
-  // require('./image.png')), in release mode
-  // resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+        // Where to put drawable resources / React Native assets, e.g. the ones you use via
+        // require('./image.png')), in release mode
+        // resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
 
-  // By default the gradle tasks are skipped if none of the JS files or assets change; this means
-  // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
-  // date; if you have any other folders that you want to ignore for performance reasons (gradle
-  // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
-  // for example, you might want to remove it from here.
-  // inputExcludes: ["android/**", "ios/**"],
+        // By default the gradle tasks are skipped if none of the JS files or assets change; this means
+        // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+        // date; if you have any other folders that you want to ignore for performance reasons (gradle
+        // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+        // for example, you might want to remove it from here.
+        // inputExcludes: ["android/**", "ios/**"],
 
-  // Override which node gets called and with what additional arguments
-  // nodeExecutableAndArgs: ["node"],
+        // Override which node gets called and with what additional arguments
+        // nodeExecutableAndArgs: ["node"],
 
-  // Supply additional arguments to the packager
-  // extraPackagerArgs: []
+        // Supply additional arguments to the packager
+        // extraPackagerArgs: []
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
 
 /**
- * Set this to true to create two separate APKs instead of one:
- *   - An APK that only works on ARM devices
- *   - An APK that only works on x86 devices
- * The advantage is the size of the APK is reduced by about 4MB.
+ * Set this to true to create separate APKs instead of one:
+ *   - An APK that only works on 32-bit ARM devices
+ *   - An APK that only works on 64-bit ARM devices
+ *   - An APK that only works on 32-bit x86 devices
+ *   - An APK that only works on 64-bit x86 devices
+ * This reduces the size of the APK.
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
@@ -89,13 +94,14 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        applicationId "com.demo.activity"
+        applicationId 'com.demo.activity'
         minSdkVersion 23
+        compileSdkVersion 28
         targetSdkVersion 28
-        versionCode 4
-        versionName "2.2"
+        versionCode 5
+        versionName "5.0"
         ndk {
-            abiFilters 'armeabi-v7a', 'x86'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 
@@ -104,14 +110,18 @@ android {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include 'armeabi-v7a', 'x86'
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 
     buildTypes {
+        debug {
+            buildConfigField 'boolean', 'USE_DEVELOPER_SUPPORT', "$useDevSupport"
+        }
         release {
             minifyEnabled enableProguardInReleaseBuilds
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField 'boolean', 'USE_DEVELOPER_SUPPORT', 'false'
         }
     }
 
@@ -120,20 +130,34 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2]
+            def versionCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
                         versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
         }
     }
+
+    // This is necessary to include the JavaScript bundle in the APK:
+    sourceSets {
+        main {
+            debug {
+                if (bundleInDebug) {
+                    assets.srcDirs += "$buildDir/intermediates/assets/debug"
+                }
+            }
+            release {
+                assets.srcDirs += "$buildDir/intermediates/assets/release"
+            }
+        }
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation('com.facebook.react:react-native:0.58.6') {
+    implementation('com.facebook.react:react-native:0.59.9') {
         exclude group: 'com.android.support'
     }
 }
diff --git a/android/app/src/main/java/com/demo/activity/ActivityStarterReactPackage.java b/android/app/src/main/java/com/demo/activity/ActivityStarterReactPackage.java
@@ -1,5 +1,7 @@
 package com.demo.activity;
 
+import android.support.annotation.NonNull;
+
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -15,16 +17,18 @@
  */
 final class ActivityStarterReactPackage implements ReactPackage {
 
+    @NonNull
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new ActivityStarterModule(reactContext));
         modules.add(new EventEmitterModule(reactContext));
         return modules;
     }
 
+    @NonNull
     @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
         return Collections.emptyList();
     }
 }
diff --git a/android/app/src/main/java/com/demo/activity/MainActivity.java b/android/app/src/main/java/com/demo/activity/MainActivity.java
@@ -8,6 +8,7 @@
 import android.widget.Toast;
 
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
@@ -23,16 +24,33 @@ public final class MainActivity extends ReactActivity {
     /**
      * Returns the name of the main component registered from JavaScript.
      * This is used to schedule rendering of the component.
+     * Because this class overrides {@link #createReactActivityDelegate()}, we don't really need
+     * to override this.
      */
     @Override
-    @Nullable
     protected String getMainComponentName() {
         return "ActivityDemoComponent";
     }
 
+    /**
+     * We override to provide launch options that we can read in JavaScript (see buildType).
+     */
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+            @Override
+            protected Bundle getLaunchOptions() {
+                Bundle launchOptions = new Bundle();
+                launchOptions.putString("buildType", BuildConfig.BUILD_TYPE);
+                return launchOptions;
+            }
+        };
+    }
+
     /**
      * Demonstrates how to add a custom option to the dev menu.
      * https://stackoverflow.com/a/44882371/3968276
+     * This only works from the debug build with dev options enabled.
      */
     @Override
     @CallSuper
diff --git a/android/app/src/main/java/com/demo/activity/MainApplication.java b/android/app/src/main/java/com/demo/activity/MainApplication.java
@@ -13,12 +13,15 @@
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * Base class for maintaining global application state -- in this case, the {@link ReactNativeHost}.
+ */
 public final class MainApplication extends Application implements ReactApplication {
 
     private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
-            return BuildConfig.DEBUG;
+            return BuildConfig.USE_DEVELOPER_SUPPORT;
         }
 
         @Override
@@ -30,12 +33,21 @@ protected List<ReactPackage> getPackages() {
         }
     };
 
+    /**
+     * Get the {@link ReactNativeHost} for this app.
+     */
     @Override
     @NonNull
     public ReactNativeHost getReactNativeHost() {
         return mReactNativeHost;
     }
 
+    /**
+     * Called when the application is starting, before any activity, service,
+     * or receiver objects (excluding content providers) have been created.
+     *
+     * <p>This implementation loads the React Native JNI libraries.</p>
+     */
     @Override
     @CallSuper
     public void onCreate() {
diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -19,3 +19,5 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 
 android.useDeprecatedNdk=true
 android.debug.obsoleteApi=true
+
+bundleInDebug=true
diff --git a/index.android.js b/index.android.js
@@ -51,7 +51,7 @@ export default class ActivityDemoComponent extends Component {
     return (
       <View style={styles.container}>
         <Text style={styles.welcome}>
-          Welcome to React Native!
+          Welcome to React Native ({this.props.buildType})!
         </Text>
         <Text style={styles.instructions}>
           <Text>To get started, edit </Text>
diff --git a/package.json b/package.json
@@ -1,17 +1,21 @@
 {
     "name": "activity",
-    "version": "0.0.4",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/petterh/react-native-android-activity.git"
+      },
+    "version": "5.0.0",
     "private": true,
     "scripts": {
         "start": "node node_modules/react-native/local-cli/cli.js start"
     },
     "dependencies": {
-        "react": "^16.8.3",
-        "react-native": "^0.58.6"
+        "react": "^16.8.6",
+        "react-native": "^0.59.9"
     },
     "devDependencies": {
-        "babel-loader": "7.1.4",
+        "babel-loader": "8.0.6",
         "babel-plugin-transform-runtime": "6.23.0",
-        "metro-react-native-babel-preset": "^0.45.0"
+        "metro-react-native-babel-preset": "^0.54.1"
     }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.4.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.4.1'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`