Skip to content

Commit 5580849

Browse files
nvzqznvzqz
committed
Go back to using umbrella header over module
1 parent 419fa5c commit 5580849

File tree

8 files changed

+11
-55
lines changed

8 files changed

+11
-55
lines changed

‎Modules/C/module.map‎

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

‎RandomKit.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
528201241BCAD144001FDD58 /* Bool+RandomKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528201231BCAD144001FDD58 /* Bool+RandomKit.swift */; };
7373
528201251BCAD144001FDD58 /* Bool+RandomKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528201231BCAD144001FDD58 /* Bool+RandomKit.swift */; };
7474
528201261BCAD144001FDD58 /* Bool+RandomKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528201231BCAD144001FDD58 /* Bool+RandomKit.swift */; };
75-
5292C0511BDC9A2000444B9B /* C.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C0501BDC9A2000444B9B /* C.h */; };
76-
5292C0521BDC9A2000444B9B /* C.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C0501BDC9A2000444B9B /* C.h */; };
77-
5292C0531BDC9A2000444B9B /* C.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C0501BDC9A2000444B9B /* C.h */; };
78-
5292C0541BDC9A2000444B9B /* C.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C0501BDC9A2000444B9B /* C.h */; };
75+
5292C07D1BDD1B1900444B9B /* RandomKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C07C1BDD1B1900444B9B /* RandomKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
76+
5292C07E1BDD1B1900444B9B /* RandomKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C07C1BDD1B1900444B9B /* RandomKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
77+
5292C07F1BDD1B1900444B9B /* RandomKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C07C1BDD1B1900444B9B /* RandomKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
78+
5292C0801BDD1B1900444B9B /* RandomKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5292C07C1BDD1B1900444B9B /* RandomKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
7979
52C96A271BD982C500C3CBE0 /* CGFloat+RandomKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 521320C21BCAFD3E00A3D599 /* CGFloat+RandomKit.swift */; };
8080
52C96A281BD982C500C3CBE0 /* CGPoint+RandomKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5265C3661BD5D94000BE2B00 /* CGPoint+RandomKit.swift */; };
8181
52C96A291BD982C500C3CBE0 /* CGSize+RandomKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5265C36A1BD5DE2900BE2B00 /* CGSize+RandomKit.swift */; };
@@ -138,8 +138,7 @@
138138
528201171BCAC395001FDD58 /* String+RandomKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+RandomKit.swift"; sourceTree = "<group>"; };
139139
5282011F1BCAD12C001FDD58 /* Int+RandomKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Int+RandomKit.swift"; sourceTree = "<group>"; };
140140
528201231BCAD144001FDD58 /* Bool+RandomKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bool+RandomKit.swift"; sourceTree = "<group>"; };
141-
5292C0501BDC9A2000444B9B /* C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = C.h; sourceTree = "<group>"; };
142-
5292C0551BDC9A7900444B9B /* module.map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.map; sourceTree = "<group>"; };
141+
5292C07C1BDD1B1900444B9B /* RandomKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomKit.h; sourceTree = "<group>"; };
143142
52C96A1F1BD9828F00C3CBE0 /* RandomKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RandomKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
144143
/* End PBXFileReference section */
145144

@@ -203,7 +202,6 @@
203202
528200851BC9C460001FDD58 = {
204203
isa = PBXGroup;
205204
children = (
206-
5292C04D1BDC98E300444B9B /* Modules */,
207205
528200B41BC9C53B001FDD58 /* RandomKit */,
208206
528200F21BC9FA42001FDD58 /* RandomKitTests */,
209207
528200921BC9C4A2001FDD58 /* Products */,
@@ -237,6 +235,7 @@
237235
528201171BCAC395001FDD58 /* String+RandomKit.swift */,
238236
521D60C71BCF370000CEC3F5 /* SequenceType+RandomKit.swift */,
239237
526BA1FC1BCB77A300495B34 /* CollectionType+RandomKit.swift */,
238+
5292C07C1BDD1B1900444B9B /* RandomKit.h */,
240239
528200B51BC9C53B001FDD58 /* Info.plist */,
241240
);
242241
path = RandomKit;
@@ -251,55 +250,38 @@
251250
path = RandomKitTests;
252251
sourceTree = "<group>";
253252
};
254-
5292C04D1BDC98E300444B9B /* Modules */ = {
255-
isa = PBXGroup;
256-
children = (
257-
5292C04F1BDC99EB00444B9B /* C */,
258-
);
259-
path = Modules;
260-
sourceTree = "<group>";
261-
};
262-
5292C04F1BDC99EB00444B9B /* C */ = {
263-
isa = PBXGroup;
264-
children = (
265-
5292C0551BDC9A7900444B9B /* module.map */,
266-
5292C0501BDC9A2000444B9B /* C.h */,
267-
);
268-
path = C;
269-
sourceTree = "<group>";
270-
};
271253
/* End PBXGroup section */
272254

273255
/* Begin PBXHeadersBuildPhase section */
274256
5282008E1BC9C4A2001FDD58 /* Headers */ = {
275257
isa = PBXHeadersBuildPhase;
276258
buildActionMask = 2147483647;
277259
files = (
278-
5292C0511BDC9A2000444B9B /* C.h in Headers */,
260+
5292C07D1BDD1B1900444B9B /* RandomKit.h in Headers */,
279261
);
280262
runOnlyForDeploymentPostprocessing = 0;
281263
};
282264
5282009C1BC9C4B6001FDD58 /* Headers */ = {
283265
isa = PBXHeadersBuildPhase;
284266
buildActionMask = 2147483647;
285267
files = (
286-
5292C0521BDC9A2000444B9B /* C.h in Headers */,
268+
5292C07E1BDD1B1900444B9B /* RandomKit.h in Headers */,
287269
);
288270
runOnlyForDeploymentPostprocessing = 0;
289271
};
290272
528200A91BC9C4C0001FDD58 /* Headers */ = {
291273
isa = PBXHeadersBuildPhase;
292274
buildActionMask = 2147483647;
293275
files = (
294-
5292C0531BDC9A2000444B9B /* C.h in Headers */,
276+
5292C07F1BDD1B1900444B9B /* RandomKit.h in Headers */,
295277
);
296278
runOnlyForDeploymentPostprocessing = 0;
297279
};
298280
52C96A1C1BD9828F00C3CBE0 /* Headers */ = {
299281
isa = PBXHeadersBuildPhase;
300282
buildActionMask = 2147483647;
301283
files = (
302-
5292C0541BDC9A2000444B9B /* C.h in Headers */,
284+
5292C0801BDD1B1900444B9B /* RandomKit.h in Headers */,
303285
);
304286
runOnlyForDeploymentPostprocessing = 0;
305287
};
@@ -683,7 +665,6 @@
683665
PRODUCT_NAME = RandomKit;
684666
SDKROOT = macosx;
685667
SKIP_INSTALL = YES;
686-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
687668
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
688669
VERSIONING_SYSTEM = "apple-generic";
689670
VERSION_INFO_PREFIX = "";
@@ -734,7 +715,6 @@
734715
PRODUCT_NAME = RandomKit;
735716
SDKROOT = macosx;
736717
SKIP_INSTALL = YES;
737-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
738718
VERSIONING_SYSTEM = "apple-generic";
739719
VERSION_INFO_PREFIX = "";
740720
};
@@ -790,7 +770,6 @@
790770
PRODUCT_NAME = RandomKit;
791771
SDKROOT = iphoneos;
792772
SKIP_INSTALL = YES;
793-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
794773
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
795774
TARGETED_DEVICE_FAMILY = "1,2";
796775
VERSIONING_SYSTEM = "apple-generic";
@@ -841,7 +820,6 @@
841820
PRODUCT_NAME = RandomKit;
842821
SDKROOT = iphoneos;
843822
SKIP_INSTALL = YES;
844-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
845823
TARGETED_DEVICE_FAMILY = "1,2";
846824
VALIDATE_PRODUCT = YES;
847825
VERSIONING_SYSTEM = "apple-generic";
@@ -898,7 +876,6 @@
898876
PRODUCT_NAME = RandomKit;
899877
SDKROOT = watchos;
900878
SKIP_INSTALL = YES;
901-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
902879
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
903880
TARGETED_DEVICE_FAMILY = 4;
904881
VERSIONING_SYSTEM = "apple-generic";
@@ -949,7 +926,6 @@
949926
PRODUCT_NAME = RandomKit;
950927
SDKROOT = watchos;
951928
SKIP_INSTALL = YES;
952-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
953929
TARGETED_DEVICE_FAMILY = 4;
954930
VALIDATE_PRODUCT = YES;
955931
VERSIONING_SYSTEM = "apple-generic";
@@ -1093,7 +1069,6 @@
10931069
PRODUCT_NAME = RandomKit;
10941070
SDKROOT = appletvos;
10951071
SKIP_INSTALL = YES;
1096-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
10971072
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10981073
TARGETED_DEVICE_FAMILY = 3;
10991074
TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -1144,7 +1119,6 @@
11441119
PRODUCT_NAME = RandomKit;
11451120
SDKROOT = appletvos;
11461121
SKIP_INSTALL = YES;
1147-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules/**";
11481122
TARGETED_DEVICE_FAMILY = 3;
11491123
TVOS_DEPLOYMENT_TARGET = 9.0;
11501124
VALIDATE_PRODUCT = YES;

‎RandomKit/Character+RandomKit.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// THE SOFTWARE.
2626
//
2727

28-
import C
29-
3028
extension Character: RandomType {
3129

3230
/// Generates a random `Character`.

‎RandomKit/CollectionType+RandomKit.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// THE SOFTWARE.
2626
//
2727

28-
import C
29-
3028
extension CollectionType {
3129

3230
/// Returns a random element of `self`, or `nil` if `self` is empty.

‎RandomKit/Double+RandomKit.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// THE SOFTWARE.
2626
//
2727

28-
import C
29-
3028
extension Double: RandomType {
3129

3230
/// Generates a random `Double`.

‎RandomKit/Float+RandomKit.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// THE SOFTWARE.
2626
//
2727

28-
import C
29-
3028
extension Float: RandomType {
3129

3230
/// Generates a random `Float`.

‎RandomKit/Int+RandomKit.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// THE SOFTWARE.
2626
//
2727

28-
import C
29-
3028
extension Int: RandomType {
3129

3230
/// Generates a random `Int`.

Modules/C/C.h renamed to RandomKit/RandomKit.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// C.h
2+
// RandomKit.h
33
// RandomKit
44
//
55
// The MIT License (MIT)
@@ -25,9 +25,5 @@
2525
// THE SOFTWARE.
2626
//
2727

28-
#ifndef C_h
29-
#define C_h
30-
3128
#include <stdlib.h>
3229

33-
#endif /* C_h */

0 commit comments

Comments
 (0)