Skip to content

Commit

Permalink
Merge branch 'release-10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
KevWho committed Sep 19, 2020
2 parents eaf69c9 + 6436199 commit 569f143
Show file tree
Hide file tree
Showing 7,365 changed files with 1,063,768 additions and 193,198 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ xcuserdata/
*.moved-aside
*.xccheckout
*.xcscmblueprint

GoogleService-Info.plist

## Cocoapods
##Pods/
150 changes: 0 additions & 150 deletions CampusResourceViewController.swift

This file was deleted.

24 changes: 6 additions & 18 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
#Uncomment this line to define a global platform for your project
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'berkeleyMobileiOS' do
# Comment this line if you're not using Swift and don't want to use dynamic frameworks
target 'berkeley-mobile' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

# Pods for berkeleyMobileiOS
pod 'Alamofire', '~> 4.0'
pod 'Material', '~> 2.0'
pod 'SwiftyJSON'
pod 'GoogleMaps'
pod 'GooglePlaces'
pod 'Firebase/Core'
pod 'GooglePlacePicker'
pod 'DropDown'
pod 'SDWebImage', '~>3.8'
pod 'Fabric', '~> 1.7.2'
pod 'Crashlytics', '~> 3.9.3'
pod 'KCFloatingActionButton'
pod ‘ExpandingMenu’, :git => ’https://github.com/monoqlo/ExpandingMenu.git', :commit => ‘6ce67f9049756f6714fa34e82aef49eb6b888423'
pod 'RealmSwift', :git => 'https://github.com/realm/realm-cocoa.git', :branch => 'master', submodules: true
# Pods for berkeley-mobile
pod 'Firebase/Core'
pod 'Firebase/Firestore'
end
Loading

0 comments on commit 569f143

Please sign in to comment.