Merge pull request #187 from Microsoft/develop

Merge develop into master

.gitignore

@@ -43,4 +43,6 @@ android/keystores/debug.keystore
 *.keystore
 *~
 
+# credentials
+.npmrc
 google-services.json

AppCenterReactNativeShared/Products/AppCenterReactNativeShared.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenterReactNativeShared'
-  s.version           = '1.0.1'
+  s.version           = '1.1.0'
   s.summary           = 'React Native plugin for Visual Studio App Center'
-  s.license           = { :type => 'MIT',  :file => 'AppCenterReactNativeShared/LICENSE' }
+  s.license           = { :type => 'MIT',  :file => 'AppCenterReactNativeShared/LICENSE.md' }
   s.homepage          = 'https://github.com/Microsoft/AppCenter-SDK-React-Native'
   s.documentation_url = "https://docs.microsoft.com/en-us/appcenter/"
 
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
 
   s.vendored_frameworks = 'AppCenterReactNativeShared/AppCenterReactNativeShared.framework'
 
-  s.dependency 'AppCenter/Core', '1.0.1'
+  s.dependency 'AppCenter/Core', '1.1.0'
 end

AppCenterReactNativeShared/android/build.gradle

@@ -32,8 +32,8 @@ allprojects {
         defaultConfig {
             minSdkVersion 16
             targetSdkVersion 22
-            versionCode 21
-            versionName "1.0.1"
+            versionCode 22
+            versionName "1.1.0"
             group groupId
             version versionName
             buildConfigField 'String', "SDK_NAME", "\"appcenter.react-native\""
@@ -110,7 +110,7 @@ allprojects {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.microsoft.appcenter:appcenter:1.0.0'
+    compile 'com.microsoft.appcenter:appcenter:1.1.0'
 }
 
 artifacts {

AppCenterReactNativeShared/ios/AppCenterReactNativeShared/AppCenterReactNativeShared.m

@@ -28,7 +28,7 @@ + (void) configureAppCenter
   if (![MSAppCenter isConfigured]) {
       MSWrapperSdk * wrapperSdk =
         [[MSWrapperSdk alloc]
-            initWithWrapperSdkVersion:@"1.0.1"
+            initWithWrapperSdkVersion:@"1.1.0"
             wrapperSdkName:@"appcenter.react-native"
             wrapperRuntimeVersion:nil
             liveUpdateReleaseLabel:nil

AppCenterReactNativeShared/zip-framework.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 cd Products
-zipfilename=AppCenter-SDK-ReactNative-iOS-Pod-1.x.x.zip
+wrapperSdkString=$(grep s.version AppCenterReactNativeShared.podspec)
+[[ ${wrapperSdkString} =~ ([0-9]+.[0-9]+.[0-9]+) ]]
+wrapperSdkVersion="${BASH_REMATCH[1]}"
+zipfilename="AppCenter-SDK-ReactNative-iOS-Pod-${wrapperSdkVersion}.zip"
 if [ -f $zipfilename ] ; then
     rm $zipfilename
     echo "  removed old zip"
 fi
-cp ../../LICENSE AppCenterReactNativeShared
+cp ../LICENSE.md AppCenterReactNativeShared
 zip -r $zipfilename AppCenterReactNativeShared
 echo "output is here: Products/$zipfilename"

BrownfieldTestApp/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["react-native"]
+}

BrownfieldTestApp/.buckconfig

@@ -0,0 +1,6 @@
+
+[android]
+  target = Google Inc.:Google APIs:23
+
+[maven_repositories]
+  central = https://repo1.maven.org/maven2

BrownfieldTestApp/.flowconfig

@@ -0,0 +1,48 @@
+[ignore]
+; We fork some components by platform
+.*/*[.]android.js
+
+; Ignore "BUCK" generated dirs
+<PROJECT_ROOT>/\.buckd/
+
+; Ignore unexpected extra "@providesModule"
+.*/node_modules/.*/node_modules/fbjs/.*
+
+; Ignore duplicate module providers
+; For RN Apps installed via npm, "Libraries" folder is inside
+; "node_modules/react-native" but in the source repo it is in the root
+.*/Libraries/react-native/React.js
+
+; Ignore polyfills
+.*/Libraries/polyfills/.*
+
+[include]
+
+[libs]
+node_modules/react-native/Libraries/react-native/react-native-interface.js
+node_modules/react-native/flow/
+
+[options]
+emoji=true
+
+module.system=haste
+
+munge_underscores=true
+
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+
+suppress_type=$FlowIssue
+suppress_type=$FlowFixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
+suppress_type=$FixMe
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
+unsafe.enable_getters_and_setters=true
+
+[version]
+^0.56.0

BrownfieldTestApp/.gitattributes

@@ -0,0 +1 @@
+*.pbxproj -text

BrownfieldTestApp/.gitignore

@@ -0,0 +1,60 @@
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+
+# node.js
+#
+node_modules/
+npm-debug.log
+
+# BUCK
+buck-out/
+\.buckd/
+android/app/libs
+*.keystore
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+
+# Source maps and debug files
+/index.ios.map
+/unused.jsbundle*
+/.vscode/.react
+
+package-lock.json

BrownfieldTestApp/.watchmanconfig

@@ -0,0 +1 @@
+{}

BrownfieldTestApp/AnalyticsScreen.js

@@ -0,0 +1,82 @@
+/**
+ * Sample React Native App
+ * https://github.com/facebook/react-native
+ * @flow
+ */
+
+import React from 'react';
+import {
+  Text,
+  View,
+  ScrollView,
+  TouchableOpacity
+} from 'react-native';
+
+import Analytics from 'appcenter-analytics';
+import SharedStyles from './SharedStyles';
+
+export default class AnalyticsScreen extends React.Component {
+  constructor() {
+    super();
+    this.state = {
+      analyticsEnabled: false
+    };
+    this.toggleEnabled = this.toggleEnabled.bind(this);
+  }
+
+  async componentDidMount() {
+    const component = this;
+
+    const analyticsEnabled = await Analytics.isEnabled();
+    component.setState({ analyticsEnabled });
+  }
+
+  async toggleEnabled() {
+    await Analytics.setEnabled(!this.state.analyticsEnabled);
+
+    const analyticsEnabled = await Analytics.isEnabled();
+    this.setState({ analyticsEnabled });
+  }
+
+  /* eslint-disable no-undef */
+  render() {
+    return (
+      <View style={SharedStyles.container}>
+        <ScrollView >
+          <Text style={SharedStyles.heading}>
+            Test Analytics
+          </Text>
+
+          <Text style={SharedStyles.enabledText}>
+            Analytics enabled: {this.state.analyticsEnabled ? 'yes' : 'no'}
+          </Text>
+          <TouchableOpacity onPress={this.toggleEnabled}>
+            <Text style={SharedStyles.toggleEnabled}>
+              toggle
+            </Text>
+          </TouchableOpacity>
+
+          <TouchableOpacity onPress={() => Analytics.trackEvent('Button press', { page: 'Home page' })}>
+            <Text style={SharedStyles.button}>
+              Track Event
+            </Text>
+          </TouchableOpacity>
+
+          <TouchableOpacity onPress={() => Analytics.trackEvent('Button press', { propertyValueTooLong: '12345678901234567890123456789012345678901234567890123456789012345' })}>
+            <Text style={SharedStyles.button}>
+              Track Event - event property value truncated after 64 characters
+            </Text>
+          </TouchableOpacity>
+
+          <TouchableOpacity onPress={() => Analytics.trackEvent('Button press', data)}>
+            <Text style={SharedStyles.button}>
+              Track Event badly (Do not do this, only strings are supported)
+            </Text>
+          </TouchableOpacity>
+
+        </ScrollView>
+      </View>
+    );
+  }
+  /* eslint-enable no-undef */
+}