Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update XMLCoder dependency to 0.4.0 #53

Merged
merged 6 commits into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 65 additions & 41 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,73 @@
# * https://www.objc.io/issues/6-build-tools/travis-ci/
# * https://github.com/supermarin/xcpretty#usage

osx_image: xcode10.1
osx_image: xcode10.2
language: swift

env:
global:
- FRAMEWORK_NAME=CoreXLSX
# cache: cocoapods
# podfile: Example/Podfile
before_install:
- gem install cocoapods # Since Travis is not always on latest version
- pod repo update
- brew update
- brew install swiftformat
- brew outdated carthage || brew upgrade carthage
# - pod install --project-directory=Example
- SCHEME=CoreXLSX

jobs:
include:
- stage: lint
osx_image: xcode10.2
language: swift
before_install:
- brew update
# - brew install swiftformat
- brew outdated swiftlint || brew upgrade swiftlint
- pod repo update
script:
# temporarily disabled due to Swift ABI issues on Xcode 10.2, Mojave 10.14.4
# - swiftformat --lint --verbose .
- swiftlint
- pod lib lint --verbose
- &test
stage: test
osx_image: xcode10
language: swift
install: skip
env:
- IOS_DEVICE='platform=iOS Simulator,OS=12.0,name=iPhone SE'
- TVOS_DEVICE='platform=tvOS Simulator,OS=12.0,name=Apple TV 4K'
script:
- swift package update
- >
xcodebuild test -scheme $SCHEME
-sdk iphonesimulator -destination "$IOS_DEVICE" | xcpretty
- >
xcodebuild test -scheme $SCHEME
-sdk appletvsimulator -destination "$TVOS_DEVICE" | xcpretty
- >
xcodebuild test -enableCodeCoverage YES -scheme $SCHEME
-sdk macosx | xcpretty
- <<: *test
osx_image: xcode10.1
env:
- IOS_DEVICE='platform=iOS Simulator,OS=12.1,name=iPhone SE'
- TVOS_DEVICE='platform=tvOS Simulator,OS=12.1,name=Apple TV 4K'
- <<: *test
osx_image: xcode10.2
env:
- IOS_DEVICE='platform=iOS Simulator,OS=12.2,name=iPhone SE'
- TVOS_DEVICE='platform=tvOS Simulator,OS=12.2,name=Apple TV 4K'
after_success:
- bash <(curl -s https://codecov.io/bash)
before_deploy:
- brew outdated carthage || brew upgrade carthage
- carthage build --no-skip-current
- carthage archive $FRAMEWORK_NAME
deploy:
provider: releases
api_key:
secure: yRKneqLvOwJO290lLrvET/BEW+46h9LjKbJYTNsszdMIVfkpm8Ts59vIQMnojs71dJ+b7A6ZiWtHFjKD9/pz7+LIKWLM+dWmaL0VJiZ3S2+XD6Oh9UOC+L+ePIFItVFQOrDpP3FaN8mo339TeFwFNIc+coirYM7ouD9eMg6alpHoqP7Yt9cHMv9OwpxeGW2ZThwVTXQWlAAXG5SAXCsdUFlwJuKzjsr0ePx9V9f5r7Md6fwjQnL9Cc61z7qpEg+UFa+Q4r5P5prgW4OvAD1rVmAMdGbg0Lj8G/hv035pkf0NVFxTzHMYx4qeJREx4AqAAThpzsn/47ZDSVhu9zXnrspLXKbgT7OHwMjOqhvGT9j9yYo9KiwsEa+LnJi67Hi2Vad6FeuIJ/pFnJ0A3DFYMFj0kg6KdkYIhuwur6ZQCuq7vIg8tqjyGyxqWYINLeRccrewGLgmDoI4JT5oNhYXDiLwzn7vOIPTzMZZbteVmy/hXprdJY8Jh/Wn6UTXB82zGfNKl2C8a6I47oHgT2G4Le/BG0MYUBjyfGXAvjZo09l7EAceL9C6NuAbyNLth6cdL7NoeD3PHxv5+1g6xVLaF+cx4ORGC7sa4Rs7PJf3xrWT0KfNTIjtksu8SVtzNZz6wTGxYu/R3qxKIAHRAUtM9DrXS1H4m6qW1At3g1Cw0oI=
file: "$FRAMEWORK_NAME.framework.zip"
skip_cleanup: true
on:
repo: MaxDesiatov/CoreXLSX
tags: true

script:
- swiftformat --lint --verbose .
- pod lib lint --verbose
# bootstrap the dependencies for the project
- carthage bootstrap
- xcodebuild -scheme CoreXLSXiOS
- xcodebuild -scheme CoreXLSXwatchOS
- xcodebuild -scheme CoreXLSXtvOS
- rm -rf /Users/travis/Library/Developer/Xcode/DerivedData/
- xcodebuild test -enableCodeCoverage YES -scheme CoreXLSXmacOS
# this runs the tests the second time, but it's the only way to make sure
# that `Package.swift` is in a good state and `swift test` can only generate
# coverage reports in Swift 5.0, see this issue for more details:
# https://github.com/apple/swift-package-manager/pull/1787
# FIXME: this will fail until we can restrict deployment target for SwiftPM to
# macOS 10.11, which is probably possible with Swift 5.0 after this change
# https://github.com/apple/swift-evolution/blob/master/proposals/0236-package-manager-platform-deployment-settings.md
# - swift test
after_success:
- bash <(curl -s https://codecov.io/bash)
before_deploy:
- carthage build --no-skip-current
- carthage archive $FRAMEWORK_NAME
deploy:
provider: releases
api_key:
secure: yRKneqLvOwJO290lLrvET/BEW+46h9LjKbJYTNsszdMIVfkpm8Ts59vIQMnojs71dJ+b7A6ZiWtHFjKD9/pz7+LIKWLM+dWmaL0VJiZ3S2+XD6Oh9UOC+L+ePIFItVFQOrDpP3FaN8mo339TeFwFNIc+coirYM7ouD9eMg6alpHoqP7Yt9cHMv9OwpxeGW2ZThwVTXQWlAAXG5SAXCsdUFlwJuKzjsr0ePx9V9f5r7Md6fwjQnL9Cc61z7qpEg+UFa+Q4r5P5prgW4OvAD1rVmAMdGbg0Lj8G/hv035pkf0NVFxTzHMYx4qeJREx4AqAAThpzsn/47ZDSVhu9zXnrspLXKbgT7OHwMjOqhvGT9j9yYo9KiwsEa+LnJi67Hi2Vad6FeuIJ/pFnJ0A3DFYMFj0kg6KdkYIhuwur6ZQCuq7vIg8tqjyGyxqWYINLeRccrewGLgmDoI4JT5oNhYXDiLwzn7vOIPTzMZZbteVmy/hXprdJY8Jh/Wn6UTXB82zGfNKl2C8a6I47oHgT2G4Le/BG0MYUBjyfGXAvjZo09l7EAceL9C6NuAbyNLth6cdL7NoeD3PHxv5+1g6xVLaF+cx4ORGC7sa4Rs7PJf3xrWT0KfNTIjtksu8SVtzNZz6wTGxYu/R3qxKIAHRAUtM9DrXS1H4m6qW1At3g1Cw0oI=
file: "$FRAMEWORK_NAME.framework.zip"
skip_cleanup: true
on:
repo: MaxDesiatov/CoreXLSX
tags: true
# - rm -rf /Users/travis/Library/Developer/Xcode/DerivedData/
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "weichsel/ZIPFoundation" ~> 0.9.8
github "MaxDesiatov/XMLCoder" ~> 0.3.1
github "MaxDesiatov/XMLCoder" ~> 0.4.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "MaxDesiatov/XMLCoder" "0.3.1"
github "MaxDesiatov/XMLCoder" "0.4.0"
github "weichsel/ZIPFoundation" "0.9.8"
2 changes: 1 addition & 1 deletion CoreXLSX.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ Excel spreadsheet (XLSX) format support in pure Swift.
# s.public_header_files = 'Pod/Classes/**/*.h'
# s.frameworks = 'UIKit', 'MapKit'
s.dependency 'ZIPFoundation', '~> 0.9.8'
s.dependency 'XMLCoder', '~> 0.3.1'
s.dependency 'XMLCoder', '~> 0.4.0'
end
41 changes: 20 additions & 21 deletions CoreXLSX.xcodeproj/CoreXLSX_Info.plist
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<?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>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Loading