From 5b6b37ccbac8ac675227ad4ae5bfc6d89309da20 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Wed, 27 Jan 2016 13:16:10 -0800 Subject: [PATCH] Fix failing tests on Travis --- .travis.yml | 6 +- KissXML.podspec | 2 +- README.markdown | 2 +- Tests/Mac/Podfile.lock | 10 ++-- .../xcschemes/KissXMLSwiftTests.xcscheme | 56 +++++++++++++++++++ Tests/Swift/Podfile.lock | 6 +- Tests/iOS/Podfile.lock | 10 ++-- 7 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 Tests/Swift/KissXML.xcodeproj/xcshareddata/xcschemes/KissXMLSwiftTests.xcscheme diff --git a/.travis.yml b/.travis.yml index 19b3d82e..55e03aff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: objective-c osx_image: xcode7.2 script: - - pod install --project-directory=/Tests/Mac - - pod install --project-directory=/Tests/iOS - - pod install --project-directory=/Tests/Swift + - pod install --project-directory=./Tests/Mac + - pod install --project-directory=./Tests/iOS + - pod install --project-directory=./Tests/Swift - xctool -workspace ./Tests/Mac/KissXML.xcworkspace -scheme KissXMLTests -sdk macosx -arch x86_64 test - xctool -workspace ./Tests/iOS/KissXML.xcworkspace -scheme KissXMLTests -sdk iphonesimulator -arch i386 test - xctool -workspace ./Tests/Swift/KissXML.xcworkspace -scheme KissXMLSwiftTests -sdk macosx -arch x86_64 test diff --git a/KissXML.podspec b/KissXML.podspec index 059c3365..67cc70ee 100644 --- a/KissXML.podspec +++ b/KissXML.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'KissXML' - s.version = '5.1.0' + s.version = '5.0.2' s.license = { :type => 'MIT', :file => 'LICENSE.txt' } s.summary = 'A replacement for Cocoa\'s NSXML cluster of classes. Based on libxml.' s.homepage = 'https://github.com/robbiehanson/KissXML' diff --git a/README.markdown b/README.markdown index fad9f34c..44a043aa 100644 --- a/README.markdown +++ b/README.markdown @@ -30,5 +30,5 @@ Love the project? Wanna buy me a coffee? (or a beer :D) [![donation](http://www. ## Changelog -* 5.1.0 - Jan 26 2016 - Enable Swift support via `libxml/module.modulemap` and `DDXML_LIBXML_MODULE_ENABLED` macro. +* 5.0.2 - Jan 26 2016 - Enable Swift support via `libxml/module.modulemap` and `DDXML_LIBXML_MODULE_ENABLED` macro. You can use the `KissXML/libxml_module` CocoaPods subspec to enable this feature. * 5.0.1 - Jan 21 2016 - Run tests on iOS and Mac targets. \ No newline at end of file diff --git a/Tests/Mac/Podfile.lock b/Tests/Mac/Podfile.lock index 80c7054b..d17d35a7 100644 --- a/Tests/Mac/Podfile.lock +++ b/Tests/Mac/Podfile.lock @@ -1,7 +1,9 @@ PODS: - - KissXML (5.1.0): - - KissXML/Standard (= 5.1.0) - - KissXML/Standard (5.1.0) + - KissXML (5.0.2): + - KissXML/Standard (= 5.0.2) + - KissXML/Core (5.0.2) + - KissXML/Standard (5.0.2): + - KissXML/Core DEPENDENCIES: - KissXML (from `../../`) @@ -11,6 +13,6 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - KissXML: 1b5facede484e73280483b18f7a74121d8d3fc9f + KissXML: c5f925279c2919b76f1cc2ed1053d9735304cfbf COCOAPODS: 0.39.0 diff --git a/Tests/Swift/KissXML.xcodeproj/xcshareddata/xcschemes/KissXMLSwiftTests.xcscheme b/Tests/Swift/KissXML.xcodeproj/xcshareddata/xcschemes/KissXMLSwiftTests.xcscheme new file mode 100644 index 00000000..5241e5e8 --- /dev/null +++ b/Tests/Swift/KissXML.xcodeproj/xcshareddata/xcschemes/KissXMLSwiftTests.xcscheme @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/Swift/Podfile.lock b/Tests/Swift/Podfile.lock index 50993ff4..6fbb4259 100644 --- a/Tests/Swift/Podfile.lock +++ b/Tests/Swift/Podfile.lock @@ -1,6 +1,6 @@ PODS: - - KissXML/Core (5.1.0) - - KissXML/libxml_module (5.1.0): + - KissXML/Core (5.0.2) + - KissXML/libxml_module (5.0.2): - KissXML/Core DEPENDENCIES: @@ -11,6 +11,6 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - KissXML: 0dd686d4e8438dfb89bc038e279241c6c9bf0a88 + KissXML: c5f925279c2919b76f1cc2ed1053d9735304cfbf COCOAPODS: 0.39.0 diff --git a/Tests/iOS/Podfile.lock b/Tests/iOS/Podfile.lock index 003a9e99..d17d35a7 100644 --- a/Tests/iOS/Podfile.lock +++ b/Tests/iOS/Podfile.lock @@ -1,8 +1,8 @@ PODS: - - KissXML (5.1.0): - - KissXML/Standard (= 5.1.0) - - KissXML/Core (5.1.0) - - KissXML/Standard (5.1.0): + - KissXML (5.0.2): + - KissXML/Standard (= 5.0.2) + - KissXML/Core (5.0.2) + - KissXML/Standard (5.0.2): - KissXML/Core DEPENDENCIES: @@ -13,6 +13,6 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - KissXML: 6775381a6d51e488df93e176eee46efbcf173846 + KissXML: c5f925279c2919b76f1cc2ed1053d9735304cfbf COCOAPODS: 0.39.0