Skip to content

Commit ed6f350

Browse files
authored
Fix SPM warnings (readium#4)
1 parent 769b90d commit ed6f350

File tree

9 files changed

+17
-148
lines changed

9 files changed

+17
-148
lines changed

.github/workflows/checks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,12 @@ jobs:
9292
run: |
9393
xcodebuild build -scheme TestApp -destination "platform=$platform,name=$device"
9494
95-
# Warning: This cannot actually test the state of the current commit, but
96-
# will check that the latest branch/tag set in the Podspecs are valid.
9795
int-cocoapods:
9896
name: Integration (CocoaPods)
97+
# Warning: This job cannot actually test the state of the current commit,
98+
# but will check that the latest branch/tag set in the Podspecs are valid.
99+
# That's the reason for running only with push events.
100+
if: github.event_name == 'push'
99101
runs-on: macos-latest
100102
defaults:
101103
run:

Package.swift

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ let package = Package(
3535
dependencies: ["Fuzi", "SwiftSoup", "Zip"],
3636
path: "Sources/Shared",
3737
exclude: [
38-
"Info.plist",
3938
// Support for ZIPFoundation is not yet achieved.
4039
"Toolkit/Archive/ZIPFoundation.swift",
4140
],
@@ -51,7 +50,6 @@ let package = Package(
5150
name: "R2SharedTests",
5251
dependencies: ["R2Shared"],
5352
path: "Tests/SharedTests",
54-
exclude: ["Info.plist"],
5553
resources: [
5654
.copy("Fixtures"),
5755
]
@@ -67,7 +65,6 @@ let package = Package(
6765
"R2Shared"
6866
],
6967
path: "Sources/Streamer",
70-
exclude: ["Info.plist"],
7168
resources: [
7269
.copy("Assets"),
7370
]
@@ -76,7 +73,6 @@ let package = Package(
7673
name: "R2StreamerTests",
7774
dependencies: ["R2Streamer"],
7875
path: "Tests/StreamerTests",
79-
exclude: ["Info.plist"],
8076
resources: [
8177
.copy("Fixtures"),
8278
]
@@ -91,7 +87,6 @@ let package = Package(
9187
],
9288
path: "Sources/Navigator",
9389
exclude: [
94-
"Info.plist",
9590
"EPUB/Scripts",
9691
],
9792
resources: [
@@ -102,8 +97,7 @@ let package = Package(
10297
.testTarget(
10398
name: "R2NavigatorTests",
10499
dependencies: ["R2Navigator"],
105-
path: "Tests/NavigatorTests",
106-
exclude: ["Info.plist"]
100+
path: "Tests/NavigatorTests"
107101
),
108102

109103
.target(
@@ -112,14 +106,12 @@ let package = Package(
112106
"Fuzi",
113107
"R2Shared"
114108
],
115-
path: "Sources/OPDS",
116-
exclude: ["Info.plist"]
109+
path: "Sources/OPDS"
117110
),
118111
.testTarget(
119112
name: "ReadiumOPDSTests",
120113
dependencies: ["ReadiumOPDS"],
121114
path: "Tests/OPDSTests",
122-
exclude: ["Info.plist"],
123115
resources: [
124116
.copy("Samples"),
125117
]
@@ -134,7 +126,6 @@ let package = Package(
134126
.product(name: "SQLite", package: "SQLite.swift"),
135127
],
136128
path: "Sources/LCP",
137-
exclude: ["Info.plist"],
138129
resources: [
139130
.process("Resources")
140131
]
@@ -145,7 +136,6 @@ let package = Package(
145136
// name: "ReadiumLCPTests",
146137
// dependencies: ["ReadiumLCP"],
147138
// path: "Tests/LCPTests",
148-
// exclude: ["Info.plist"],
149139
// resources: [
150140
// .copy("Fixtures"),
151141
// ]

Tests/LCPTests/Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

Tests/LCPTests/readium-lcp-swiftTests-Bridging-Header.h

Lines changed: 0 additions & 4 deletions
This file was deleted.

Tests/NavigatorTests/Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
1-
//
2-
// r2_navigator_swiftTests.swift
3-
// r2-navigator-swiftTests
4-
//
5-
// Created by Alexandre Camilleri on 8/23/17.
6-
// Copyright © 2017 Readium. All rights reserved.
7-
//
8-
91
import XCTest
102
@testable import R2Navigator
113

12-
class r2_navigator_swiftTests: XCTestCase {
13-
14-
override func setUp() {
15-
super.setUp()
4+
class NavigatorTests: XCTestCase {
5+
6+
override func setUpWithError() throws {
167
// Put setup code here. This method is called before the invocation of each test method in the class.
178
}
18-
19-
override func tearDown() {
9+
10+
override func tearDownWithError() throws {
2011
// Put teardown code here. This method is called after the invocation of each test method in the class.
21-
super.tearDown()
2212
}
23-
24-
func testExample() {
13+
14+
func testExample() throws {
2515
// This is an example of a functional test case.
2616
// Use XCTAssert and related functions to verify your tests produce the correct results.
2717
}
28-
29-
func testPerformanceExample() {
18+
19+
func testPerformanceExample() throws {
3020
// This is an example of a performance test case.
3121
self.measure {
3222
// Put the code you want to measure the time of here.
3323
}
3424
}
35-
25+
3626
}
27+

Tests/OPDSTests/Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

Tests/SharedTests/Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

Tests/StreamerTests/Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)