Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 06977e8

Browse files
zwaldowskizwaldowski
committed
Merge branch 'next' into HEAD
2 parents a7eeef8 + 4cd0e1e commit 06977e8

145 files changed

Lines changed: 3099 additions & 2588 deletions

File tree

Some content is hidden

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

‎BlocksKit.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
2222
end
2323

2424
s.subspec 'Core' do |ss|
25-
ss.source_files = 'BlocksKit/BlocksKit.h', 'BlocksKit/Core/*.{h,m}'
25+
ss.source_files = 'BlocksKit/BlocksKit.h', "BlocksKit/BKDefines.h", 'BlocksKit/Core/*.{h,m}'
2626
end
2727

2828
s.subspec 'DynamicDelegate' do |ss|

‎BlocksKit.xcodeproj/project.pbxproj‎

Lines changed: 1197 additions & 1379 deletions
Large diffs are not rendered by default.

BlocksKit.xcodeproj/xcshareddata/xcschemes/Mac Demo.xcscheme renamed to BlocksKit.xcodeproj/xcshareddata/xcschemes/BlocksKit (Mac).xcscheme

Lines changed: 34 additions & 20 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 = "0510"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,67 +14,81 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "DBFB0A86184DCBCC00F37EEE"
18-
BuildableName = "BlocksKit Mac Demo.app"
19-
BlueprintName = "Mac Demo"
17+
BlueprintIdentifier = "DB9B96361B3A52E500940D20"
18+
BuildableName = "BlocksKit.framework"
19+
BlueprintName = "BlocksKit"
2020
ReferencedContainer = "container:BlocksKit.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2829
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
30+
codeCoverageEnabled = "YES">
3031
<Testables>
32+
<TestableReference
33+
skipped = "NO">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "DB9B963F1B3A52E500940D20"
37+
BuildableName = "BlocksKitTests.xctest"
38+
BlueprintName = "BlocksKitTests"
39+
ReferencedContainer = "container:BlocksKit.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
3142
</Testables>
3243
<MacroExpansion>
3344
<BuildableReference
3445
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "DBFB0A86184DCBCC00F37EEE"
36-
BuildableName = "BlocksKit Mac Demo.app"
37-
BlueprintName = "Mac Demo"
46+
BlueprintIdentifier = "DB9B96361B3A52E500940D20"
47+
BuildableName = "BlocksKit.framework"
48+
BlueprintName = "BlocksKit"
3849
ReferencedContainer = "container:BlocksKit.xcodeproj">
3950
</BuildableReference>
4051
</MacroExpansion>
52+
<AdditionalOptions>
53+
</AdditionalOptions>
4154
</TestAction>
4255
<LaunchAction
56+
buildConfiguration = "Debug"
4357
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4458
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4559
launchStyle = "0"
4660
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4861
ignoresPersistentStateOnLaunch = "NO"
4962
debugDocumentVersioning = "YES"
63+
debugServiceExtension = "internal"
5064
allowLocationSimulation = "YES">
51-
<BuildableProductRunnable>
65+
<MacroExpansion>
5266
<BuildableReference
5367
BuildableIdentifier = "primary"
54-
BlueprintIdentifier = "DBFB0A86184DCBCC00F37EEE"
55-
BuildableName = "BlocksKit Mac Demo.app"
56-
BlueprintName = "Mac Demo"
68+
BlueprintIdentifier = "DB9B96361B3A52E500940D20"
69+
BuildableName = "BlocksKit.framework"
70+
BlueprintName = "BlocksKit"
5771
ReferencedContainer = "container:BlocksKit.xcodeproj">
5872
</BuildableReference>
59-
</BuildableProductRunnable>
73+
</MacroExpansion>
6074
<AdditionalOptions>
6175
</AdditionalOptions>
6276
</LaunchAction>
6377
<ProfileAction
78+
buildConfiguration = "Release"
6479
shouldUseLaunchSchemeArgsEnv = "YES"
6580
savedToolIdentifier = ""
6681
useCustomWorkingDirectory = "NO"
67-
buildConfiguration = "Release"
6882
debugDocumentVersioning = "YES">
69-
<BuildableProductRunnable>
83+
<MacroExpansion>
7084
<BuildableReference
7185
BuildableIdentifier = "primary"
72-
BlueprintIdentifier = "DBFB0A86184DCBCC00F37EEE"
73-
BuildableName = "BlocksKit Mac Demo.app"
74-
BlueprintName = "Mac Demo"
86+
BlueprintIdentifier = "DB9B96361B3A52E500940D20"
87+
BuildableName = "BlocksKit.framework"
88+
BlueprintName = "BlocksKit"
7589
ReferencedContainer = "container:BlocksKit.xcodeproj">
7690
</BuildableReference>
77-
</BuildableProductRunnable>
91+
</MacroExpansion>
7892
</ProfileAction>
7993
<AnalyzeAction
8094
buildConfiguration = "Debug">

BlocksKit.xcodeproj/xcshareddata/xcschemes/BlocksKit Mac.xcscheme renamed to BlocksKit.xcodeproj/xcshareddata/xcschemes/BlocksKit (iOS).xcscheme

Lines changed: 40 additions & 9 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 = "0510"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,50 +14,81 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "DBFB092B184DC36400F37EEE"
17+
BlueprintIdentifier = "DB9B96171B3A52A700940D20"
1818
BuildableName = "BlocksKit.framework"
19-
BlueprintName = "BlocksKit Mac"
19+
BlueprintName = "MobileBlocksKit"
2020
ReferencedContainer = "container:BlocksKit.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2829
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
30+
codeCoverageEnabled = "YES">
3031
<Testables>
3132
<TestableReference
3233
skipped = "NO">
3334
<BuildableReference
3435
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "DBFB0940184DC36400F37EEE"
36-
BuildableName = "BlocksKit-Mac-Tests.xctest"
37-
BlueprintName = "BlocksKit Mac Tests"
36+
BlueprintIdentifier = "DB9B96211B3A52A700940D20"
37+
BuildableName = "BlocksKitTests.xctest"
38+
BlueprintName = "MobileBlocksKitTests"
3839
ReferencedContainer = "container:BlocksKit.xcodeproj">
3940
</BuildableReference>
4041
</TestableReference>
4142
</Testables>
43+
<MacroExpansion>
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "DB9B96171B3A52A700940D20"
47+
BuildableName = "BlocksKit.framework"
48+
BlueprintName = "MobileBlocksKit"
49+
ReferencedContainer = "container:BlocksKit.xcodeproj">
50+
</BuildableReference>
51+
</MacroExpansion>
52+
<AdditionalOptions>
53+
</AdditionalOptions>
4254
</TestAction>
4355
<LaunchAction
56+
buildConfiguration = "Debug"
4457
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4558
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4659
launchStyle = "0"
4760
useCustomWorkingDirectory = "NO"
48-
buildConfiguration = "Debug"
4961
ignoresPersistentStateOnLaunch = "NO"
5062
debugDocumentVersioning = "YES"
63+
debugServiceExtension = "internal"
5164
allowLocationSimulation = "YES">
65+
<MacroExpansion>
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "DB9B96171B3A52A700940D20"
69+
BuildableName = "BlocksKit.framework"
70+
BlueprintName = "MobileBlocksKit"
71+
ReferencedContainer = "container:BlocksKit.xcodeproj">
72+
</BuildableReference>
73+
</MacroExpansion>
5274
<AdditionalOptions>
5375
</AdditionalOptions>
5476
</LaunchAction>
5577
<ProfileAction
78+
buildConfiguration = "Release"
5679
shouldUseLaunchSchemeArgsEnv = "YES"
5780
savedToolIdentifier = ""
5881
useCustomWorkingDirectory = "NO"
59-
buildConfiguration = "Release"
6082
debugDocumentVersioning = "YES">
83+
<MacroExpansion>
84+
<BuildableReference
85+
BuildableIdentifier = "primary"
86+
BlueprintIdentifier = "DB9B96171B3A52A700940D20"
87+
BuildableName = "BlocksKit.framework"
88+
BlueprintName = "MobileBlocksKit"
89+
ReferencedContainer = "container:BlocksKit.xcodeproj">
90+
</BuildableReference>
91+
</MacroExpansion>
6192
</ProfileAction>
6293
<AnalyzeAction
6394
buildConfiguration = "Debug">

‎BlocksKit.xcodeproj/xcshareddata/xcschemes/BlocksKit iOS.xcscheme‎

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

‎BlocksKit/BKDefines.h‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
//
2+
// BKDefines.h
3+
// BlocksKit
4+
5+
#pragma once
6+
7+
#import <Foundation/NSObjCRuntime.h>
8+
9+
#ifndef __has_builtin
10+
#define __has_builtin(x) 0
11+
#endif
12+
#ifndef __has_include
13+
#define __has_include(x) 0
14+
#endif
15+
#ifndef __has_feature
16+
#define __has_feature(x) 0
17+
#endif
18+
#ifndef __has_attribute
19+
#define __has_attribute(x) 0
20+
#endif
21+
#ifndef __has_extension
22+
#define __has_extension(x) 0
23+
#endif
24+
25+
#if !defined(NS_ASSUME_NONNULL_BEGIN)
26+
# if __has_feature(assume_nonnull)
27+
# define NS_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
28+
# define NS_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
29+
# else
30+
# define NS_ASSUME_NONNULL_BEGIN
31+
# define NS_ASSUME_NONNULL_END
32+
# endif
33+
#endif
34+
35+
#if !__has_feature(nullability)
36+
# define nonnull
37+
# define nullable
38+
# define null_unspecified
39+
# define __nonnull
40+
# define __nullable
41+
# define __null_unspecified
42+
#endif
43+
44+
#if __has_feature(objc_generics)
45+
# define __GENERICS(class, ...) class<__VA_ARGS__>
46+
# define __GENERICS_TYPE(type) type
47+
#else
48+
# define __GENERICS(class, ...) class
49+
# define __GENERICS_TYPE(type) id
50+
#endif
51+
52+
#if !defined(BK_INITIALIZER)
53+
# if __has_attribute(objc_method_family)
54+
# define BK_INITIALIZER __attribute__((objc_method_family(init)))
55+
# else
56+
# define BK_INITIALIZER
57+
# endif
58+
#endif
59+
60+
#if !defined(BK_ALERT_CONTROLLER_DEPRECATED)
61+
# define BK_ALERT_CONTROLLER_DEPRECATED NS_DEPRECATED_IOS(2_0, 8_0, "The BlocksKit extensions for UIAlertView and UIActionSheet are deprecated. Use UIAlertController instead.");
62+
#endif
63+
64+
#if !defined(BK_URL_CONNECTION_DEPRECATED)
65+
# define BK_URL_CONNECTION_DEPRECATED NS_DEPRECATED(10_5, 10_11, 2_0, 9_0, "The BlocksKit extensions for NSURLConnection are deprecated. Use NSURLSession instead.");
66+
#endif

‎BlocksKit/BlocksKit+MessageUI.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// BlocksKit+MessageUI
2+
// BlocksKit MessageUI Extensions
33
//
44
// The Objective-C block utilities you always wish you had.
55
//
@@ -25,5 +25,7 @@
2525
// THE SOFTWARE.
2626
//
2727

28+
#import <BlocksKit/BlocksKit.h>
29+
2830
#import <BlocksKit/MFMailComposeViewController+BlocksKit.h>
2931
#import <BlocksKit/MFMessageComposeViewController+BlocksKit.h>

‎BlocksKit/BlocksKit+QuickLook.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// BlocksKit+QuickLook
2+
// BlocksKit QuickLook Extensions
33
//
44
// The Objective-C block utilities you always wish you had.
55
//
@@ -24,4 +24,6 @@
2424
// THE SOFTWARE.
2525
//
2626

27+
#import <BlocksKit/BlocksKit.h>
28+
2729
#import <BlocksKit/QLPreviewController+BlocksKit.h>

0 commit comments

Comments
 (0)