Skip to content

Commit 5976233

Browse files
skywinderskywinder
committed
Merge branch 'develop' into master
2 parents 3b4d1e6 + e0c8424 commit 5976233

File tree

367 files changed

+12701
-11610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+12701
-11610
lines changed

‎Cartfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github "attaswift/BigInt" == 4.0
2-
github "attaswift/SipHash" == 1.2.2
3-
github "daltoniam/Starscream" == 3.1.0
4-
github "krzyzanowskim/CryptoSwift" == 1.0.0
5-
github "mxcl/PromiseKit" == 6.8.4
1+
github "attaswift/BigInt" ~> 5.0
2+
github "attaswift/SipHash" ~> 1.2.2
3+
github "daltoniam/Starscream" ~> 3.1.0
4+
github "krzyzanowskim/CryptoSwift" ~> 1.0.0
5+
github "mxcl/PromiseKit" ~> 6.8.4

‎Cartfile.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github "attaswift/BigInt" "v4.0.0"
1+
github "attaswift/BigInt" "v5.2.0"
22
github "attaswift/SipHash" "v1.2.2"
3-
github "daltoniam/Starscream" "3.1.0"
4-
github "krzyzanowskim/CryptoSwift" "1.0.0"
5-
github "mxcl/PromiseKit" "6.8.4"
3+
github "daltoniam/Starscream" "3.1.1"
4+
github "krzyzanowskim/CryptoSwift" "1.3.2"
5+
github "mxcl/PromiseKit" "6.13.3"

‎Carthage/Checkouts/BigInt/.gitmodules

Whitespace-only changes.

‎Carthage/Checkouts/BigInt/.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
language: objective-c
2-
osx_image: xcode10.2
1+
language: swift
2+
osx_image: xcode11
33
script:
44
- swift build
55
- swift test
66
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-macOS test
7-
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-iOS
7+
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-iOS -destination generic/platform=iOS
88
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-watchOS
99
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-tvOS
1010
after_success: bash <(curl -s https://codecov.io/bash)

‎Carthage/Checkouts/BigInt/BigInt.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |spec|
33
spec.name = 'BigInt'
4-
spec.version = '4.0.0'
4+
spec.version = '5.2.0'
55
spec.ios.deployment_target = "8.0"
66
spec.osx.deployment_target = "10.9"
77
spec.tvos.deployment_target = "9.0"
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
1111
spec.homepage = 'https://github.com/attaswift/BigInt'
1212
spec.author = 'Károly Lőrentey'
1313
spec.source = { :git => 'https://github.com/attaswift/BigInt.git', :tag => 'v' + String(spec.version) }
14-
spec.source_files = 'sources/*.swift'
14+
spec.source_files = 'Sources/*.swift'
1515
spec.social_media_url = 'https://twitter.com/lorentey'
1616
spec.documentation_url = 'http://attaswift.github.io/BigInt/'
1717
end

‎Carthage/Checkouts/BigInt/BigInt.xcodeproj/project.pbxproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -533,16 +533,16 @@
533533
isa = PBXProject;
534534
attributes = {
535535
LastSwiftUpdateCheck = 0730;
536-
LastUpgradeCheck = 1020;
536+
LastUpgradeCheck = 1100;
537537
ORGANIZATIONNAME = "Károly Lőrentey";
538538
TargetAttributes = {
539539
BBB55AB11C8F80020050DDA9 = {
540540
CreatedOnToolsVersion = 7.3;
541-
LastSwiftMigration = 0810;
541+
LastSwiftMigration = 1020;
542542
};
543543
BBB55ABB1C8F80020050DDA9 = {
544544
CreatedOnToolsVersion = 7.3;
545-
LastSwiftMigration = 0800;
545+
LastSwiftMigration = 1020;
546546
};
547547
BBB55AD31C8F88F20050DDA9 = {
548548
CreatedOnToolsVersion = 7.3;
@@ -841,7 +841,7 @@
841841
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
842842
APPLICATION_EXTENSION_API_ONLY = NO;
843843
COMBINE_HIDPI_IMAGES = YES;
844-
INFOPLIST_FILE = tests/BigIntTests/Info.plist;
844+
INFOPLIST_FILE = Tests/BigIntTests/Info.plist;
845845
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
846846
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).Tests";
847847
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -855,7 +855,7 @@
855855
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
856856
APPLICATION_EXTENSION_API_ONLY = NO;
857857
COMBINE_HIDPI_IMAGES = YES;
858-
INFOPLIST_FILE = tests/BigIntTests/Info.plist;
858+
INFOPLIST_FILE = Tests/BigIntTests/Info.plist;
859859
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
860860
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).Tests";
861861
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -919,7 +919,7 @@
919919
OTHER_SWIFT_FLAGS = "-DDebug";
920920
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
921921
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
922-
SWIFT_VERSION = 4.0;
922+
SWIFT_VERSION = 5.0;
923923
VERSION_INFO_PREFIX = "";
924924
};
925925
name = Debug;
@@ -973,7 +973,7 @@
973973
OTHER_SWIFT_FLAGS = "-DProfile";
974974
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
975975
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
976-
SWIFT_VERSION = 4.0;
976+
SWIFT_VERSION = 5.0;
977977
VALIDATE_PRODUCT = YES;
978978
VERSION_INFO_PREFIX = "";
979979
};
@@ -983,7 +983,7 @@
983983
isa = XCBuildConfiguration;
984984
buildSettings = {
985985
CLANG_ENABLE_MODULES = YES;
986-
CODE_SIGN_IDENTITY = "iPhone Developer";
986+
CODE_SIGN_IDENTITY = "";
987987
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
988988
DEFINES_MODULE = YES;
989989
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -994,6 +994,7 @@
994994
PRODUCT_NAME = "$(PROJECT_NAME)";
995995
SDKROOT = iphoneos;
996996
SKIP_INSTALL = YES;
997+
SUPPORTS_MACCATALYST = YES;
997998
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
998999
TARGETED_DEVICE_FAMILY = "1,2";
9991000
};
@@ -1003,7 +1004,7 @@
10031004
isa = XCBuildConfiguration;
10041005
buildSettings = {
10051006
CLANG_ENABLE_MODULES = YES;
1006-
CODE_SIGN_IDENTITY = "iPhone Developer";
1007+
CODE_SIGN_IDENTITY = "";
10071008
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
10081009
DEFINES_MODULE = YES;
10091010
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1014,6 +1015,7 @@
10141015
PRODUCT_NAME = "$(PROJECT_NAME)";
10151016
SDKROOT = iphoneos;
10161017
SKIP_INSTALL = YES;
1018+
SUPPORTS_MACCATALYST = YES;
10171019
TARGETED_DEVICE_FAMILY = "1,2";
10181020
};
10191021
name = Release;
@@ -1124,7 +1126,6 @@
11241126
SDKROOT = watchos;
11251127
SKIP_INSTALL = YES;
11261128
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1127-
SWIFT_VERSION = 5.0;
11281129
TARGETED_DEVICE_FAMILY = 4;
11291130
};
11301131
name = Debug;
@@ -1143,7 +1144,6 @@
11431144
PRODUCT_NAME = "$(PROJECT_NAME)";
11441145
SDKROOT = watchos;
11451146
SKIP_INSTALL = YES;
1146-
SWIFT_VERSION = 5.0;
11471147
TARGETED_DEVICE_FAMILY = 4;
11481148
};
11491149
name = Release;

‎Carthage/Checkouts/BigInt/BigInt.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Carthage/Checkouts/BigInt/BigInt.xcodeproj/xcshareddata/xcschemes/BigInt Benchmark.xcscheme

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,8 +10,8 @@
1010
buildConfiguration = "Release"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
disableMainThreadChecker = "YES"
14-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
disableMainThreadChecker = "YES">
1515
<Testables>
1616
<TestableReference
1717
skipped = "NO">
@@ -24,8 +24,6 @@
2424
</BuildableReference>
2525
</TestableReference>
2626
</Testables>
27-
<AdditionalOptions>
28-
</AdditionalOptions>
2927
</TestAction>
3028
<LaunchAction
3129
buildConfiguration = "Release"
@@ -37,8 +35,6 @@
3735
debugDocumentVersioning = "YES"
3836
debugServiceExtension = "internal"
3937
allowLocationSimulation = "YES">
40-
<AdditionalOptions>
41-
</AdditionalOptions>
4238
</LaunchAction>
4339
<ProfileAction
4440
buildConfiguration = "Release"

‎Carthage/Checkouts/BigInt/BigInt.xcodeproj/xcshareddata/xcschemes/BigInt-iOS.xcscheme

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "BBB55AB11C8F80020050DDA9"
35+
BuildableName = "BigInt.framework"
36+
BlueprintName = "BigInt-iOS"
37+
ReferencedContainer = "container:BigInt.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "BBB55AB11C8F80020050DDA9"
47-
BuildableName = "BigInt.framework"
48-
BlueprintName = "BigInt-iOS"
49-
ReferencedContainer = "container:BigInt.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:BigInt.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎Carthage/Checkouts/BigInt/BigInt.xcodeproj/xcshareddata/xcschemes/BigInt-macOS.xcscheme

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "BBB55AD31C8F88F20050DDA9"
35+
BuildableName = "BigInt.framework"
36+
BlueprintName = "BigInt-macOS"
37+
ReferencedContainer = "container:BigInt.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "BBB55AD31C8F88F20050DDA9"
47-
BuildableName = "BigInt.framework"
48-
BlueprintName = "BigInt-macOS"
49-
ReferencedContainer = "container:BigInt.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:BigInt.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

0 commit comments

Comments
 (0)