Merge branch 'master' into bsneed/context-fixes

Author: Brandon Sneed

.circleci/config.yml

@@ -93,7 +93,7 @@ jobs:
   test-ios-vanilla:
     <<: *job
     macos:
-      xcode: "9.4.0"
+      xcode: '10.0.0'
     steps:
       - checkout
       # macOS VMs doesn't support Docker based caches
@@ -108,7 +108,7 @@ jobs:
   test-ios-cocoapods:
     <<: *job
     macos:
-      xcode: "9.4.0"
+      xcode: '10.0.0'
     steps:
       - checkout
       # macOS VMs doesn't support Docker based caches
@@ -171,19 +171,19 @@ workflows:
               only: /.*/
       - test-android:
           requires:
-            -  build-test-app
+            - build-test-app
           filters:
             tags:
               only: /.*/
       - test-ios-vanilla:
           requires:
-            -  build-test-app
+            - build-test-app
           filters:
             tags:
               only: /.*/
       - test-ios-cocoapods:
           requires:
-            -  build-test-app
+            - build-test-app
           filters:
             tags:
               only: /.*/

CONTRIBUTING.md

@@ -49,6 +49,59 @@ $ yarn
 $ yarn test
 ```
 
+### End-to-end testing
+
+End-to-end testing is done using [Detox](https://github.com/wix/Detox).
+
+These tests are primarily built to be run on CI. The following instructions describe how to run them locally.
+
+Tested on Mac only.
+
+#### iOS
+
+First, install your dependencies as described in [Step 1: Install dependencies](https://github.com/wix/Detox/blob/master/docs/Introduction.GettingStarted.md#step-1-install-dependencies).
+
+```bash
+yarn # install project dependencies
+yarn build # build project and integrations
+cd packages/test-app
+yarn test:ios:cocoapods # or test:ios:vanilla
+```
+
+For subsequent runs, you may need to do `rm -rf project && ./generate.sh` before running the test command.
+
+### Android
+
+Set up an Android emulator locally. The easiest way to do this is to install and launch Android Studio, and [manage your virtual devices](https://developer.android.com/studio/run/managing-avds) through the UI.
+
+Check you have at least one emulator installed with `emulator -list-avds`. Now open `./packages/test-app/package.json` and ensure that the `name` under `"android.emu.release"` is one of the emulators in your list (change it if not, but do not commit this change).
+
+```bash
+yarn # install project dependencies
+yarn build # build project and integrations
+cd packages/test-app
+SEGMENT_WRITE_TOKEN=test yarn test:android
+```
+
+**Note:** A non-empty value of SEGMENT_WRITE_TOKEN is required for Android (but not iOS), because the native library will do a not null check for it and your application will crash.
+
+**Note:** you can also run the emulator in debug mode, but you'll have to start the packager manually. Assuming you've already installed dependencies and built the project:
+
+Build the android project and start the packager:
+
+```bash
+cd packages/test-app
+SEGMENT_WRITE_TOKEN=test detox build -c android.emu.debug
+cd project
+yarn start
+```
+
+In a new terminal window, run:
+
+```bash
+detox test -c android.emu.debug
+```
+
 ### Architecture
 
 - `packages/core`: the `@segment/analytics-react-native` module

README.md

@@ -166,10 +166,9 @@ await analytics.setup('writeKey', {
 | [Firebase](https://www.npmjs.com/package/@segment/analytics-react-native-firebase)                           | :white_check_mark: | :white_check_mark: | `@segment/analytics-react-native-firebase`                |
 | [Flurry](https://www.npmjs.com/package/@segment/analytics-react-native-flurry)                               | :white_check_mark: | :white_check_mark: | `@segment/analytics-react-native-flurry`                  |
 | [Google Analytics](https://www.npmjs.com/package/@segment/analytics-react-native-google-analytics)           | :white_check_mark: | :white_check_mark: | `@segment/analytics-react-native-google-analytics`        |
-| [Intercom](https://www.npmjs.com/package/@segment/analytics-react-native-intercom)                           | :white_check_mark: | :white_check_mark: | `@segment/analytics-react-native-intercom`                |
+| [Intercom](https://www.npmjs.com/package/@segment/analytics-react-native-intercom-ios)                       | :white_check_mark: | :x:                | `@segment/analytics-react-native-intercom-ios`            |
 | [Localytics](https://www.npmjs.com/package/@segment/analytics-react-native-localytics)                       | :white_check_mark: | :white_check_mark: | `@segment/analytics-react-native-localytics`              |
 | [Mixpanel](https://www.npmjs.com/package/@segment/analytics-react-native-mixpanel)                           | :white_check_mark: | :white_check_mark: | `@segment/analytics-react-native-mixpanel`                |
-| [Quantcast](https://www.npmjs.com/package/@segment/analytics-react-native-quantcast-android)                 | :x:                | :white_check_mark: | `@segment/analytics-react-native-quantcast-android`       |
 | [Taplytics](https://www.npmjs.com/package/@segment/analytics-react-native-taplytics-ios)                     | :white_check_mark: | :x:                | `@segment/analytics-react-native-taplytics-ios`           |
 | [Tapstream](https://www.npmjs.com/package/@segment/analytics-react-native-tapstream-android)                 | :x:                | :white_check_mark: | `@segment/analytics-react-native-tapstream-android`       |
 

package.json

@@ -70,7 +70,7 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "react": "16.8.3",
-    "react-native": "0.59.2",
+    "react-native": "0.59.9",
     "rimraf": "^2.6.2"
   }
 }

packages/core/android/build.gradle

@@ -1,21 +1,22 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+def defaultKotlinVersion = '1.3.21'
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet("kotlinVersion", defaultKotlinVersion)}"
     }
 }
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 26)
     buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3')
@@ -41,5 +42,5 @@ dependencies {
     api 'com.segment.analytics.android:analytics:4.5.0-beta.0'
 
     api 'com.facebook.react:react-native:+'
-    api 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
+    api "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet("kotlinVersion", defaultKotlinVersion)}"
 }

packages/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt

@@ -148,6 +148,11 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
             Analytics.setSingletonInstance(
                     RNAnalytics.buildWithIntegrations(builder)
             )
+        } catch(e2: IllegalStateException) {
+            // pass if the error is due to calling setSingletonInstance multiple times
+
+            // if you created singleton in native code already,
+            // you need to promise.resolve for RN to properly operate
         } catch(e: Exception) {
             return promise.reject("E_SEGMENT_ERROR", e)
         }

packages/integrations/integrations.yml

@@ -22,11 +22,15 @@
   ios:
     # Only compatible 3.0.x
     disabled: true
+  android:
+    disabled: true
 
 - name: Intercom
   ios:
     pod:
       version: 1.0.0-beta
+  android:
+    disabled: true
 
 - name: Tapstream
   ios:

packages/integrations/src/gen-integrations.ts

@@ -69,6 +69,7 @@ async function prepareiOS({
 	const xcodeProject = 'ios/RNAnalyticsIntegration.xcodeproj'
 	const targetXcodeProject = `ios/${nativeModule}.xcodeproj`
 	const pod_name = `RNAnalyticsIntegration-${slug('-')}`
+	const framework_name = `Segment_${slug()}`
 	const {
 		pod: {
 			name: pod_dependency = `Segment-${slug()}`,
@@ -79,7 +80,7 @@ async function prepareiOS({
 	const classSlug = `${prefix}${slug()}IntegrationFactory`
 	const {
 		className = classSlug,
-		framework = pod_dependency,
+		framework = framework_name,
 		header = classSlug
 	} = ios
 

packages/integrations/template/Pod.podspec

@@ -25,4 +25,5 @@ Pod::Spec.new do |s|
   s.dependency          '{{{pod_dependency}}}'{{#pod_version}}, '~> {{{pod_version}}}'{{/pod_version}}
   s.dependency          'Analytics'
   s.dependency          'React'
+  s.dependency          'RNAnalytics'
 end

packages/integrations/template/android/build.gradle

@@ -26,6 +26,9 @@ android {
         versionName '1.0'
 
     }
+    packagingOptions {
+        pickFirst  "META-INF/*"
+    }
 }
 
 repositories {

packages/test-app/e2e/main.spec.js

@@ -14,7 +14,7 @@ it('sends events and does not crash', async () => {
 	await sleep(5 * 1000)
 })
 
-if (CIRCLE_WORKFLOW_ID) {
+if (CIRCLE_WORKFLOW_ID && E2E_TOKEN) {
 	it('sends events to the webhook', async () => {
 		await element(by.text('Launch test suite')).tap()
 		await element(by.text('Flush')).tap()

packages/test-app/package.json

@@ -12,16 +12,14 @@
     "test:ios:cocoapods": "COCOAPODS=yes ./test_ios.sh",
     "test:ios:vanilla": "COCOAPODS=no ./test_ios.sh",
     "test:android": "./test_android.sh",
-    "test": "run-s test:{ios,android}",
-    "detox:build": "detox build",
-    "detox:test": "detox test"
+    "test": "run-s test:{ios,android}"
   },
   "devDependencies": {
     "jest": "^24.5.0",
     "react-native-cli": "^2.0.1"
   },
   "dependencies": {
-    "detox": "^12.1.1",
+    "detox": "^12.11.0",
     "isomorphic-fetch": "^2.2.1"
   },
   "detox": {
@@ -41,11 +39,17 @@
         "type": "ios.simulator",
         "name": "iPhone X"
       },
-      "android": {
+      "android.emu.release": {
+        "binaryPath": "project/android/app/build/outputs/apk/release/app-release.apk",
+        "build": "cd project/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release",
+        "type": "android.emulator",
+        "name": "Nexus_5X_API_28"
+      },
+      "android.emu.debug": {
         "binaryPath": "project/android/app/build/outputs/apk/debug/app-debug.apk",
         "build": "cd project/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug",
         "type": "android.emulator",
-        "name": "Nexus_5X_API_27"
+        "name": "Nexus_5X_API_28"
       }
     }
   }

packages/test-app/seed/.gitignore

@@ -39,7 +39,6 @@ yarn-error.log
 # BUCK
 buck-out/
 \.buckd/
-*.keystore
 
 # fastlane
 #