From 755070675f37f351159446e12a01b2b888ba7909 Mon Sep 17 00:00:00 2001 From: Matthew Baranowski Date: Sun, 27 Mar 2016 22:18:25 -0400 Subject: [PATCH 1/2] Attempt to upgrade MantleXMLAdapter pod to work with latest version of KissXML that may support modules & frameworks. --- .gitmodules | 3 --- KissXML | 1 - Mantle/MTLXMLAdapter.h | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 160000 KissXML diff --git a/.gitmodules b/.gitmodules index 6c3fd5e6..1e29378a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "MantleTests/specta"] path = MantleTests/specta url = git://github.com/github/specta.git -[submodule "KissXML"] - path = KissXML -url=https://github.com/mbaranowski/KissXML diff --git a/KissXML b/KissXML deleted file mode 160000 index 934a9e6e..00000000 --- a/KissXML +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 934a9e6e27e7359791ac3f598928845c34d04db4 diff --git a/Mantle/MTLXMLAdapter.h b/Mantle/MTLXMLAdapter.h index d3dab134..f6677ffa 100644 --- a/Mantle/MTLXMLAdapter.h +++ b/Mantle/MTLXMLAdapter.h @@ -7,8 +7,8 @@ // #import -#import "DDXML.h" -#import "DDXMLNode.h" +#import +#import @class MTLModel; From f902c41eecd49dc9f23e00b6d5ccd8a89f41aa92 Mon Sep 17 00:00:00 2001 From: Matthew Baranowski Date: Sun, 27 Mar 2016 22:35:39 -0400 Subject: [PATCH 2/2] require `KissXML/libxml_module` which has support for putting libxml inside a module file. --- MantleXMLAdapter.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/MantleXMLAdapter.podspec b/MantleXMLAdapter.podspec index d069dfe0..8b404cee 100644 --- a/MantleXMLAdapter.podspec +++ b/MantleXMLAdapter.podspec @@ -9,6 +9,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/mbaranowski/MantleXMLAdapter.git", :tag => '0.2.2' } s.source_files = 'Mantle/MTLXMLAdapter.{h,m}', 'Mantle/NSValueTransformer+MTLXMLTransformerAdditions.{h,m}' s.dependency 'KissXML' + s.dependency 'KissXML/libxml_module' s.dependency 'Mantle' s.requires_arc = true s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }