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 deps and downgrade to swift@5.2 #56

Merged
merged 5 commits into from
Apr 28, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/Coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run tests
run: swift test -v --enable-test-discovery --enable-code-coverage
run: swift test -v --enable-code-coverage
- name: Prepare Codecov
run: xcrun llvm-cov export -format="lcov" .build/debug/Hwp-SwiftPackageTests.xctest/Contents/MacOS/Hwp-SwiftPackageTests -instr-profile .build/debug/codecov/default.profdata > raw.lcov
- name: Install lcov
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/Test-Linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Test Linux

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
test:
name: Test Swift@${{ matrix.swift }} on Linux

runs-on: ubuntu-20.04
container: swift:${{ matrix.swift }}-focal
strategy:
fail-fast: false
matrix:
swift: ["5.2", "5.3"]

steps:
- uses: actions/checkout@v2
- name: Run tests
run: |
swift --version
swift test -v --enable-test-discovery
30 changes: 30 additions & 0 deletions .github/workflows/Test-macOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Test macOS

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
test:
name: Test Swift@${{ matrix.swift }} on macOS

runs-on: macos-latest
strategy:
fail-fast: false
matrix:
swift: ["5.2"]

steps:
- uses: actions/checkout@v2
- name: Install swiftenv
run: brew install kylef/formulae/swiftenv
- name: Install and set swift@${{ matrix.swift }}
run: |
swiftenv install ${{ matrix.swift }}
swiftenv global ${{ matrix.swift }}
- name: Run tests
run: |
swift --version
swift test -v --enable-test-discovery
27 changes: 0 additions & 27 deletions .github/workflows/Test.yml

This file was deleted.

1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.2
2 changes: 1 addition & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--swiftversion 5.3
--swiftversion 5.2
29 changes: 3 additions & 26 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.2

import PackageDescription

Expand All @@ -9,9 +9,9 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/CoreOffice/OLEKit.git", .exact("0.3.1")),
.package(url: "https://github.com/tsolomko/SWCompression.git", .exact("4.5.7")),
.package(url: "https://github.com/tsolomko/SWCompression.git", .exact("4.5.8")),

.package(url: "https://github.com/Quick/Nimble", .exact("9.0.0")),
.package(url: "https://github.com/Quick/Nimble", .exact("9.0.1")),
],
targets: [
.target(
Expand All @@ -26,29 +26,6 @@ let package = Package(
dependencies: [
"CoreHwp",
"Nimble",
],
resources: [
.copy("Blank/blank-mac2014vp.hwp"),
.copy("Blank/blank-win2018.hwp"),
.copy("Blank/blank-win2020.hwp"),

.copy("Noori/noori.hwp"),

.copy("Versions/2007.hwp"),
.copy("Versions/2014VP.hwp"),

.copy("FileHeader/변경내용추적.hwp"),
.copy("FileHeader/문서암호설정-보안수준보통.hwp"),
.copy("FileHeader/문서암호설정-보안수준높음.hwp"),
.copy("FileHeader/공공누리.hwp"),
.copy("FileHeader/문서이력관리.hwp"),
.copy("FileHeader/배포용문서.hwp"),
.copy("FileHeader/CCL.hwp"),

.copy("DocInfo/CharShape/CharShape.hwp"),
.copy("DocInfo/CharShape/CharShapeProperty.hwp"),

.copy("DocInfo/BinData/BinData.hwp"),
]
),
]
Expand Down