Skip to content

Commit 2389c34

Browse files
SomeRandomiOSDevSomeRandomiOSDev
authored
Merge pull request #11 from SomeRandomiOSDev/CarthageDependency
Removed Carthage dependency requirement for development
2 parents a6b929e + 9fcd21a commit 2389c34

File tree

11 files changed

+129
-45
lines changed

11 files changed

+129
-45
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Complex.xcodeproj/project.xcworkspace
1+
Complex.xcodeproj/project.xcworkspace/xcuserdata
22
Complex.xcodeproj/xcuserdata
33
.swiftpm
44
Carthage
55
gyb.pyc
66
.build
7-
Package.resolved
7+
IDEWorkspaceChecks.plist

‎.swiftlint.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ opt_in_rules:
5757

5858
reporter: "xcode"
5959

60-
excluded:
61-
- Carthage
62-
6360
identifier_name:
6461
excluded:
6562
- i

‎.travis.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@ os: osx
22
language: swift
33
osx_image: xcode11.3
44
xcode_project: Complex.xcodeproj
5-
addons:
6-
homebrew:
7-
packages:
8-
carthage
95

106
script:
11-
- carthage bootstrap
12-
137
- set -o pipefail && travis_retry xcodebuild -scheme "Complex" -destination "platform=iOS Simulator,name=iPhone 11 Pro Max" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
148
- set -o pipefail && travis_retry xcodebuild -scheme "Complex macOS" -destination "platform=macOS" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
159
- set -o pipefail && travis_retry xcodebuild -scheme "Complex tvOS" -destination "platform=tvOS Simulator,name=Apple TV 4K" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test

‎Cartfile.private‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Cartfile.resolved‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Complex.xcodeproj/project.pbxproj‎

Lines changed: 85 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -32,6 +32,9 @@
3232
/* End PBXAggregateTarget section */
3333

3434
/* Begin PBXBuildFile section */
35+
DD0793442412F03000EF65B4 /* Half in Frameworks */ = {isa = PBXBuildFile; productRef = DD0793432412F03000EF65B4 /* Half */; };
36+
DD0793462412F03400EF65B4 /* Half in Frameworks */ = {isa = PBXBuildFile; productRef = DD0793452412F03400EF65B4 /* Half */; };
37+
DD0793482412F03700EF65B4 /* Half in Frameworks */ = {isa = PBXBuildFile; productRef = DD0793472412F03700EF65B4 /* Half */; };
3538
DD6F08BE24001B9A00749359 /* ComplexOverflowingArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6F08BD24001B9A00749359 /* ComplexOverflowingArithmetic.swift */; };
3639
DD6F08BF24001B9A00749359 /* ComplexOverflowingArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6F08BD24001B9A00749359 /* ComplexOverflowingArithmetic.swift */; };
3740
DD6F08C024001B9A00749359 /* ComplexOverflowingArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6F08BD24001B9A00749359 /* ComplexOverflowingArithmetic.swift */; };
@@ -53,9 +56,6 @@
5356
DDB8121123F5AEB10079FEB5 /* ComplexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB8121023F5AEB10079FEB5 /* ComplexTests.swift */; };
5457
DDB8121223F5AEB10079FEB5 /* ComplexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB8121023F5AEB10079FEB5 /* ComplexTests.swift */; };
5558
DDB8121323F5AEB10079FEB5 /* ComplexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB8121023F5AEB10079FEB5 /* ComplexTests.swift */; };
56-
DDB8121D23F63B960079FEB5 /* Half.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDB8121C23F63B900079FEB5 /* Half.framework */; };
57-
DDB8121E23F63BB60079FEB5 /* Half.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDB8121B23F63B890079FEB5 /* Half.framework */; };
58-
DDB8121F23F63BBA0079FEB5 /* Half.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDB8121A23F63B800079FEB5 /* Half.framework */; };
5959
DDB8122123F656AC0079FEB5 /* FunctionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB8122023F656AC0079FEB5 /* FunctionsTests.swift */; };
6060
DDB8122223F656AC0079FEB5 /* FunctionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB8122023F656AC0079FEB5 /* FunctionsTests.swift */; };
6161
DDB8122323F656AC0079FEB5 /* FunctionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB8122023F656AC0079FEB5 /* FunctionsTests.swift */; };
@@ -76,7 +76,7 @@
7676
/* End PBXBuildFile section */
7777

7878
/* Begin PBXContainerItemProxy section */
79-
DDB8127723FA5C380079FEB5 /* PBXContainerItemProxy */ = {
79+
DD07933E2412E54500EF65B4 /* PBXContainerItemProxy */ = {
8080
isa = PBXContainerItemProxy;
8181
containerPortal = DDFEEC2A23EF13900096015C /* Project object */;
8282
proxyType = 1;
@@ -163,10 +163,6 @@
163163
DDB8120623F59B760079FEB5 /* Complex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Complex.swift; sourceTree = "<group>"; };
164164
DDB8120B23F5A8E80079FEB5 /* Functions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
165165
DDB8121023F5AEB10079FEB5 /* ComplexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplexTests.swift; sourceTree = "<group>"; };
166-
DDB8121423F634770079FEB5 /* Cartfile.private */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.private; sourceTree = "<group>"; };
167-
DDB8121A23F63B800079FEB5 /* Half.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Half.framework; path = Carthage/Build/tvOS/Half.framework; sourceTree = "<group>"; };
168-
DDB8121B23F63B890079FEB5 /* Half.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Half.framework; path = Carthage/Build/Mac/Half.framework; sourceTree = "<group>"; };
169-
DDB8121C23F63B900079FEB5 /* Half.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Half.framework; path = Carthage/Build/iOS/Half.framework; sourceTree = "<group>"; };
170166
DDB8122023F656AC0079FEB5 /* FunctionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FunctionsTests.swift; sourceTree = "<group>"; };
171167
DDB8125823F707EE0079FEB5 /* Operators.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
172168
DDB8126123F7B1C90079FEB5 /* ComplexArithmetic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplexArithmetic.swift; sourceTree = "<group>"; };
@@ -206,7 +202,7 @@
206202
buildActionMask = 2147483647;
207203
files = (
208204
DDFEEC3D23EF13910096015C /* Complex.framework in Frameworks */,
209-
DDB8121D23F63B960079FEB5 /* Half.framework in Frameworks */,
205+
DD0793442412F03000EF65B4 /* Half in Frameworks */,
210206
);
211207
runOnlyForDeploymentPostprocessing = 0;
212208
};
@@ -222,7 +218,7 @@
222218
buildActionMask = 2147483647;
223219
files = (
224220
DDFEECC723F2001A0096015C /* Complex.framework in Frameworks */,
225-
DDB8121E23F63BB60079FEB5 /* Half.framework in Frameworks */,
221+
DD0793462412F03400EF65B4 /* Half in Frameworks */,
226222
);
227223
runOnlyForDeploymentPostprocessing = 0;
228224
};
@@ -238,7 +234,7 @@
238234
buildActionMask = 2147483647;
239235
files = (
240236
DDFEECE323F2003E0096015C /* Complex.framework in Frameworks */,
241-
DDB8121F23F63BBA0079FEB5 /* Half.framework in Frameworks */,
237+
DD0793482412F03700EF65B4 /* Half in Frameworks */,
242238
);
243239
runOnlyForDeploymentPostprocessing = 0;
244240
};
@@ -260,16 +256,6 @@
260256
path = Tests;
261257
sourceTree = "<group>";
262258
};
263-
DDB8121523F63B2C0079FEB5 /* Frameworks */ = {
264-
isa = PBXGroup;
265-
children = (
266-
DDB8121C23F63B900079FEB5 /* Half.framework */,
267-
DDB8121B23F63B890079FEB5 /* Half.framework */,
268-
DDB8121A23F63B800079FEB5 /* Half.framework */,
269-
);
270-
name = Frameworks;
271-
sourceTree = "<group>";
272-
};
273259
DDB8126A23FA2B810079FEB5 /* Utils */ = {
274260
isa = PBXGroup;
275261
children = (
@@ -284,7 +270,6 @@
284270
children = (
285271
DDFEEC3523EF13900096015C /* Complex */,
286272
DDFEEC3423EF13900096015C /* Products */,
287-
DDB8121523F63B2C0079FEB5 /* Frameworks */,
288273
);
289274
sourceTree = "<group>";
290275
};
@@ -339,7 +324,6 @@
339324
isa = PBXGroup;
340325
children = (
341326
DDFEECAB23F1BA550096015C /* Complex.podspec */,
342-
DDB8121423F634770079FEB5 /* Cartfile.private */,
343327
DDFEECAC23F1BA550096015C /* Package.swift */,
344328
DD6F08D02400808300749359 /* codecov.yml */,
345329
DDFEECAE23F1BA5E0096015C /* .swiftlint.yml */,
@@ -411,10 +395,12 @@
411395
buildRules = (
412396
);
413397
dependencies = (
414-
DDB8127823FA5C380079FEB5 /* PBXTargetDependency */,
398+
DD07933F2412E54500EF65B4 /* PBXTargetDependency */,
415399
DDFEECB323F1BB5B0096015C /* PBXTargetDependency */,
416400
);
417401
name = Complex;
402+
packageProductDependencies = (
403+
);
418404
productName = Complex;
419405
productReference = DDFEEC3323EF13900096015C /* Complex.framework */;
420406
productType = "com.apple.product-type.framework";
@@ -430,9 +416,13 @@
430416
buildRules = (
431417
);
432418
dependencies = (
419+
DDB1DF8E240C520C00C20FED /* PBXTargetDependency */,
433420
DDFEEC3F23EF13910096015C /* PBXTargetDependency */,
434421
);
435422
name = ComplexTests;
423+
packageProductDependencies = (
424+
DD0793432412F03000EF65B4 /* Half */,
425+
);
436426
productName = ComplexTests;
437427
productReference = DDFEEC3C23EF13910096015C /* ComplexTests.xctest */;
438428
productType = "com.apple.product-type.bundle.unit-test";
@@ -468,9 +458,13 @@
468458
buildRules = (
469459
);
470460
dependencies = (
461+
DDB1DF90240C521000C20FED /* PBXTargetDependency */,
471462
DDFEECC923F2001A0096015C /* PBXTargetDependency */,
472463
);
473464
name = "Complex macOS Tests";
465+
packageProductDependencies = (
466+
DD0793452412F03400EF65B4 /* Half */,
467+
);
474468
productName = "Complex macOSTests";
475469
productReference = DDFEECC623F2001A0096015C /* ComplexTests.xctest */;
476470
productType = "com.apple.product-type.bundle.unit-test";
@@ -506,9 +500,13 @@
506500
buildRules = (
507501
);
508502
dependencies = (
503+
DDB1DF92240C521500C20FED /* PBXTargetDependency */,
509504
DDFEECE523F2003E0096015C /* PBXTargetDependency */,
510505
);
511506
name = "Complex tvOS Tests";
507+
packageProductDependencies = (
508+
DD0793472412F03700EF65B4 /* Half */,
509+
);
512510
productName = "Complex tvOSTests";
513511
productReference = DDFEECE223F2003E0096015C /* ComplexTests.xctest */;
514512
productType = "com.apple.product-type.bundle.unit-test";
@@ -588,6 +586,9 @@
588586
Base,
589587
);
590588
mainGroup = DDFEEC2923EF13900096015C;
589+
packageReferences = (
590+
DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */,
591+
);
591592
productRefGroup = DDFEEC3423EF13900096015C /* Products */;
592593
projectDirPath = "";
593594
projectRoot = "";
@@ -675,6 +676,7 @@
675676
outputPaths = (
676677
"$(SRCROOT)/Sources/Complex/Functions.swift",
677678
"$(SRCROOT)/Tests/ComplexTests/FunctionsTests.swift",
679+
"$(SRCROOT)/Sources/Complex/Complex.swift",
678680
);
679681
runOnlyForDeploymentPostprocessing = 0;
680682
shellPath = /bin/sh;
@@ -788,10 +790,22 @@
788790
/* End PBXSourcesBuildPhase section */
789791

790792
/* Begin PBXTargetDependency section */
791-
DDB8127823FA5C380079FEB5 /* PBXTargetDependency */ = {
793+
DD07933F2412E54500EF65B4 /* PBXTargetDependency */ = {
792794
isa = PBXTargetDependency;
793795
target = DDB8127223FA5C0C0079FEB5 /* Generate Sources */;
794-
targetProxy = DDB8127723FA5C380079FEB5 /* PBXContainerItemProxy */;
796+
targetProxy = DD07933E2412E54500EF65B4 /* PBXContainerItemProxy */;
797+
};
798+
DDB1DF8E240C520C00C20FED /* PBXTargetDependency */ = {
799+
isa = PBXTargetDependency;
800+
productRef = DDB1DF8D240C520C00C20FED /* Half */;
801+
};
802+
DDB1DF90240C521000C20FED /* PBXTargetDependency */ = {
803+
isa = PBXTargetDependency;
804+
productRef = DDB1DF8F240C521000C20FED /* Half */;
805+
};
806+
DDB1DF92240C521500C20FED /* PBXTargetDependency */ = {
807+
isa = PBXTargetDependency;
808+
productRef = DDB1DF91240C521500C20FED /* Half */;
795809
};
796810
DDB8127A23FA5C3E0079FEB5 /* PBXTargetDependency */ = {
797811
isa = PBXTargetDependency;
@@ -1451,6 +1465,50 @@
14511465
defaultConfigurationName = Release;
14521466
};
14531467
/* End XCConfigurationList section */
1468+
1469+
/* Begin XCRemoteSwiftPackageReference section */
1470+
DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */ = {
1471+
isa = XCRemoteSwiftPackageReference;
1472+
repositoryURL = "https://github.com/SomeRandomiOSDev/Half.git";
1473+
requirement = {
1474+
kind = upToNextMajorVersion;
1475+
minimumVersion = 1.2.0;
1476+
};
1477+
};
1478+
/* End XCRemoteSwiftPackageReference section */
1479+
1480+
/* Begin XCSwiftPackageProductDependency section */
1481+
DD0793432412F03000EF65B4 /* Half */ = {
1482+
isa = XCSwiftPackageProductDependency;
1483+
package = DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */;
1484+
productName = Half;
1485+
};
1486+
DD0793452412F03400EF65B4 /* Half */ = {
1487+
isa = XCSwiftPackageProductDependency;
1488+
package = DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */;
1489+
productName = Half;
1490+
};
1491+
DD0793472412F03700EF65B4 /* Half */ = {
1492+
isa = XCSwiftPackageProductDependency;
1493+
package = DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */;
1494+
productName = Half;
1495+
};
1496+
DDB1DF8D240C520C00C20FED /* Half */ = {
1497+
isa = XCSwiftPackageProductDependency;
1498+
package = DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */;
1499+
productName = Half;
1500+
};
1501+
DDB1DF8F240C521000C20FED /* Half */ = {
1502+
isa = XCSwiftPackageProductDependency;
1503+
package = DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */;
1504+
productName = Half;
1505+
};
1506+
DDB1DF91240C521500C20FED /* Half */ = {
1507+
isa = XCSwiftPackageProductDependency;
1508+
package = DDB1DF8A240C51F900C20FED /* XCRemoteSwiftPackageReference "Half" */;
1509+
productName = Half;
1510+
};
1511+
/* End XCSwiftPackageProductDependency section */
14541512
};
14551513
rootObject = DDFEEC2A23EF13900096015C /* Project object */;
14561514
}

‎Complex.xcodeproj/project.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.

‎Complex.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

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

‎Package.resolved‎

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

‎Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ let package = Package(
1212
],
1313

1414
products: [
15-
.library(name: "Complex", type: .dynamic, targets: ["Complex"])
15+
.library(name: "Complex", targets: ["Complex"])
1616
],
1717

1818
dependencies: [
19-
.package(url: "https://github.com/SomeRandomiOSDev/Half", from: "1.0.1")
19+
.package(url: "https://github.com/SomeRandomiOSDev/Half", from: "1.2.0")
2020
],
2121

2222
targets: [
2323
.target(name: "Complex"),
2424
.testTarget(name: "ComplexTests", dependencies: ["Complex", "Half"])
2525
],
2626

27-
swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")]
27+
swiftLanguageVersions: [.version("4.2"), .version("5")]
2828
)

0 commit comments

Comments
 (0)