Skip to content

Commit

Permalink
Merge pull request #235 from Microsoft/master
Browse files Browse the repository at this point in the history
Merge master into develop
  • Loading branch information
dhei authored Feb 5, 2018
2 parents 3240661 + 6ad5c8d commit cc04470
Show file tree
Hide file tree
Showing 43 changed files with 448 additions and 89 deletions.
6 changes: 0 additions & 6 deletions DemoApp/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,6 @@ android {
}
}

repositories {
maven {
url "https://dl.bintray.com/vsappcenter/appcenter-snapshot"
}
}

dependencies {
compile project(':react-native-image-picker')
compile project(':react-native-fs')
Expand Down
3 changes: 3 additions & 0 deletions DemoApp/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ allprojects {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
maven {
url "https://dl.bintray.com/vsappcenter/appcenter-snapshot"
}
}
}
2 changes: 1 addition & 1 deletion DemoApp/ios/DemoApp/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

[AppCenterReactNativePush register]; // Initialize AppCenter push

[AppCenterReactNativeCrashes register]; // Initialize AppCenter crashes
[AppCenterReactNativeCrashes registerWithAutomaticProcessing]; // Initialize AppCenter crashes

[AppCenterReactNativeAnalytics registerWithInitiallyEnabled:true]; // Initialize AppCenter analytics

Expand Down
8 changes: 4 additions & 4 deletions DemoApp/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ target 'DemoApp' do
# use_frameworks!

# Pods for DemoApp
pod 'AppCenter/Push', '~> 1.1.0'
pod 'AppCenter/Crashes', '~> 1.1.0'
pod 'AppCenter/Analytics', '~> 1.1.0'
pod 'AppCenterReactNativeShared', '~> 1.1.0'
pod 'AppCenter/Push', '~> 1.3.0'
pod 'AppCenter/Crashes', '~> 1.3.0'
pod 'AppCenter/Analytics', '~> 1.3.0'
pod 'AppCenterReactNativeShared', '~> 1.2.0'

platform :ios, '9.0'
end
28 changes: 14 additions & 14 deletions DemoApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
PODS:
- AppCenter/Analytics (1.1.0):
- AppCenter/Analytics (1.3.0):
- AppCenter/Core
- AppCenter/Core (1.1.0)
- AppCenter/Crashes (1.1.0):
- AppCenter/Core (1.3.0)
- AppCenter/Crashes (1.3.0):
- AppCenter/Core
- AppCenter/Push (1.1.0):
- AppCenter/Push (1.3.0):
- AppCenter/Core
- AppCenterReactNativeShared (1.1.0):
- AppCenter/Core (= 1.1.0)
- AppCenterReactNativeShared (1.2.0):
- AppCenter/Core (= 1.3.0)

DEPENDENCIES:
- AppCenter/Analytics (~> 1.1.0)
- AppCenter/Crashes (~> 1.1.0)
- AppCenter/Push (~> 1.1.0)
- AppCenterReactNativeShared (~> 1.1.0)
- AppCenter/Analytics (~> 1.3.0)
- AppCenter/Crashes (~> 1.3.0)
- AppCenter/Push (~> 1.3.0)
- AppCenterReactNativeShared (~> 1.2.0)

SPEC CHECKSUMS:
AppCenter: 97c88c10f83719de514aa7f186766f289012f074
AppCenterReactNativeShared: 43815d681490628fae56c4c6f93ba5c7f85c83db
AppCenter: 77679d75cbb6e5327cb849d2988b57d9cb864dcb
AppCenterReactNativeShared: 393e08220108e51ee36d654622911a6faadc8632

PODFILE CHECKSUM: 8d5113c88e4df0abb469731e18168a2f8bcbe805
PODFILE CHECKSUM: f1ff4b5f9efd9d401cc0359f6c3d676af1df08e8

COCOAPODS: 1.3.1
COCOAPODS: 1.4.0
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cc04470

Please sign in to comment.