Skip to content

Commit

Permalink
Fix build after upgrade and start to rip out firebase
Browse files Browse the repository at this point in the history
  • Loading branch information
akilburge committed Jun 5, 2018
1 parent 173a20b commit 665aa91
Show file tree
Hide file tree
Showing 18 changed files with 10,374 additions and 6,528 deletions.
17 changes: 17 additions & 0 deletions android/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Rukatuk</name>
<comment>Project Rukatuk created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
6 changes: 6 additions & 0 deletions android/app/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
23 changes: 23 additions & 0 deletions android/app/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>app</name>
<comment>Project app created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions android/app/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=..
eclipse.preferences.version=1
8 changes: 0 additions & 8 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,6 @@ dependencies {
exclude group: 'com.google.android.gms'
}

compile(project(':react-native-firebase')) {
transitive = false
exclude group: 'com.google.android.gms'
}
compile "com.google.firebase:firebase-core:11.2.0"
compile "com.google.firebase:firebase-analytics:11.2.0"
compile "com.google.firebase:firebase-crash:11.2.0"

compile 'com.google.android.gms:play-services-base:11.2.0'
compile 'com.google.android.gms:play-services-maps:11.2.0'
}
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.rukatuk.app">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down
12 changes: 3 additions & 9 deletions android/app/src/main/java/com/rukatuk/app/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import com.airbnb.android.react.maps.MapsPackage;
import com.oblador.vectoricons.VectorIconsPackage;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
import io.invertase.firebase.RNFirebasePackage;
import io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage;
import io.invertase.firebase.crash.RNFirebaseCrashPackage;

import java.util.Arrays;
import java.util.List;
Expand All @@ -25,15 +22,12 @@ public List<ReactPackage> createAdditionalReactPackages() {
return Arrays.<ReactPackage>asList(
new ReactNativeConfigPackage(),
new MapsPackage(),
new VectorIconsPackage(),
new RNFirebasePackage(),
new RNFirebaseAnalyticsPackage(),
new RNFirebaseCrashPackage()
new VectorIconsPackage()
);
}

@Override
protected String getJSMainModuleName() {
return "index";
public String getJSMainModuleName() {
return "index";
}
}
5 changes: 1 addition & 4 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ project(':react-native-config').projectDir = new File(rootProject.projectDir, '.

include ':app'
include ':react-native-navigation'
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')

include ':react-native-firebase'
project(':react-native-firebase').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-firebase/android')
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')
2 changes: 0 additions & 2 deletions app/screens/events/EventsScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
View
} from 'react-native';
import Moment from 'moment';
import Badge from 'react-native-smart-badge';

import appStyles, { theme, navigatorStyle } from '../../config/styles';
import styles from './styles';
Expand Down Expand Up @@ -225,7 +224,6 @@ export default class EventsScreen extends Component {
}}>
{Moment(event.startDate).format('ddd, D MMM @HH:mm')}
</Text>
{ isLive && <Badge style={{ backgroundColor: theme.colours.primary }}>LIVE</Badge>}
</View>
</View>
</View>
Expand Down
9 changes: 4 additions & 5 deletions app/utils/analytics.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import firebase from './firebase';

const analytics = firebase.analytics();
analytics.setAnalyticsCollectionEnabled(true);
// const analytics = firebase.analytics();
// analytics.setAnalyticsCollectionEnabled(true);

function trackScreenView(screenName) {
analytics.setCurrentScreen(screenName);
// analytics.setCurrentScreen(screenName);
}

function trackEvent(event, params) {
analytics.logEvent(event, params);
// analytics.logEvent(event, params);
}

export { trackScreenView, trackEvent };
5 changes: 0 additions & 5 deletions app/utils/firebase.js

This file was deleted.

22 changes: 13 additions & 9 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,24 @@ target 'Rukatuk' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!

pod "Yoga", :path => "../node_modules/react-native/ReactCommon/yoga"
pod 'React', :path => '../node_modules/react-native', :subspecs => [
'BatchedBridge', # Required For React Native 0.45.0+
'Core',
'CxxBridge', # Include this for RN >= 0.47
'DevSupport', # Include this to enable In-App Devmenu if RN >= 0.43
'RCTText',
'RCTNetwork',
'RCTWebSocket', # Needed for debugging
'RCTAnimation', # Needed for FlatList and animations running on native UI thread

# Add any other subspecs you want to use in your project
]
# Explicitly include Yoga if you are using RN >= 0.42.0
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'

# Required by RNFirebase
pod 'Firebase/Core'
pod 'RNFirebase', :path => '../node_modules/react-native-firebase'

# Firebase Opt-in Modules
pod 'Firebase/Analytics'
pod 'Firebase/Crash'
# Third party deps podspec link
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'

target 'RukatukTests' do
inherit! :search_paths
Expand Down
139 changes: 64 additions & 75 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,93 +1,82 @@
PODS:
- Firebase/Analytics (4.2.0):
- Firebase/Core
- Firebase/Core (4.2.0):
- FirebaseAnalytics (= 4.0.3)
- FirebaseCore (= 4.0.7)
- Firebase/Crash (4.2.0):
- Firebase/Core
- FirebaseCrash (= 2.0.2)
- FirebaseAnalytics (4.0.3):
- FirebaseCore (~> 4.0)
- FirebaseInstanceID (~> 2.0)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- nanopb (~> 0.3)
- FirebaseCore (4.0.7):
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- nanopb (~> 0.3)
- FirebaseCrash (2.0.2):
- FirebaseAnalytics (~> 4.0)
- FirebaseInstanceID (~> 2.0)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- Protobuf (~> 3.1)
- FirebaseInstanceID (2.0.3)
- GoogleToolboxForMac/Defines (2.1.1)
- GoogleToolboxForMac/Logger (2.1.1):
- GoogleToolboxForMac/Defines (= 2.1.1)
- "GoogleToolboxForMac/NSData+zlib (2.1.1)":
- GoogleToolboxForMac/Defines (= 2.1.1)
- nanopb (0.3.8):
- nanopb/decode (= 0.3.8)
- nanopb/encode (= 0.3.8)
- nanopb/decode (0.3.8)
- nanopb/encode (0.3.8)
- Protobuf (3.4.0)
- React (0.48.3):
- React/Core (= 0.48.3)
- React/BatchedBridge (0.48.3):
- boost-for-react-native (1.63.0)
- DoubleConversion (1.1.5)
- Folly (2016.09.26.00):
- boost-for-react-native
- DoubleConversion
- glog
- glog (0.3.4)
- React/Core (0.55.4):
- yoga (= 0.55.4.React)
- React/CxxBridge (0.55.4):
- Folly (= 2016.09.26.00)
- React/Core
- React/cxxreact_legacy
- React/Core (0.48.3):
- Yoga (= 0.48.3.React)
- React/cxxreact_legacy (0.48.3):
- React/jschelpers_legacy
- React/jschelpers_legacy (0.48.3)
- RNFirebase (2.2.1):
- React
- Yoga (0.48.3.React)
- React/cxxreact
- React/cxxreact (0.55.4):
- boost-for-react-native (= 1.63.0)
- Folly (= 2016.09.26.00)
- React/jschelpers
- React/jsinspector
- React/DevSupport (0.55.4):
- React/Core
- React/RCTWebSocket
- React/fishhook (0.55.4)
- React/jschelpers (0.55.4):
- Folly (= 2016.09.26.00)
- React/PrivateDatabase
- React/jsinspector (0.55.4)
- React/PrivateDatabase (0.55.4)
- React/RCTAnimation (0.55.4):
- React/Core
- React/RCTBlob (0.55.4):
- React/Core
- React/RCTNetwork (0.55.4):
- React/Core
- React/RCTText (0.55.4):
- React/Core
- React/RCTWebSocket (0.55.4):
- React/Core
- React/fishhook
- React/RCTBlob
- yoga (0.55.4.React)

DEPENDENCIES:
- Firebase/Analytics
- Firebase/Core
- Firebase/Crash
- React/BatchedBridge (from `../node_modules/react-native`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- React/Core (from `../node_modules/react-native`)
- RNFirebase (from `../node_modules/react-native-firebase`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
- React/CxxBridge (from `../node_modules/react-native`)
- React/DevSupport (from `../node_modules/react-native`)
- React/RCTAnimation (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`)
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Firebase
- FirebaseAnalytics
- FirebaseCore
- FirebaseCrash
- FirebaseInstanceID
- GoogleToolboxForMac
- nanopb
- Protobuf
- boost-for-react-native

EXTERNAL SOURCES:
DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
Folly:
:podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
React:
:path: "../node_modules/react-native"
RNFirebase:
:path: "../node_modules/react-native-firebase"
Yoga:
yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
Firebase: 9548cae14d69718add12d75a5b312893f7ef89c7
FirebaseAnalytics: 76f754d37ca5b04f36856729b6af3ca0152d1069
FirebaseCore: 9a6cc1e3eaf75905390f9220596ad4fd8f92faee
FirebaseCrash: cded0fc566c03651aea606a101bc156085f333ca
FirebaseInstanceID: a4fc702b5a026f7322964376047f1a3f1f7cc6ff
GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
Protobuf: 03eef2ee0b674770735cf79d9c4d3659cf6908e8
React: 59267c3a5811102116842a84a29efaca58167ee8
RNFirebase: ad31aa672a2de13440c11307453f032dcffe823b
Yoga: de6cde41559145f06b816e2bab5bfa980447798b
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
Folly: 211775e49d8da0ca658aebc8eab89d642935755c
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
React: aa2040dbb6f317b95314968021bd2888816e03d5
yoga: a23273df0088bf7f2bb7e5d7b00044ea57a2a54a

PODFILE CHECKSUM: 462548c5d01c1d7b593307126b21fc0af06f2767
PODFILE CHECKSUM: ec758dc3377a20f4febe08741a764d99bf5512f5

COCOAPODS: 1.5.3
Loading

0 comments on commit 665aa91

Please sign in to comment.