Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on May 10, 2025. It is now read-only.
/CombineXPublic archive

Commitf7d34be

Browse files
committed
remove CXCompatible
1 parent7152f6a commitf7d34be

File tree

11 files changed

+34
-229
lines changed

11 files changed

+34
-229
lines changed

‎Package.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ let package = Package(
66
name:"CombineX",
77
products:[
88
.library(name:"CombineX", targets:["CombineX","CXFoundation"]),
9-
.library(name:"CXCompatible", targets:["CXCompatible"]),
109
],
1110
targets:[
1211
.target(name:"CXUtility"),
1312
.target(name:"CombineX", dependencies:["CXUtility"]),
1413
.target(name:"CXFoundation", dependencies:["CXUtility","CombineX"]),
15-
.target(name:"CXCompatible"),
1614
]
1715
)

‎Package@swift-5.2.swift‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import Foundation
66
vartestCombine=ProcessInfo.processInfo.environment["CX_TEST_COMBINE"]!=nil
77
// uncommenet the following line to test against combine
88
// testCombine = true
9-
letswiftSetting:[SwiftSetting]= testCombine?[.define("USE_COMBINE")]:[.define("USE_COMBINEX")]
9+
letcombineImpFlag:[SwiftSetting]= testCombine?[.define("USE_COMBINE")]:[.define("USE_COMBINEX")]
1010
letshimDep:[Target.Dependency]= testCombine?["CXCompatible"]:["CombineX","CXFoundation"]
1111

1212
letpackage=Package(
1313
name:"CombineX",
1414
products:[
1515
.library(name:"CombineX", targets:["CombineX","CXFoundation"]),
16-
.library(name:"CXCompatible", targets:["CXCompatible"]),
1716
],
1817
dependencies:[
1918
.package(url:"https://github.com/Quick/Quick.git", from:"3.0.0"),
@@ -24,13 +23,37 @@ let package = Package(
2423
.target(name:"CXUtility"),
2524
.target(name:"CombineX", dependencies:["CXUtility"]),
2625
.target(name:"CXFoundation", dependencies:["CXUtility","CombineX"]),
27-
.target(name:"CXCompatible"),
28-
.target(name:"_CXShim", dependencies: shimDep, swiftSettings: swiftSetting),
29-
.target(name:"_CXTest", dependencies:["_CXShim"], swiftSettings:[.define("CX_PRIVATE_SHIM")]),
30-
.target(name:"CXTestUtility", dependencies:["CXUtility","_CXShim","_CXTest","Semver","Quick","Nimble"], swiftSettings: swiftSetting),
31-
.testTarget(name:"CombineXTests", dependencies:["CXTestUtility","CXUtility","Quick","Nimble"], swiftSettings: swiftSetting),
32-
.testTarget(name:"CXFoundationTests", dependencies:["CXTestUtility","Quick","Nimble"]),
33-
.testTarget(name:"CXInconsistentTests", dependencies:["CXTestUtility","CXUtility","Quick","Nimble"]),
26+
27+
// We have circular dependency CombineXTests -> CXTest -> CXShim -> CombineX
28+
//
29+
// Use git submodule instead of SPM dependency. also add underscore
30+
// prefix to prevent name collision
31+
.target(
32+
name:"_CXCompatible"),
33+
.target(
34+
name:"_CXShim",
35+
dependencies: shimDep,
36+
swiftSettings:[.define("CX_PRIVATE_SHIM")]+ combineImpFlag),
37+
.target(
38+
name:"_CXTest",
39+
dependencies:["_CXShim"],
40+
swiftSettings:[.define("CX_PRIVATE_SHIM")]),
41+
42+
43+
.target(
44+
name:"CXTestUtility",
45+
dependencies:["CXUtility","_CXShim","_CXTest","Semver","Quick","Nimble"],
46+
swiftSettings: combineImpFlag),
47+
.testTarget(
48+
name:"CombineXTests",
49+
dependencies:["CXTestUtility","CXUtility","Quick","Nimble"],
50+
swiftSettings: combineImpFlag),
51+
.testTarget(
52+
name:"CXFoundationTests",
53+
dependencies:["CXTestUtility","Quick","Nimble"]),
54+
.testTarget(
55+
name:"CXInconsistentTests",
56+
dependencies:["CXTestUtility","CXUtility","Quick","Nimble"]),
3457
]
3558
)
3659

‎Sources/CXCompatible/CXNamespace.swift‎

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

‎Sources/CXCompatible/Dispatch.swift‎

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

‎Sources/CXCompatible/Foundation.swift‎

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

‎Sources/CXCompatible/Polyfill/FlatMap.swift‎

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

‎Sources/CXCompatible/Polyfill/Optional.swift‎

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

‎Sources/CXCompatible/Polyfill/SwitchToLatest.swift‎

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

‎Sources/CXCompatible/Swift.swift‎

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp