Skip to content

Commit d111fef

Browse files
objectiveSeeobjectiveSee
authored
Merge pull request #5 from 0x7fffffff/master
Fixed Xcode 9 block deprecation warning / updated project settings
2 parents 321d3b1 + b9a1b66 commit d111fef

File tree

5 files changed

+43
-10
lines changed

5 files changed

+43
-10
lines changed

‎DRWindowController.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Pod::Spec.new do |s|
22
s.name = 'DRWindowController'
3-
s.version = '1.0.2'
3+
s.version = '1.0.3'
44
s.platform = :ios
55
s.ios.deployment_target = '5.0'
66
s.license = 'Creative Commons Attribution Non-Commercial License'
77
s.summary = 'An Objective-C / Cocoa Touch class for managing a vertical "stack" of UIViews and UIViewControllers.'
88
s.homepage = 'https://github.com/objectiveSee/DRWindowController'
99

10-
s.source = { :git => 'https://github.com/objectiveSee/DRWindowController.git', :tag => "1.0.2"}
10+
s.source = { :git => 'https://github.com/objectiveSee/DRWindowController.git', :tag => "1.0.3"}
1111
s.source_files = 'DRWindows/DRWindows/DRWindows/DRWindowController*'
1212
s.requires_arc = true
1313
s.author = { "Danny Ricciotti" => "fakeemail@dontemailme.com" }

‎DRWindows/DRWindows.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
isa = PBXProject;
182182
attributes = {
183183
CLASSPREFIX = DR;
184-
LastUpgradeCheck = 0500;
184+
LastUpgradeCheck = 0930;
185185
ORGANIZATIONNAME = "Danny Ricciotti";
186186
TargetAttributes = {
187187
3046D2FA17B5638000CD8B29 = {
@@ -275,30 +275,45 @@
275275
CLANG_CXX_LIBRARY = "libc++";
276276
CLANG_ENABLE_MODULES = YES;
277277
CLANG_ENABLE_OBJC_ARC = YES;
278+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
278279
CLANG_WARN_BOOL_CONVERSION = YES;
280+
CLANG_WARN_COMMA = YES;
279281
CLANG_WARN_CONSTANT_CONVERSION = YES;
282+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
280283
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
281284
CLANG_WARN_EMPTY_BODY = YES;
282285
CLANG_WARN_ENUM_CONVERSION = YES;
286+
CLANG_WARN_INFINITE_RECURSION = YES;
283287
CLANG_WARN_INT_CONVERSION = YES;
288+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
289+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
290+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
284291
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
292+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
293+
CLANG_WARN_STRICT_PROTOTYPES = YES;
294+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
295+
CLANG_WARN_UNREACHABLE_CODE = YES;
285296
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
286297
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
287298
COPY_PHASE_STRIP = NO;
299+
ENABLE_STRICT_OBJC_MSGSEND = YES;
300+
ENABLE_TESTABILITY = YES;
288301
GCC_C_LANGUAGE_STANDARD = gnu99;
289302
GCC_DYNAMIC_NO_PIC = NO;
303+
GCC_NO_COMMON_BLOCKS = YES;
290304
GCC_OPTIMIZATION_LEVEL = 0;
291305
GCC_PREPROCESSOR_DEFINITIONS = (
292306
"DEBUG=1",
293307
"$(inherited)",
294308
);
295309
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
310+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
296311
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
297312
GCC_WARN_UNDECLARED_SELECTOR = YES;
298313
GCC_WARN_UNINITIALIZED_AUTOS = YES;
299314
GCC_WARN_UNUSED_FUNCTION = YES;
300315
GCC_WARN_UNUSED_VARIABLE = YES;
301-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
316+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
302317
ONLY_ACTIVE_ARCH = YES;
303318
SDKROOT = iphoneos;
304319
};
@@ -312,24 +327,38 @@
312327
CLANG_CXX_LIBRARY = "libc++";
313328
CLANG_ENABLE_MODULES = YES;
314329
CLANG_ENABLE_OBJC_ARC = YES;
330+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
315331
CLANG_WARN_BOOL_CONVERSION = YES;
332+
CLANG_WARN_COMMA = YES;
316333
CLANG_WARN_CONSTANT_CONVERSION = YES;
334+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
317335
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
318336
CLANG_WARN_EMPTY_BODY = YES;
319337
CLANG_WARN_ENUM_CONVERSION = YES;
338+
CLANG_WARN_INFINITE_RECURSION = YES;
320339
CLANG_WARN_INT_CONVERSION = YES;
340+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
341+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
342+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
321343
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
344+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
345+
CLANG_WARN_STRICT_PROTOTYPES = YES;
346+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
347+
CLANG_WARN_UNREACHABLE_CODE = YES;
322348
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
323349
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
324350
COPY_PHASE_STRIP = YES;
325351
ENABLE_NS_ASSERTIONS = NO;
352+
ENABLE_STRICT_OBJC_MSGSEND = YES;
326353
GCC_C_LANGUAGE_STANDARD = gnu99;
354+
GCC_NO_COMMON_BLOCKS = YES;
355+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
327356
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
328357
GCC_WARN_UNDECLARED_SELECTOR = YES;
329358
GCC_WARN_UNINITIALIZED_AUTOS = YES;
330359
GCC_WARN_UNUSED_FUNCTION = YES;
331360
GCC_WARN_UNUSED_VARIABLE = YES;
332-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
361+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
333362
SDKROOT = iphoneos;
334363
VALIDATE_PRODUCT = YES;
335364
};
@@ -340,9 +369,11 @@
340369
buildSettings = {
341370
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
342371
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
372+
DEVELOPMENT_TEAM = "";
343373
GCC_PRECOMPILE_PREFIX_HEADER = YES;
344374
GCC_PREFIX_HEADER = "DRWindows/DRWindows-Prefix.pch";
345375
INFOPLIST_FILE = "DRWindows/DRWindows-Info.plist";
376+
PRODUCT_BUNDLE_IDENTIFIER = "us.theredb.${PRODUCT_NAME:rfc1034identifier}";
346377
PRODUCT_NAME = "$(TARGET_NAME)";
347378
WRAPPER_EXTENSION = app;
348379
};
@@ -353,9 +384,11 @@
353384
buildSettings = {
354385
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
355386
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
387+
DEVELOPMENT_TEAM = "";
356388
GCC_PRECOMPILE_PREFIX_HEADER = YES;
357389
GCC_PREFIX_HEADER = "DRWindows/DRWindows-Prefix.pch";
358390
INFOPLIST_FILE = "DRWindows/DRWindows-Info.plist";
391+
PRODUCT_BUNDLE_IDENTIFIER = "us.theredb.${PRODUCT_NAME:rfc1034identifier}";
359392
PRODUCT_NAME = "$(TARGET_NAME)";
360393
WRAPPER_EXTENSION = app;
361394
};

‎DRWindows/DRWindows/DRWindows-Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>us.theredb.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
1616
<string>${PRODUCT_NAME}</string>
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
20+
<string>1.0.3</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1.0</string>
24+
<string>4.0</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>UIRequiredDeviceCapabilities</key>

‎DRWindows/DRWindows/DRWindows/DRWindowController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import <UIKit/UIKit.h>
1010

11-
typedef void (^DRWindowCompletionBlock)();
11+
typedef void (^DRWindowCompletionBlock)(void);
1212

1313
@interface DRWindowController : UIViewController
1414

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ An Objective-C / Cocoa Touch class for managing a vertical "stack" of UIViews an
1111
[CocoaPods](http://cocoapods.org) is a dependency manager for Objective-C, which automates and simplifies the process of using 3rd-party libraries like AFNetworking in your projects. See the ["Getting Started" guide for more information](https://github.com/AFNetworking/AFNetworking/wiki/Getting-Started-with-AFNetworking).
1212

1313
```ruby
14-
pod 'DRWindowController', '~> 1.0'
14+
pod 'DRWindowController', '~> 1.0.3'
1515
```
1616

1717
## Show me what this magic is! ##

0 commit comments

Comments
 (0)