Skip to content

Commit

Permalink
Fix Android, iOS build. fix Sentry config to upload source map. (#891)
Browse files Browse the repository at this point in the history
* fix build for iOS.

* fix build for Android.

* fix Sentry host/url problem. Upload sourcemap.

* fix errors.

* Added Pods/ to .gitignore.

* Removed Pods files.
  • Loading branch information
jainkuniya authored and borisyankov committed Jul 18, 2017
1 parent fdea0ed commit 4096e71
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 2,931 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,10 @@ fastlane/screenshots
flow-coverage/
yarn-error.log
package-lock.json

# CocoaPods
#
# the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
ios/Pods/
1 change: 0 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ repositories {


dependencies {
compile project(':react-native-notifications')
compile project(':react-native-sentry')
compile project(':@remobile/react-native-toast')
compile project(':react-native-photo-view')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.learnium.RNDeviceInfo.RNDeviceInfo;
import com.reactnative.photoview.PhotoViewPackage;
import com.remobile.toast.RCTToastPackage;
import com.wix.reactnativenotifications.RNNotificationsPackage;
import com.wix.reactnativenotifications.core.AppLaunchHelper;
import com.wix.reactnativenotifications.core.AppLifecycleFacade;
import com.wix.reactnativenotifications.core.JsIOHelper;
Expand Down Expand Up @@ -49,7 +48,6 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new RNNotificationsPackage(),
new RNSentryPackage(MainApplication.this),
new PhotoViewPackage(),
new RCTToastPackage(),
Expand Down
2 changes: 1 addition & 1 deletion android/sentry.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defaults.url=https://zulip.org
defaults.url=https://sentry.io
defaults.org=zulip
defaults.project=zulip-mobile
auth.token=ADD-DSN-HERE
4 changes: 0 additions & 4 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
rootProject.name = 'ZulipMobile'
include ':react-native-notifications'
project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android')
include ':react-native-notifications'
project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android')
include ':react-native-sentry'
project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sentry/android')
include ':@remobile/react-native-toast'
Expand Down
1 change: 0 additions & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ target 'ZulipMobile' do
pod 'Yoga', :path => yoga_path
pod 'React', :path => react_path, :subspecs => [
'Core',
'BatchedBridge',
'RCTImage',
'RCTNetwork',
'RCTText',
Expand Down
60 changes: 43 additions & 17 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,58 @@ PODS:
- KSCrash/Reporting/Filters/Basic (1.15.11):
- KSCrash/Recording
- KSCrash/Reporting/Filters/Base
- React (0.11.0):
- React/Core (= 0.11.0)
- React/Core (0.11.0)
- Sentry (3.1.2):
- Sentry/Core (= 3.1.2)
- Sentry/Core (3.1.2)
- Sentry/KSCrash (3.1.2):
- KSCrash/Core (~> 1.15.9)
- SentryReactNative (0.14.5):
- React (0.43.4):
- React/Core (= 0.43.4)
- React/Core (0.43.4):
- React/cxxreact
- Yoga (= 0.43.4.React)
- React/cxxreact (0.43.4):
- React/jschelpers
- React/jschelpers (0.43.4)
- React/RCTImage (0.43.4):
- React/Core
- React/RCTNetwork
- React/RCTNetwork (0.43.4):
- React/Core
- React/RCTText (0.43.4):
- React/Core
- React/RCTWebSocket (0.43.4):
- React/Core
- Sentry (3.1.3):
- Sentry/Core (= 3.1.3)
- Sentry/Core (3.1.3)
- Sentry/KSCrash (3.1.3):
- KSCrash/Core (~> 1.15.11)
- SentryReactNative (0.14.6):
- React
- Sentry (~> 3.1.2)
- Sentry/KSCrash (~> 3.1.2)
- Sentry (~> 3.1.3)
- Sentry/KSCrash (~> 3.1.3)
- Yoga (0.43.4.React)

DEPENDENCIES:
- React/Core (from `../node_modules/react-native`)
- React/RCTImage (from `../node_modules/react-native`)
- React/RCTNetwork (from `../node_modules/react-native`)
- React/RCTText (from `../node_modules/react-native`)
- React/RCTWebSocket (from `../node_modules/react-native`)
- SentryReactNative (from `../node_modules/react-native-sentry`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

EXTERNAL SOURCES:
React:
:path: ../node_modules/react-native
SentryReactNative:
:path: "../node_modules/react-native-sentry"
:path: ../node_modules/react-native-sentry
Yoga:
:path: ../node_modules/react-native/ReactCommon/yoga

SPEC CHECKSUMS:
KSCrash: 7bd106ca4a2247774deeeb587c740ce0207de8f3
React: ab1a2e21deb34965c38328d5ec40cc7d12c6050a
Sentry: 5a578891f177e994d89d57effc70adb97bfb29db
SentryReactNative: 8f251df76f03c5ee42e702f37a41803709632217
React: 607aa7eb8b0e44b102f95f43fd49dc8aedefa93f
Sentry: 851ed834d5b4bacbab9d854aa8642f20e2845e44
SentryReactNative: bb53576207e52fe2a0d80fc10f02abd7c4b8e333
Yoga: 2a70bc5ab41486a272b9fd5b76c482ba9268c5dd

PODFILE CHECKSUM: ac31dd65484ec9a741127f662f85e8e683eff185
PODFILE CHECKSUM: bd79ebb54e0a248a4765e8e2b678194206d73ebd

COCOAPODS: 1.2.0
COCOAPODS: 1.2.1
40 changes: 0 additions & 40 deletions ios/Pods/Manifest.lock

This file was deleted.

Loading

0 comments on commit 4096e71

Please sign in to comment.