Skip to content

Commit

Permalink
Trying to fix cocoapods issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Vermeer, Edwin authored and Vermeer, Edwin committed Oct 18, 2017
1 parent ef4b659 commit 7eb2767
Show file tree
Hide file tree
Showing 52 changed files with 270 additions and 271 deletions.
8 changes: 4 additions & 4 deletions EVReflection.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "EVReflection"
s.version = "5.1.0"
s.version = "5.1.1"
s.summary = "Reflection based (Dictionary, CKRecord, NSManagedObject, Realm, JSON and XML) object mapping with extensions for Alamofire and Moya with RxSwift or ReactiveSwift"

s.description = <<-EOS
Expand All @@ -13,7 +13,7 @@ EOS
s.author = { "Edwin Vermeer" => "[email protected]" }
s.social_media_url = "http://twitter.com/evermeer"

s.ios.deployment_target = '9.0'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'
Expand Down Expand Up @@ -43,7 +43,7 @@ EOS

# Extending EVReflection with mapping functions for CKRecord (CloudKit)
s.subspec "CloudKit" do |ss|
ss.ios.deployment_target = '9.0'
ss.ios.deployment_target = '8.0'
ss.osx.deployment_target = '10.11'
ss.watchos.deployment_target = '3.0'
ss.tvos.deployment_target = '9.0'
Expand Down Expand Up @@ -76,7 +76,7 @@ EOS
# Adding easy Json to object mapping to Moya using EVReflection
s.subspec "Moya" do |ss|
ss.source_files = "Source/Alamofire/Moya/*.swift"
ss.dependency "Moya", "10.0.0-beta.1"
ss.dependency "Moya"
ss.dependency "EVReflection/Alamofire"
end

Expand Down
3 changes: 3 additions & 0 deletions EVReflection.xcworkspace/contents.xcworkspacedata

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

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,5 @@
breakpointStackSelectionBehavior = "1">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Source/EVReflection.swift"
timestampString = "528970890.544025"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1187"
endingLineNumber = "1187"
landmarkName = "arrayConversion(_:key:fieldType:original:theDictValue:conversionOptions:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Please take notice that:

I switched master to Swift 4

Unfortunately I'm not allowed to push a new version for this to cocoapods because there now is a dependency to Moya 10.0 which is still in beta.
Unfortunately I'm not allowed to push a new version for this to cocoapods. I hope to fix this issue soon

In order to use this using cocoapods you have to specify the git pad so that it will use master
`pod 'EVReflection', :git => 'https://github.com/evermeer/EVReflection.git'`
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ workspace 'EVReflection'
def alllibraries
#temp Swift 4 force version
# pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift.git', :branch => '4.0.0-rc.0'
# pod 'Moya', :git => 'https://github.com/Moya/Moya.git', :branch => '10.0.0-dev'
pod 'Moya', :git => 'https://github.com/Moya/Moya.git', :branch => '10.0.0-dev'

pod 'EVReflection/MoyaRxSwiftXML', :path => "./"
pod 'EVReflection/MoyaReactiveSwiftXML', :path => "./"
Expand Down
41 changes: 25 additions & 16 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
PODS:
- Alamofire (4.5.1)
- EVReflection/Alamofire (5.0.4):
- EVReflection/Alamofire (5.1.0):
- Alamofire
- EVReflection/Core
- EVReflection/AlamofireXML (5.0.4):
- EVReflection/AlamofireXML (5.1.0):
- EVReflection/Alamofire
- EVReflection/XML
- EVReflection/CloudKit (5.0.4):
- EVReflection/CloudKit (5.1.0):
- EVReflection/Core
- EVReflection/Core (5.0.4)
- EVReflection/CoreData (5.0.4):
- EVReflection/Core (5.1.0)
- EVReflection/CoreData (5.1.0):
- EVReflection/Core
- EVReflection/Moya (5.0.4):
- EVReflection/Moya (5.1.0):
- EVReflection/Alamofire
- Moya (= 10.0.0-beta.1)
- EVReflection/MoyaReactiveSwift (5.0.4):
- EVReflection/MoyaReactiveSwift (5.1.0):
- EVReflection/Moya
- Moya/ReactiveSwift
- EVReflection/MoyaReactiveSwiftXML (5.0.4):
- EVReflection/MoyaReactiveSwiftXML (5.1.0):
- EVReflection/MoyaReactiveSwift
- EVReflection/MoyaXML
- EVReflection/MoyaRxSwift (5.0.4):
- EVReflection/MoyaRxSwift (5.1.0):
- EVReflection/Moya
- Moya/RxSwift
- EVReflection/MoyaRxSwiftXML (5.0.4):
- EVReflection/MoyaRxSwiftXML (5.1.0):
- EVReflection/MoyaRxSwift
- EVReflection/MoyaXML
- EVReflection/MoyaXML (5.0.4):
- EVReflection/MoyaXML (5.1.0):
- EVReflection/AlamofireXML
- EVReflection/Moya
- EVReflection/Realm (5.0.4):
- EVReflection/Realm (5.1.0):
- EVReflection/Core
- RealmSwift
- EVReflection/XML (5.0.4):
- EVReflection/XML (5.1.0):
- EVReflection/Core
- XMLDictionary
- Moya (10.0.0-beta.1):
Expand Down Expand Up @@ -64,22 +64,31 @@ DEPENDENCIES:
- EVReflection/MoyaReactiveSwiftXML (from `./`)
- EVReflection/MoyaRxSwiftXML (from `./`)
- EVReflection/Realm (from `./`)
- Moya (from `https://github.com/Moya/Moya.git`, branch `10.0.0-dev`)

EXTERNAL SOURCES:
EVReflection:
:path: ./
Moya:
:branch: 10.0.0-dev
:git: https://github.com/Moya/Moya.git

CHECKOUT OPTIONS:
Moya:
:commit: a951eeab47ad7f4ef780b63e085704b576bbc3be
:git: https://github.com/Moya/Moya.git

SPEC CHECKSUMS:
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
EVReflection: f40709029497436e26a3d1178e230c7f7603fc90
Moya: 7fb3c51aa9b3fdf5ea7d9412e03b63edb9559fb3
EVReflection: 92e801928b5417d31e581f4e8a7cf12b8b3ddff5
Moya: 88d6dcee6a0d8d4e493088a600c7773a077f0d08
ReactiveSwift: 60a29ff35988a964fd2bb759755cb6594de523fc
Realm: 0ef72b837fb67e9f4b098bac771ddd72c7fdbb69
RealmSwift: 07a9ae0505091eda6b2ee7c190c3786d6e90a7b0
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
RxSwift: 1dd09ceb11531c39adff4efe23556b1484e16967
XMLDictionary: fa07b6ff422b3a91d47a5de9bc82e3fc04fbd167

PODFILE CHECKSUM: f8ae6ec1faef22d8adc930a19ece3b10f676f74f
PODFILE CHECKSUM: 5ece3aa5717f557b2c4b092bf3cf16b8f48d766f

COCOAPODS: 1.4.0.beta.1
6 changes: 3 additions & 3 deletions Pods/Local Podspecs/EVReflection.podspec.json

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

8 changes: 0 additions & 8 deletions Pods/Local Podspecs/Moya.podspec.json

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

41 changes: 25 additions & 16 deletions Pods/Manifest.lock

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

10 changes: 6 additions & 4 deletions Pods/Moya/Readme.md

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

Loading

0 comments on commit 7eb2767

Please sign in to comment.