diff --git a/.gitignore b/.gitignore index 93c86d3..5f91235 100644 --- a/.gitignore +++ b/.gitignore @@ -23,14 +23,14 @@ DerivedData .bundle # Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts +Carthage/Checkouts Carthage/Build # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# +# # Note: if you ignore the Pods directory, make sure to uncomment # `pod install` in .travis.yml # diff --git a/ApolloAlamofire.podspec b/ApolloAlamofire.podspec index 8f8cbbc..3e3b7c3 100644 --- a/ApolloAlamofire.podspec +++ b/ApolloAlamofire.podspec @@ -33,13 +33,13 @@ and solves known limitations of Apollo iOS library. s.ios.deployment_target = '9.0' s.source_files = 'ApolloAlamofire/Classes/**/*' - + # s.resource_bundles = { # 'ApolloAlamofire' => ['ApolloAlamofire/Assets/*.png'] # } # s.public_header_files = 'Pod/Classes/**/*.h' # s.frameworks = 'UIKit', 'MapKit' - s.dependency 'Alamofire', '~> 4' - s.dependency 'Apollo', '~> 0.10' + s.dependency 'Alamofire', '~> 4.8.2' + s.dependency 'Apollo', '~> 0.10.1' end diff --git a/Cartfile b/Cartfile new file mode 100644 index 0000000..1af8038 --- /dev/null +++ b/Cartfile @@ -0,0 +1,2 @@ +github "apollostack/apollo-ios" ~> 0.10.1 +github "Alamofire/Alamofire" ~> 4.8.2 diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..07d4ad0 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,4 @@ +github "Alamofire/Alamofire" "4.8.2" +github "apollostack/apollo-ios" "0.10.1" +github "daltoniam/Starscream" "3.1.0" +github "stephencelis/SQLite.swift" "0.11.5" diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ApolloAlamofire.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ApolloAlamofire.xcscheme new file mode 100644 index 0000000..6bb0818 --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ApolloAlamofire.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +