Skip to content

Commit e67c2a9

Browse files
committed
Fix SPM package source folder issue
1 parent cc16ad7 commit e67c2a9

File tree

9 files changed

+58
-29
lines changed

9 files changed

+58
-29
lines changed

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FileWatcherExample.xcodeproj/project.pbxproj

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,29 @@
7878
/* End PBXFrameworksBuildPhase section */
7979

8080
/* Begin PBXGroup section */
81-
F1C21770228FF106005B445B = {
81+
F19D311B2625DEF00006AED8 /* Sources */ = {
82+
isa = PBXGroup;
83+
children = (
84+
F19D311C2625DEF00006AED8 /* FileWatcher */,
85+
);
86+
path = Sources;
87+
sourceTree = "<group>";
88+
};
89+
F19D311C2625DEF00006AED8 /* FileWatcher */ = {
8290
isa = PBXGroup;
8391
children = (
8492
F1C2178A228FF1D2005B445B /* FileWatcher.swift */,
8593
F1C217A6228FF962005B445B /* FileWatcher+Type.swift */,
8694
F1C217A4228FF953005B445B /* FileWatcher+Action.swift */,
8795
F1C2178B228FF1D2005B445B /* FileWatcherEvent.swift */,
96+
);
97+
path = FileWatcher;
98+
sourceTree = "<group>";
99+
};
100+
F1C21770228FF106005B445B = {
101+
isa = PBXGroup;
102+
children = (
103+
F19D311B2625DEF00006AED8 /* Sources */,
88104
F1C2177B228FF106005B445B /* FileWatcherExample */,
89105
F1C21794228FF1FA005B445B /* FileWatcher_macOS */,
90106
F1C2177A228FF106005B445B /* Products */,

Package.swift

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
1-
// swift-tools-version:5.3
2-
1+
// swift-tools-version:5.2
32
import PackageDescription
4-
53
let package = Package(
6-
name: "FileWatcher",
7-
platforms: [
8-
.macOS(.v10_12),
9-
],
10-
products: [
11-
.library(
12-
name: "FileWatcher",
13-
targets: ["FileWatcher"]
14-
),
15-
],
16-
targets: [
17-
.target(
18-
name: "FileWatcher",
19-
dependencies: [],
20-
path: "./",
21-
exclude: ["FileWatcherExample", "FileWatcherExample.xcodeproj", "FileWatcher.podspec"]
22-
)
23-
],
24-
swiftLanguageVersions: [.v4]
4+
name: "FileWatcher",
5+
products: [
6+
.library(
7+
name: "FileWatcher",
8+
targets: ["FileWatcher"])
9+
],
10+
dependencies: [],
11+
targets: [
12+
.target(
13+
name: "FileWatcher",
14+
dependencies: []),
15+
.testTarget(
16+
name: "FileWatcherTests",
17+
dependencies: ["FileWatcher"])
18+
]
2519
)

FileWatcher+Action.swift renamed to Sources/FileWatcher/FileWatcher+Action.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Cocoa
2-
32
/**
43
* Actions
54
*/

FileWatcher+Type.swift renamed to Sources/FileWatcher/FileWatcher+Type.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Cocoa
2-
32
/**
43
* Callback signature
54
*/
File renamed without changes.

FileWatcherEvent.swift renamed to Sources/FileWatcher/FileWatcherEvent.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public class FileWatcherEvent {
2525
* - Remark: Be aware that .DS_STORE changes frequently when other files change
2626
*/
2727
extension FileWatcherEvent {
28-
/*general*/
28+
// General
2929
var fileChange: Bool { (flags & FSEventStreamEventFlags(kFSEventStreamEventFlagItemIsFile)) != 0 }
3030
var dirChange: Bool { (flags & FSEventStreamEventFlags(kFSEventStreamEventFlagItemIsDir)) != 0 }
31-
/*CRUD*/
31+
// CRUD
3232
var created: Bool { (flags & FSEventStreamEventFlags(kFSEventStreamEventFlagItemCreated)) != 0 }
3333
var removed: Bool { (flags & FSEventStreamEventFlags(kFSEventStreamEventFlagItemRemoved)) != 0 }
3434
var renamed: Bool { (flags & FSEventStreamEventFlags(kFSEventStreamEventFlagItemRenamed)) != 0 }
@@ -38,12 +38,12 @@ extension FileWatcherEvent {
3838
* Convenince
3939
*/
4040
extension FileWatcherEvent {
41-
/*File*/
41+
// File
4242
public var fileCreated: Bool { fileChange && created }
4343
public var fileRemoved: Bool { fileChange && removed }
4444
public var fileRenamed: Bool { fileChange && renamed }
4545
public var fileModified: Bool { fileChange && modified }
46-
/*Directory*/
46+
// Directory
4747
public var dirCreated: Bool { dirChange && created }
4848
public var dirRemoved: Bool { dirChange && removed }
4949
public var dirRenamed: Bool { dirChange && renamed }
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import XCTest
2+
@testable import FileWatcher
3+
4+
final class FileWatcherTests: XCTestCase {
5+
func testExample() {
6+
// This is an example of a functional test case.
7+
// Use XCTAssert and related functions to verify your tests produce the correct
8+
// results.
9+
XCTAssertEqual("Hello, World!", "Hello, World!")
10+
}
11+
static var allTests = [
12+
("testExample", testExample)
13+
]
14+
}

0 commit comments

Comments
 (0)