Skip to content

Commit

Permalink
Fix failing tests on Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisballinger committed Jan 27, 2016
1 parent d66563a commit 5b6b37c
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion KissXML.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.
10 changes: 6 additions & 4 deletions Tests/Mac/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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 `../../`)
Expand All @@ -11,6 +13,6 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
KissXML: 1b5facede484e73280483b18f7a74121d8d3fc9f
KissXML: c5f925279c2919b76f1cc2ed1053d9735304cfbf

COCOAPODS: 0.39.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9DB38781C5845BA003E55FB"
BuildableName = "KissXMLSwiftTests.xctest"
BlueprintName = "KissXMLSwiftTests"
ReferencedContainer = "container:KissXML.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
6 changes: 3 additions & 3 deletions Tests/Swift/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -11,6 +11,6 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
KissXML: 0dd686d4e8438dfb89bc038e279241c6c9bf0a88
KissXML: c5f925279c2919b76f1cc2ed1053d9735304cfbf

COCOAPODS: 0.39.0
10 changes: 5 additions & 5 deletions Tests/iOS/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -13,6 +13,6 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
KissXML: 6775381a6d51e488df93e176eee46efbcf173846
KissXML: c5f925279c2919b76f1cc2ed1053d9735304cfbf

COCOAPODS: 0.39.0

0 comments on commit 5b6b37c

Please sign in to comment.