Skip to content

Commit 21d8024

Browse files
author
Elviro Rocca
committed
fixed package manifest + building and testing with swift
1 parent d0945ba commit 21d8024

File tree

6 files changed

+39
-35
lines changed

6 files changed

+39
-35
lines changed

‎Abstract.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@
9696
380A4B311F1BF83B002D70E0 /* SemiringTests.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 380A4B301F1BF83B002D70E0 /* SemiringTests.generated.swift */; };
9797
380A4B321F1BF83B002D70E0 /* SemiringTests.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 380A4B301F1BF83B002D70E0 /* SemiringTests.generated.swift */; };
9898
380A4B331F1BF83B002D70E0 /* SemiringTests.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 380A4B301F1BF83B002D70E0 /* SemiringTests.generated.swift */; };
99-
38273AD51F248569000AB0C8 /* CustomArbitraryTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38273AD41F248569000AB0C8 /* CustomArbitraryTypes.swift */; };
100-
38273AD61F248569000AB0C8 /* CustomArbitraryTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38273AD41F248569000AB0C8 /* CustomArbitraryTypes.swift */; };
101-
38273AD71F248569000AB0C8 /* CustomArbitraryTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38273AD41F248569000AB0C8 /* CustomArbitraryTypes.swift */; };
102-
38273AD91F2485FB000AB0C8 /* Arbitrary.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38273AD81F2485FB000AB0C8 /* Arbitrary.generated.swift */; };
103-
38273ADA1F2485FB000AB0C8 /* Arbitrary.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38273AD81F2485FB000AB0C8 /* Arbitrary.generated.swift */; };
104-
38273ADB1F2485FB000AB0C8 /* Arbitrary.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38273AD81F2485FB000AB0C8 /* Arbitrary.generated.swift */; };
10599
38A14E4F1F2A2D9C00A2900C /* Abstract.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0950FF011EFC5C7900513DF7 /* Abstract.framework */; };
106100
38A14E501F2A2DAB00A2900C /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0951F2421F09690200EA362C /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
107101
38A14E521F2A2DC300A2900C /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0951F2441F09690200EA362C /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -177,11 +171,11 @@
177171
380A4B241F1BF5AC002D70E0 /* CommutativeMonoidTests.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommutativeMonoidTests.generated.swift; sourceTree = "<group>"; };
178172
380A4B291F1BF66B002D70E0 /* BoundedSemilatticeTests.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BoundedSemilatticeTests.generated.swift; sourceTree = "<group>"; };
179173
380A4B301F1BF83B002D70E0 /* SemiringTests.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SemiringTests.generated.swift; sourceTree = "<group>"; };
180-
38273AD41F248569000AB0C8 /* CustomArbitraryTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomArbitraryTypes.swift; sourceTree = "<group>"; };
181-
38273AD81F2485FB000AB0C8 /* Arbitrary.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Arbitrary.generated.swift; sourceTree = "<group>"; };
182174
3853BF9D1EF11D7400791099 /* Wrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Wrapper.swift; sourceTree = "<group>"; };
183175
3853BF9F1EF1294400791099 /* Semiring.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Semiring.swift; sourceTree = "<group>"; };
184176
38757E101F4D85AB0059AD71 /* Templates */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Templates; sourceTree = "<group>"; };
177+
387A1DBF1F7909A000928A8C /* Arbitrary.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arbitrary.generated.swift; sourceTree = "<group>"; };
178+
387A1DC01F7909A000928A8C /* CustomArbitraryTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomArbitraryTypes.swift; sourceTree = "<group>"; };
185179
38943A681EEC25AE00F587AD /* HomomorphismTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomomorphismTests.swift; sourceTree = "<group>"; };
186180
38943A761EEC31DA00F587AD /* Adapters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Adapters.swift; sourceTree = "<group>"; };
187181
38943A781EEC4EFF00F587AD /* Monoid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Monoid.swift; sourceTree = "<group>"; };
@@ -280,11 +274,11 @@
280274
path = Abstract;
281275
sourceTree = "<group>";
282276
};
283-
38273AD31F248569000AB0C8 /* Utility */ = {
277+
387A1DBE1F7909A000928A8C /* Utility */ = {
284278
isa = PBXGroup;
285279
children = (
286-
38273AD81F2485FB000AB0C8 /* Arbitrary.generated.swift */,
287-
38273AD41F248569000AB0C8 /* CustomArbitraryTypes.swift */,
280+
387A1DBF1F7909A000928A8C /* Arbitrary.generated.swift */,
281+
387A1DC01F7909A000928A8C /* CustomArbitraryTypes.swift */,
288282
);
289283
path = Utility;
290284
sourceTree = "<group>";
@@ -339,14 +333,14 @@
339333
children = (
340334
38D737C11EE9A711000BAF0C /* LinuxMain.swift */,
341335
38D737BF1EE9A711000BAF0C /* AbstractTests */,
342-
38273AD31F248569000AB0C8 /* Utility */,
343336
);
344337
path = Tests;
345338
sourceTree = "<group>";
346339
};
347340
38D737BF1EE9A711000BAF0C /* AbstractTests */ = {
348341
isa = PBXGroup;
349342
children = (
343+
387A1DBE1F7909A000928A8C /* Utility */,
350344
380A4B291F1BF66B002D70E0 /* BoundedSemilatticeTests.generated.swift */,
351345
380A4B241F1BF5AC002D70E0 /* CommutativeMonoidTests.generated.swift */,
352346
38943A681EEC25AE00F587AD /* HomomorphismTests.swift */,
@@ -677,8 +671,6 @@
677671
isa = PBXSourcesBuildPhase;
678672
buildActionMask = 2147483647;
679673
files = (
680-
38273AD61F248569000AB0C8 /* CustomArbitraryTypes.swift in Sources */,
681-
38273ADA1F2485FB000AB0C8 /* Arbitrary.generated.swift in Sources */,
682674
380A4B321F1BF83B002D70E0 /* SemiringTests.generated.swift in Sources */,
683675
380A4B211F1BE383002D70E0 /* MonoidTests.generated.swift in Sources */,
684676
380A4B1B1F1B775F002D70E0 /* WrapperTests.generated.swift in Sources */,
@@ -716,8 +708,6 @@
716708
isa = PBXSourcesBuildPhase;
717709
buildActionMask = 2147483647;
718710
files = (
719-
38273AD71F248569000AB0C8 /* CustomArbitraryTypes.swift in Sources */,
720-
38273ADB1F2485FB000AB0C8 /* Arbitrary.generated.swift in Sources */,
721711
380A4B331F1BF83B002D70E0 /* SemiringTests.generated.swift in Sources */,
722712
380A4B221F1BE383002D70E0 /* MonoidTests.generated.swift in Sources */,
723713
380A4B1C1F1B775F002D70E0 /* WrapperTests.generated.swift in Sources */,
@@ -777,8 +767,6 @@
777767
isa = PBXSourcesBuildPhase;
778768
buildActionMask = 2147483647;
779769
files = (
780-
38273AD51F248569000AB0C8 /* CustomArbitraryTypes.swift in Sources */,
781-
38273AD91F2485FB000AB0C8 /* Arbitrary.generated.swift in Sources */,
782770
380A4B311F1BF83B002D70E0 /* SemiringTests.generated.swift in Sources */,
783771
380A4B201F1BE383002D70E0 /* MonoidTests.generated.swift in Sources */,
784772
380A4B1A1F1B775F002D70E0 /* WrapperTests.generated.swift in Sources */,

‎Package.resolved‎

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

‎Package.swift‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
import Foundation
44
import PackageDescription
55

6-
// HACK from https://github.com/ReactiveCocoa/ReactiveSwift/blob/master/Package.swift
7-
var isSwiftPMTest: Bool {
8-
return ProcessInfo.processInfo.environment["SWIFTPM_TEST_Abstract"] == "YES"
9-
}
10-
116
let package = Package(
12-
name: "Abstract",
13-
dependencies: [
14-
.package(url: "https://github.com/typelift/Operadics.git",
15-
from: Version(0,0,0))
16-
] + (isSwiftPMTest ? [.package(url: "https://github.com/typelift/SwiftCheck.git",
17-
Version(0,6,0)..<Version(1,0,0))]
18-
: [])
7+
name: "Abstract",
8+
products: [
9+
.library(
10+
name: "Abstract",
11+
targets: ["Abstract"])
12+
],
13+
dependencies: [
14+
.package(url: "https://github.com/typelift/Operadics.git",
15+
from: Version(0,0,0)),
16+
.package(url: "https://github.com/typelift/SwiftCheck.git",
17+
from: Version(0,6,0))
18+
],
19+
targets: [
20+
.target(
21+
name: "Abstract",
22+
dependencies: ["Operadics"]),
23+
.testTarget(
24+
name: "AbstractTests",
25+
dependencies: ["Abstract","SwiftCheck"])
26+
]
1927
)
20-

Tests/Utility/Arbitrary.generated.swift renamed to Tests/AbstractTests/Utility/Arbitrary.generated.swift

File renamed without changes.

Tests/Utility/CustomArbitraryTypes.swift renamed to Tests/AbstractTests/Utility/CustomArbitraryTypes.swift

File renamed without changes.

‎sourceryTests.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ if [ -f "Sourcery/sourcery" ]; then
2121

2222
./Sourcery/sourcery --sources Sources/Abstract --templates Templates/Tests --output Tests/AbstractTests
2323

24-
echo "Generating utility files for tests: Sources/Abstract + Templates/Other -> Tests/Utility"
24+
echo "Generating utility files for tests: Sources/Abstract + Templates/Other -> Tests/AbstractTests/Utility"
2525

26-
./Sourcery/sourcery --sources Sources/Abstract --templates Templates/Other --output Tests/Utility
26+
./Sourcery/sourcery --sources Sources/Abstract --templates Templates/Other --output Tests/AbstractTests/Utility
2727

2828
else
2929
echo "Sourcery is not installed, ignoring."

0 commit comments

Comments
 (0)