Merge pull request #266 from Microsoft/develop

Merge develop into master

AppCenterReactNativeShared/Products/AppCenterReactNativeShared.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenterReactNativeShared'
-  s.version           = '1.3.0'
+  s.version           = '1.4.0'
   s.summary           = 'React Native plugin for Visual Studio App Center'
   s.license           = { :type => 'MIT',  :file => 'AppCenterReactNativeShared/LICENSE.md' }
   s.homepage          = 'https://github.com/Microsoft/AppCenter-SDK-React-Native'
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
 
   s.vendored_frameworks = 'AppCenterReactNativeShared/AppCenterReactNativeShared.framework'
 
-  s.dependency 'AppCenter/Core', '1.4.0'
+  s.dependency 'AppCenter/Core', '1.5.0'
 end

BrownfieldTestApp/ios/Pods/AppCenterReactNativeShared/AppCenterReactNativeShared/LICENSE → AppCenterReactNativeShared/Products/AppCenterReactNativeShared/LICENSE.md

@@ -1,7 +1,13 @@
-Visual Studio App Center SDK for React Native
-Copyright (c) Microsoft Corporation
-All rights reserved. 
-MIT License
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Visual Studio App Center Plugin for React Native
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

AppCenterReactNativeShared/android/build.gradle

@@ -32,8 +32,8 @@ allprojects {
         defaultConfig {
             minSdkVersion 16
             targetSdkVersion 22
-            versionCode 25
-            versionName "1.3.0"
+            versionCode 26
+            versionName "1.4.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.3.0'
+    compile 'com.microsoft.appcenter:appcenter:1.4.0'
 }
 
 artifacts {

AppCenterReactNativeShared/ios/AppCenter.framework/Headers/MSConstants.h

@@ -60,5 +60,6 @@ static short const kMSPriorityCount = MSPriorityHigh + 1;
  */
 typedef NS_ENUM(NSInteger, MSInitializationPriority) {
   MSInitializationPriorityDefault = 500,
+  MSInitializationPriorityHigh = 750,
   MSInitializationPriorityMax = 999
 };

AppCenterReactNativeShared/ios/AppCenter.framework/Headers/MSLog.h

@@ -20,6 +20,11 @@
  */
 @property(nonatomic, copy) NSString *sid;
 
+/**
+ * Optional distribution group ID value.
+ */
+@property(nonatomic, copy) NSString *distributionGroupId;
+
 /**
  * Device properties associated to this log.
  */

AppCenterReactNativeShared/ios/AppCenterReactNativeShared.xcodeproj/project.pbxproj

@@ -21,10 +21,9 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		353594A020360A3B00066F33 /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3535949F20360A3B00066F33 /* AppCenter.framework */; };
 		5419C25A1D81FDA300DDF3A1 /* AppCenterReactNativeShared.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5419C2591D81FDA300DDF3A1 /* AppCenterReactNativeShared.h */; };
 		5419C25C1D81FDA300DDF3A1 /* AppCenterReactNativeShared.m in Sources */ = {isa = PBXBuildFile; fileRef = 5419C25B1D81FDA300DDF3A1 /* AppCenterReactNativeShared.m */; };
-		9CF027AA1FA2AD85008BDD9A /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CF027A91FA2AD85008BDD9A /* AppCenter.framework */; };
+		92C8F5D6204A38BA000C9568 /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92C8F5D5204A38BA000C9568 /* AppCenter.framework */; };
 		CB4D6D781DB6DE940080D9D6 /* AppCenterReactNativeShared.h in Headers */ = {isa = PBXBuildFile; fileRef = 5419C2591D81FDA300DDF3A1 /* AppCenterReactNativeShared.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
@@ -42,11 +41,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3535949F20360A3B00066F33 /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppCenter.framework; path = "../../../../Downloads/AppCenter-SDK-Apple/iOS/AppCenter.framework"; sourceTree = "<group>"; };
 		5419C2561D81FDA300DDF3A1 /* libAppCenterReactNativeShared.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAppCenterReactNativeShared.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5419C2591D81FDA300DDF3A1 /* AppCenterReactNativeShared.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppCenterReactNativeShared.h; sourceTree = "<group>"; };
 		5419C25B1D81FDA300DDF3A1 /* AppCenterReactNativeShared.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppCenterReactNativeShared.m; sourceTree = "<group>"; };
-		9CF027A91FA2AD85008BDD9A /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenter.framework; sourceTree = "<group>"; };
+		92C8F5D5204A38BA000C9568 /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenter.framework; sourceTree = "<group>"; };
 		BA0D8B051E57C298005C4596 /* Global.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Global.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -55,8 +53,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9CF027AA1FA2AD85008BDD9A /* AppCenter.framework in Frameworks */,
-				353594A020360A3B00066F33 /* AppCenter.framework in Frameworks */,
+				92C8F5D6204A38BA000C9568 /* AppCenter.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -66,10 +63,9 @@
 		5419C24D1D81FDA300DDF3A1 = {
 			isa = PBXGroup;
 			children = (
-				3535949F20360A3B00066F33 /* AppCenter.framework */,
 				5419C2581D81FDA300DDF3A1 /* AppCenterReactNativeShared */,
 				5419C2571D81FDA300DDF3A1 /* Products */,
-				9CF027A91FA2AD85008BDD9A /* AppCenter.framework */,
+				92C8F5D5204A38BA000C9568 /* AppCenter.framework */,
 			);
 			sourceTree = "<group>";
 		};
@@ -195,7 +191,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Sets the target folders and the final framework product.\nFMK_NAME=AppCenterReactNativeShared\n\n# Install dir will be the final output to the framework.\n# The following line create it in the root folder of the current project.\nPRODUCTS_DIR=${SRCROOT}/../Products\nZIP_FOLDER=${FMK_NAME}\nTEMP_DIR=${PRODUCTS_DIR}/${ZIP_FOLDER}\nINSTALL_DIR=${TEMP_DIR}/${FMK_NAME}.framework\n\n# Working dir will be deleted after the framework creation.\nWRK_DIR=build\nDEVICE_DIR=${WRK_DIR}/Release-iphoneos\nSIMULATOR_DIR=${WRK_DIR}/Release-iphonesimulator\n\n# Cleaning previous build\nxcodebuild -project \"${FMK_NAME}.xcodeproj\" -configuration \"Release\" -target \"${FMK_NAME}\" clean\n\n# Building both architectures.\nxcodebuild -project \"${FMK_NAME}.xcodeproj\" -configuration \"Release\" -target \"${FMK_NAME}\" -sdk iphoneos\nxcodebuild -project \"${FMK_NAME}.xcodeproj\" -configuration \"Release\" -target \"${FMK_NAME}\" -sdk iphonesimulator\n\n# Cleaning the oldest.\nif [ -d \"${TEMP_DIR}\" ]\nthen\nrm -rf \"${TEMP_DIR}\"\nfi\n\n# Creates and renews the final product folder.\nmkdir -p \"${INSTALL_DIR}\"\nmkdir -p \"${INSTALL_DIR}/Headers\"\nmkdir -p \"${INSTALL_DIR}/Modules\"\n\n# Copy the swift import file\ncp -f \"${SRCROOT}/${FMK_NAME}/Support/module.modulemap\" \"${INSTALL_DIR}/Modules/\"\n\n# Copies the headers and resources files to the final product folder.\ncp -R \"${SRCROOT}/${WRK_DIR}/Release-iphoneos/include/${FMK_NAME}/\" \"${INSTALL_DIR}/Headers/\"\n\n# Uses the Lipo Tool to merge both binary files (i386 + armv6/armv7/armv7s/arm64) into one Universal final product.\nlipo -create \"${DEVICE_DIR}/lib${FMK_NAME}.a\" \"${SIMULATOR_DIR}/lib${FMK_NAME}.a\" -output \"${INSTALL_DIR}/${FMK_NAME}\"\n\nrm -r \"${WRK_DIR}\"";
+			shellScript = "cd ${SRCROOT}\n\n./build-fat-framework.sh\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

AppCenterReactNativeShared/ios/AppCenterReactNativeShared/AppCenterReactNativeShared.m

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

AppCenterReactNativeShared/ios/build-fat-framework.sh

@@ -0,0 +1,46 @@
+# Sets the target folders and the final framework product.
+FMK_NAME=AppCenterReactNativeShared
+
+# Install dir will be the final output to the framework.
+# The following line create it in the root folder of the current project.
+PRODUCTS_DIR=${SRCROOT}/../Products
+ZIP_FOLDER=${FMK_NAME}
+TEMP_DIR=${PRODUCTS_DIR}/${ZIP_FOLDER}
+INSTALL_DIR=${TEMP_DIR}/${FMK_NAME}.framework
+
+# Working dir will be deleted after the framework creation.
+WRK_DIR=build
+DEVICE_DIR=${WRK_DIR}/Release-iphoneos
+SIMULATOR_DIR=${WRK_DIR}/Release-iphonesimulator
+
+# Cleaning previous build
+xcodebuild -project "${FMK_NAME}.xcodeproj" -configuration "Release" -target "${FMK_NAME}" clean
+
+# Building both architectures.
+xcodebuild -project "${FMK_NAME}.xcodeproj" -configuration "Release" -target "${FMK_NAME}" -sdk iphoneos
+xcodebuild -project "${FMK_NAME}.xcodeproj" -configuration "Release" -target "${FMK_NAME}" -sdk iphonesimulator
+
+# Cleaning the oldest.
+if [ -d "${TEMP_DIR}" ]
+then
+rm -rf "${TEMP_DIR}"
+fi
+
+# Creates and renews the final product folder.
+mkdir -p "${INSTALL_DIR}"
+mkdir -p "${INSTALL_DIR}/Headers"
+mkdir -p "${INSTALL_DIR}/Modules"
+
+# Copy the swift import file
+cp -f "${SRCROOT}/${FMK_NAME}/Support/module.modulemap" "${INSTALL_DIR}/Modules/"
+
+# Copies the headers and resources files to the final product folder.
+cp -R "${SRCROOT}/${WRK_DIR}/Release-iphoneos/include/${FMK_NAME}/" "${INSTALL_DIR}/Headers/"
+
+# Copies the license file to the products directory (required for cocoapods)
+cp -f "../LICENSE.md" "${TEMP_DIR}"
+
+# Uses the Lipo Tool to merge both binary files (i386 + armv6/armv7/armv7s/arm64) into one Universal final product.
+lipo -create "${DEVICE_DIR}/lib${FMK_NAME}.a" "${SIMULATOR_DIR}/lib${FMK_NAME}.a" -output "${INSTALL_DIR}/${FMK_NAME}"
+
+rm -r "${WRK_DIR}"