Skip to content

Commit

Permalink
updated SerializeClasses and cartFile in order to compile
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosmouracorreia committed Jan 21, 2019
1 parent 1e7930f commit b4b0f15
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 200 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9
osx_image: xcode10

env:
global:
Expand Down
4 changes: 2 additions & 2 deletions AlamofireObjectMapper.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Pod::Spec.new do |s|
s.author = { "Tristan Himmelman" => "[email protected]" }
s.source = { :git => 'https://github.com/tristanhimmelman/AlamofireObjectMapper.git', :tag => s.version.to_s }

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.0'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'

Expand Down
14 changes: 7 additions & 7 deletions AlamofireObjectMapper.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
E89A901B1D6F5F520023C364 /* ObjectMapper.framework */,
E89A901D1D6F5F520023C364 /* ObjectMapper.framework */,
E89A901F1D6F5F520023C364 /* ObjectMapper-iOSTests.xctest */,
E89A90211D6F5F520023C364 /* ObjectMapper-MacTests.xctest */,
E89A90211D6F5F520023C364 /* ObjectMapper-macOSTests.xctest */,
E89A90231D6F5F520023C364 /* ObjectMapper-tvOSTests.xctest */,
6A20983C219CDEA5009AB4DF /* libObjectMapper.a */,
);
Expand Down Expand Up @@ -654,10 +654,10 @@
remoteRef = E89A901E1D6F5F520023C364 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
E89A90211D6F5F520023C364 /* ObjectMapper-MacTests.xctest */ = {
E89A90211D6F5F520023C364 /* ObjectMapper-macOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "ObjectMapper-MacTests.xctest";
path = "ObjectMapper-macOSTests.xctest";
remoteRef = E89A90201D6F5F520023C364 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand Down Expand Up @@ -835,7 +835,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -889,7 +889,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand All @@ -914,7 +914,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AlamofireObjectMapper/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = AlamofireObjectMapper;
Expand All @@ -938,7 +938,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AlamofireObjectMapper/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = AlamofireObjectMapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
298 changes: 113 additions & 185 deletions AlamofireObjectMapper/AlamofireObjectMapper.swift

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" ~> 4.7
github "Alamofire/Alamofire" "5.0.0.beta.1"
github "tristanhimmelman/ObjectMapper" ~> 3.4
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" "4.7.3"
github "tristanhimmelman/ObjectMapper" "3.4.1"
github "Alamofire/Alamofire" "5.0.0.beta.1"
github "tristanhimmelman/ObjectMapper" "3.4.2"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Alamofire
Submodule Alamofire updated 287 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ObjectMapper

0 comments on commit b4b0f15

Please sign in to comment.