Skip to content

Commit 92389cd

Browse files
dingoskydingosky
committed
Revert build back to Swift 3
1 parent 1b620ad commit 92389cd

File tree

13 files changed

+733
-998
lines changed

13 files changed

+733
-998
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1
1+
3.1.1

‎EntropyString.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,35 @@
88

99
/* Begin PBXBuildFile section */
1010
E205C6AE1F1BFF66007C139E /* EntropyString.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E205C6A51F1BFF66007C139E /* EntropyString.framework */; };
11-
E205C6BC1F1BFFEC007C139E /* RandomString.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* RandomString.swift */; };
11+
E205C6BC1F1BFFEC007C139E /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* Random.swift */; };
1212
E205C6BD1F1BFFEC007C139E /* Entropy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB81F0EDCAB00DE6DF5 /* Entropy.swift */; };
13-
E205C6C01F1BFFF1007C139E /* EntropyStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB11F0E9DEE00DE6DF5 /* EntropyStringTests.swift */; };
1413
E205C6EB1F1C02E4007C139E /* EntropyString.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E205C6E21F1C02E3007C139E /* EntropyString.framework */; };
15-
E205C6F91F1C030E007C139E /* RandomString.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* RandomString.swift */; };
14+
E205C6F91F1C030E007C139E /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* Random.swift */; };
1615
E205C6FA1F1C030E007C139E /* Entropy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB81F0EDCAB00DE6DF5 /* Entropy.swift */; };
17-
E205C6FD1F1C039F007C139E /* EntropyStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB11F0E9DEE00DE6DF5 /* EntropyStringTests.swift */; };
1816
E21779C81F3E7E260019CC42 /* Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E21779C71F3E7E260019CC42 /* Bytes.swift */; };
1917
E21779C91F3E7E260019CC42 /* Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E21779C71F3E7E260019CC42 /* Bytes.swift */; };
2018
E21779CA1F3E7E260019CC42 /* Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E21779C71F3E7E260019CC42 /* Bytes.swift */; };
2119
E21779CB1F3E7E260019CC42 /* Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E21779C71F3E7E260019CC42 /* Bytes.swift */; };
2220
E287AD9C1F0E9B9A00DE6DF5 /* EntropyString.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E287AD921F0E9B9A00DE6DF5 /* EntropyString.framework */; };
2321
E287ADA31F0E9B9A00DE6DF5 /* EntropyString.h in Headers */ = {isa = PBXBuildFile; fileRef = E287AD951F0E9B9A00DE6DF5 /* EntropyString.h */; settings = {ATTRIBUTES = (Public, ); }; };
24-
E287ADAE1F0E9DDC00DE6DF5 /* RandomString.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* RandomString.swift */; };
22+
E287ADAE1F0E9DDC00DE6DF5 /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* Random.swift */; };
2523
E287ADB51F0E9DEE00DE6DF5 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E287ADB21F0E9DEE00DE6DF5 /* Info.plist */; };
26-
E287ADB71F0E9E8500DE6DF5 /* EntropyStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB11F0E9DEE00DE6DF5 /* EntropyStringTests.swift */; };
2724
E287ADB91F0EDCAB00DE6DF5 /* Entropy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB81F0EDCAB00DE6DF5 /* Entropy.swift */; };
2825
E2B8C8171F3E2B8500171502 /* CharSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8161F3E2B8500171502 /* CharSet.swift */; };
29-
E2B8C81A1F3E60A100171502 /* Bits.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8191F3E60A100171502 /* Bits.swift */; };
30-
E2B8C81F1F3E6E2C00171502 /* Bits.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8191F3E60A100171502 /* Bits.swift */; };
31-
E2B8C8201F3E6E2E00171502 /* Bits.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8191F3E60A100171502 /* Bits.swift */; };
32-
E2B8C8211F3E6E2E00171502 /* Bits.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8191F3E60A100171502 /* Bits.swift */; };
26+
E2D2DD461F436A5F006846F7 /* Entropy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADB81F0EDCAB00DE6DF5 /* Entropy.swift */; };
27+
E2D2DD471F436AB3006846F7 /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = E287ADAD1F0E9DDC00DE6DF5 /* Random.swift */; };
28+
E2D2DD481F436AB6006846F7 /* CharSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8161F3E2B8500171502 /* CharSet.swift */; };
29+
E2D2DD491F436AB7006846F7 /* CharSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8161F3E2B8500171502 /* CharSet.swift */; };
30+
E2D2DD4A1F436AB8006846F7 /* CharSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B8C8161F3E2B8500171502 /* CharSet.swift */; };
3331
E2E1404F1F422C70003E02B0 /* EntropyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E1404E1F422C70003E02B0 /* EntropyTests.swift */; };
3432
E2E140501F422C70003E02B0 /* EntropyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E1404E1F422C70003E02B0 /* EntropyTests.swift */; };
3533
E2E140511F422C70003E02B0 /* EntropyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E1404E1F422C70003E02B0 /* EntropyTests.swift */; };
34+
E2E140531F422FB1003E02B0 /* RandomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E140521F422FB1003E02B0 /* RandomTests.swift */; };
35+
E2E140541F422FB1003E02B0 /* RandomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E140521F422FB1003E02B0 /* RandomTests.swift */; };
36+
E2E140551F422FB1003E02B0 /* RandomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E140521F422FB1003E02B0 /* RandomTests.swift */; };
37+
E2E140571F433A6D003E02B0 /* CharSetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E140561F433A6D003E02B0 /* CharSetTests.swift */; };
38+
E2E140581F433A6D003E02B0 /* CharSetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E140561F433A6D003E02B0 /* CharSetTests.swift */; };
39+
E2E140591F433A6D003E02B0 /* CharSetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E140561F433A6D003E02B0 /* CharSetTests.swift */; };
3640
/* End PBXBuildFile section */
3741

3842
/* Begin PBXContainerItemProxy section */
@@ -70,15 +74,15 @@
7074
E287AD951F0E9B9A00DE6DF5 /* EntropyString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EntropyString.h; sourceTree = "<group>"; };
7175
E287AD961F0E9B9A00DE6DF5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7276
E287AD9B1F0E9B9A00DE6DF5 /* EntropyString-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "EntropyString-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
73-
E287ADAD1F0E9DDC00DE6DF5 /* RandomString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RandomString.swift; sourceTree = "<group>"; };
74-
E287ADB11F0E9DEE00DE6DF5 /* EntropyStringTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntropyStringTests.swift; sourceTree = "<group>"; };
77+
E287ADAD1F0E9DDC00DE6DF5 /* Random.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Random.swift; sourceTree = "<group>"; };
7578
E287ADB21F0E9DEE00DE6DF5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7679
E287ADB81F0EDCAB00DE6DF5 /* Entropy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Entropy.swift; sourceTree = "<group>"; };
7780
E287ADBA1F0EE3B600DE6DF5 /* EntropyString.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = EntropyString.playground; sourceTree = "<group>"; };
7881
E2B8C8161F3E2B8500171502 /* CharSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharSet.swift; sourceTree = "<group>"; };
7982
E2B8C8181F3E2D3400171502 /* Futz.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Futz.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
80-
E2B8C8191F3E60A100171502 /* Bits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bits.swift; sourceTree = "<group>"; };
8183
E2E1404E1F422C70003E02B0 /* EntropyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntropyTests.swift; sourceTree = "<group>"; };
84+
E2E140521F422FB1003E02B0 /* RandomTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RandomTests.swift; sourceTree = "<group>"; };
85+
E2E140561F433A6D003E02B0 /* CharSetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharSetTests.swift; sourceTree = "<group>"; };
8286
/* End PBXFileReference section */
8387

8488
/* Begin PBXFrameworksBuildPhase section */
@@ -175,11 +179,10 @@
175179
E287ADAC1F0E9DDC00DE6DF5 /* Sources */ = {
176180
isa = PBXGroup;
177181
children = (
178-
E287ADAD1F0E9DDC00DE6DF5 /* RandomString.swift */,
182+
E287ADAD1F0E9DDC00DE6DF5 /* Random.swift */,
179183
E2B8C8161F3E2B8500171502 /* CharSet.swift */,
180184
E287ADB81F0EDCAB00DE6DF5 /* Entropy.swift */,
181185
E21779C71F3E7E260019CC42 /* Bytes.swift */,
182-
E2B8C8191F3E60A100171502 /* Bits.swift */,
183186
);
184187
path = Sources;
185188
sourceTree = SOURCE_ROOT;
@@ -195,8 +198,9 @@
195198
E287ADB01F0E9DEE00DE6DF5 /* EntropyStringTests */ = {
196199
isa = PBXGroup;
197200
children = (
201+
E2E140521F422FB1003E02B0 /* RandomTests.swift */,
198202
E2E1404E1F422C70003E02B0 /* EntropyTests.swift */,
199-
E287ADB11F0E9DEE00DE6DF5 /* EntropyStringTests.swift */,
203+
E2E140561F433A6D003E02B0 /* CharSetTests.swift */,
200204
E287ADB21F0E9DEE00DE6DF5 /* Info.plist */,
201205
);
202206
path = EntropyStringTests;
@@ -487,9 +491,9 @@
487491
isa = PBXSourcesBuildPhase;
488492
buildActionMask = 2147483647;
489493
files = (
490-
E2B8C81F1F3E6E2C00171502 /* Bits.swift in Sources */,
491-
E205C6BC1F1BFFEC007C139E /* RandomString.swift in Sources */,
494+
E205C6BC1F1BFFEC007C139E /* Random.swift in Sources */,
492495
E205C6BD1F1BFFEC007C139E /* Entropy.swift in Sources */,
496+
E2D2DD481F436AB6006846F7 /* CharSet.swift in Sources */,
493497
E21779C91F3E7E260019CC42 /* Bytes.swift in Sources */,
494498
);
495499
runOnlyForDeploymentPostprocessing = 0;
@@ -498,18 +502,19 @@
498502
isa = PBXSourcesBuildPhase;
499503
buildActionMask = 2147483647;
500504
files = (
505+
E2E140541F422FB1003E02B0 /* RandomTests.swift in Sources */,
501506
E2E140501F422C70003E02B0 /* EntropyTests.swift in Sources */,
502-
E205C6C01F1BFFF1007C139E /* EntropyStringTests.swift in Sources */,
507+
E2E140581F433A6D003E02B0 /* CharSetTests.swift in Sources */,
503508
);
504509
runOnlyForDeploymentPostprocessing = 0;
505510
};
506511
E205C6DD1F1C02E3007C139E /* Sources */ = {
507512
isa = PBXSourcesBuildPhase;
508513
buildActionMask = 2147483647;
509514
files = (
510-
E2B8C8201F3E6E2E00171502 /* Bits.swift in Sources */,
511-
E205C6F91F1C030E007C139E /* RandomString.swift in Sources */,
515+
E205C6F91F1C030E007C139E /* Random.swift in Sources */,
512516
E205C6FA1F1C030E007C139E /* Entropy.swift in Sources */,
517+
E2D2DD491F436AB7006846F7 /* CharSet.swift in Sources */,
513518
E21779CA1F3E7E260019CC42 /* Bytes.swift in Sources */,
514519
);
515520
runOnlyForDeploymentPostprocessing = 0;
@@ -518,8 +523,9 @@
518523
isa = PBXSourcesBuildPhase;
519524
buildActionMask = 2147483647;
520525
files = (
526+
E2E140551F422FB1003E02B0 /* RandomTests.swift in Sources */,
521527
E2E140511F422C70003E02B0 /* EntropyTests.swift in Sources */,
522-
E205C6FD1F1C039F007C139E /* EntropyStringTests.swift in Sources */,
528+
E2E140591F433A6D003E02B0 /* CharSetTests.swift in Sources */,
523529
);
524530
runOnlyForDeploymentPostprocessing = 0;
525531
};
@@ -528,7 +534,9 @@
528534
buildActionMask = 2147483647;
529535
files = (
530536
E21779CB1F3E7E260019CC42 /* Bytes.swift in Sources */,
531-
E2B8C8211F3E6E2E00171502 /* Bits.swift in Sources */,
537+
E2D2DD461F436A5F006846F7 /* Entropy.swift in Sources */,
538+
E2D2DD4A1F436AB8006846F7 /* CharSet.swift in Sources */,
539+
E2D2DD471F436AB3006846F7 /* Random.swift in Sources */,
532540
);
533541
runOnlyForDeploymentPostprocessing = 0;
534542
};
@@ -537,8 +545,7 @@
537545
buildActionMask = 2147483647;
538546
files = (
539547
E2B8C8171F3E2B8500171502 /* CharSet.swift in Sources */,
540-
E287ADAE1F0E9DDC00DE6DF5 /* RandomString.swift in Sources */,
541-
E2B8C81A1F3E60A100171502 /* Bits.swift in Sources */,
548+
E287ADAE1F0E9DDC00DE6DF5 /* Random.swift in Sources */,
542549
E287ADB91F0EDCAB00DE6DF5 /* Entropy.swift in Sources */,
543550
E21779C81F3E7E260019CC42 /* Bytes.swift in Sources */,
544551
);
@@ -548,8 +555,9 @@
548555
isa = PBXSourcesBuildPhase;
549556
buildActionMask = 2147483647;
550557
files = (
558+
E2E140531F422FB1003E02B0 /* RandomTests.swift in Sources */,
551559
E2E1404F1F422C70003E02B0 /* EntropyTests.swift in Sources */,
552-
E287ADB71F0E9E8500DE6DF5 /* EntropyStringTests.swift in Sources */,
560+
E2E140571F433A6D003E02B0 /* CharSetTests.swift in Sources */,
553561
);
554562
runOnlyForDeploymentPostprocessing = 0;
555563
};
@@ -821,6 +829,7 @@
821829
SDKROOT = iphoneos;
822830
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
823831
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
832+
SWIFT_VERSION = 3.0;
824833
TARGETED_DEVICE_FAMILY = "1,2";
825834
VERSIONING_SYSTEM = "apple-generic";
826835
VERSION_INFO_PREFIX = "";
@@ -873,6 +882,7 @@
873882
MTL_ENABLE_DEBUG_INFO = NO;
874883
SDKROOT = iphoneos;
875884
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
885+
SWIFT_VERSION = 3.0;
876886
TARGETED_DEVICE_FAMILY = "1,2";
877887
VALIDATE_PRODUCT = YES;
878888
VERSIONING_SYSTEM = "apple-generic";
@@ -897,7 +907,7 @@
897907
PRODUCT_NAME = EntropyString;
898908
SKIP_INSTALL = YES;
899909
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
900-
SWIFT_VERSION = 4.0;
910+
SWIFT_VERSION = 3.0;
901911
};
902912
name = Debug;
903913
};
@@ -918,7 +928,7 @@
918928
PRODUCT_NAME = EntropyString;
919929
SKIP_INSTALL = YES;
920930
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
921-
SWIFT_VERSION = 4.0;
931+
SWIFT_VERSION = 3.0;
922932
};
923933
name = Release;
924934
};
@@ -931,7 +941,7 @@
931941
PRODUCT_BUNDLE_IDENTIFIER = io.knoxen.EntropyStringTests;
932942
PRODUCT_NAME = "$(TARGET_NAME)";
933943
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
934-
SWIFT_VERSION = 4.0;
944+
SWIFT_VERSION = 3.0;
935945
};
936946
name = Debug;
937947
};
@@ -944,7 +954,7 @@
944954
PRODUCT_BUNDLE_IDENTIFIER = io.knoxen.EntropyStringTests;
945955
PRODUCT_NAME = "$(TARGET_NAME)";
946956
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
947-
SWIFT_VERSION = 4.0;
957+
SWIFT_VERSION = 3.0;
948958
};
949959
name = Release;
950960
};

‎EntropyString.xcodeproj/xcshareddata/xcschemes/EntropyString.xcscheme‎

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

‎Futz.playground/Contents.swift‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22

33
import EntropyString
44

5-
Bits.total(of: 100000, risk: 1000000)
5+
Entropy.bits(for: 100000, risk: 1000000)
6+
7+
var random = Random(charSet: .charSet64)
8+
random.sessionID()
9+
10+
random = Random(charSet: .charSet16)
11+
random.sessionID()
12+
613

‎Sources/Bits.swift‎

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

0 commit comments

Comments
 (0)