Minor update to build on XCode 7

jkuziel · Aug 25, 2015 · ec0eec8 · ec0eec8
1 parent c5891e6
commit ec0eec8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 26 deletions.
diff --git a/QuickDialog.podspec b/QuickDialog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'QuickDialog'
-  s.version  = '1.0'
+  s.version  = '1.0.1'
   s.platform = :ios, '5.0'
   s.license  = 'Apache License, Version 2.0'
   s.summary  = 'Quick and easy dialog screens for iOS.'

diff --git a/QuickDialog.xcodeproj/project.pbxproj b/QuickDialog.xcodeproj/project.pbxproj
@@ -614,8 +614,6 @@
 				D87A4D6D169DABA900D4DD63 /* QElement+Appearance.m */,
 				D811F89213EC905B00E3922B /* QElement.h */,
 				D811F89313EC905B00E3922B /* QElement.m */,
-				D8B39449151394E1008ECB34 /* QEmptyListElement.h */,
-				D8B3944A151394E1008ECB34 /* QEmptyListElement.m */,
 				D811F89413EC905B00E3922B /* QEntryElement.h */,
 				D811F89513EC905B00E3922B /* QEntryElement.m */,
 				D811F89613EC905B00E3922B /* QEntryTableViewCell.h */,
@@ -634,10 +632,6 @@
 				D811F89B13EC905B00E3922B /* QLabelElement.m */,
 				D8F180E813F0599A009B0CBD /* QLoadingElement.h */,
 				D8F180E813F0599A009B0CBB /* QLoadingElement.m */,
-				D8B3944B151394E1008ECB34 /* QMultilineElement.h */,
-				D8B3944C151394E1008ECB34 /* QMultilineElement.m */,
-				D8B3944E151394E1008ECB34 /* QMultilineTextViewController.h */,
-				D8B3944F151394E1008ECB34 /* QMultilineTextViewController.m */,
 				D82A4AF117BEE90E000986C8 /* QProgressElement.h */,
 				D82A4AF217BEE90E000986C8 /* QProgressElement.m */,
 				D811F8AE13EC905B00E3922B /* QRadioElement.h */,
@@ -654,8 +648,6 @@
 				D811F8B513EC905B00E3922B /* QRootElement.m */,
 				D811F8B613EC905B00E3922B /* QSection.h */,
 				D811F8B713EC905B00E3922B /* QSection.m */,
-				D8B394671514E8B3008ECB34 /* QSegmentedElement.h */,
-				D8B394681514E8B3008ECB34 /* QSegmentedElement.m */,
 				F2E614A0151CA1A100F36976 /* QSelectItemElement.h */,
 				F2E614A1151CA1A100F36976 /* QSelectItemElement.m */,
 				F2E6149C151C9E4D00F36976 /* QSelectSection.h */,
@@ -671,9 +663,7 @@
 				D8F180E813F0599A009B0C9E /* QuickDialog.h */,
 				5C50E22D2B906D69252BE7B4 /* QuickDialogController+Animations.h */,
 				5C50EBF53D28B761CBA809FF /* QuickDialogController+Animations.m */,
-				F2F23A26152DD48B00EB6688 /* QuickDialogController+Helpers.h */,
 				D8B39449151394E1008ECB34 /* QEmptyListElement.h */,
-				F2F23A26152DD48B00EB6686 /* QuickDialogController+Helpers.m */,
 				D8B3944A151394E1008ECB34 /* QEmptyListElement.m */,
 				D811F8A413EC905B00E3922B /* QuickDialogController+Loading.h */,
 				D811F8A513EC905B00E3922B /* QuickDialogController+Loading.m */,
@@ -689,9 +679,7 @@
 				D811F8AA13EC905B00E3922B /* QuickDialogTableDelegate.m */,
 				D811F8AB13EC905B00E3922B /* QuickDialogTableView.h */,
 				D811F8AC13EC905B00E3922B /* QuickDialogTableView.m */,
-				D8F180E813F0599A009B0CD3 /* QuickDialogWebController.h */,
 				D8B3944B151394E1008ECB34 /* QMultilineElement.h */,
-				D8F180E813F0599A009B0CD1 /* QuickDialogWebController.m */,
 				D8B3944C151394E1008ECB34 /* QMultilineElement.m */,
 				D811F8AD13EC905B00E3922B /* quickform-Prefix.pch */,
 				D8B3944E151394E1008ECB34 /* QMultilineTextViewController.h */,
@@ -840,7 +828,7 @@
 		D80B0E2A13E052DF00FA85CA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 			};
 			buildConfigurationList = D80B0E2D13E052DF00FA85CA /* Build configuration list for PBXProject "QuickDialog" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1050,11 +1038,15 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1087,10 +1079,13 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -1117,6 +1112,7 @@
 				INFOPLIST_FILE = "sample/quickdialogexample-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.escoz.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1133,6 +1129,7 @@
 				INFOPLIST_FILE = "sample/quickdialogexample-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.escoz.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/extras/QPickerElement.m b/extras/QPickerElement.m
@@ -2,6 +2,9 @@
 #import "QPickerTableViewCell.h"
 #import "QPickerTabDelimitedStringParser.h"
 
+
+NSString * const QPickerTableViewCellIdentifier = @"QPickerTableViewCell";
+
 @implementation QPickerElement
 {
 @private
@@ -35,7 +38,7 @@ - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView contr
 {
     QPickerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:QPickerTableViewCellIdentifier];
     if (cell == nil) {
-        cell = [[QPickerTableViewCell alloc] init];
+        cell = [[QPickerTableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:QPickerTableViewCellIdentifier];
     }
     [cell applyAppearanceForElement:self];
 

diff --git a/extras/QPickerTableViewCell.h b/extras/QPickerTableViewCell.h
@@ -8,8 +8,6 @@
 
 #import "QEntryTableViewCell.h"
 
-NSString * const QPickerTableViewCellIdentifier;
-
 @interface QPickerTableViewCell : QEntryTableViewCell <UIPickerViewDataSource, UIPickerViewDelegate>
 {
     UIPickerView *_pickerView;

diff --git a/extras/QPickerTableViewCell.m b/extras/QPickerTableViewCell.m
@@ -10,7 +10,6 @@
 #import "QuickDialog.h"
 #import "QPickerElement.h"
 
-NSString * const QPickerTableViewCellIdentifier = @"QPickerTableViewCell";
 
 @interface QPickerTableViewCell ()
 @property (nonatomic, readonly) QPickerElement *pickerElement;
@@ -20,9 +19,9 @@ @implementation QPickerTableViewCell
 
 @synthesize pickerView = _pickerView;
 
-- (QPickerTableViewCell *)init
+- (QPickerTableViewCell *)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
-    if ((self = [self initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:QPickerTableViewCellIdentifier]))
+    if ((self = [self initWithStyle:style reuseIdentifier:reuseIdentifier]))
     {
         [self createSubviews];
 		self.selectionStyle = UITableViewCellSelectionStyleBlue;

diff --git a/sample/SampleDataBuilder.m b/sample/SampleDataBuilder.m
@@ -219,8 +219,8 @@ + (QElement *)createSampleControls {
 	QButtonElement *button = [[QButtonElement alloc] initWithTitle:@"Show form values"];
 	button.onSelected = ^{
 		UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Hello"
-            message:[NSString stringWithFormat:@"1: %d\n2: %@\n3: %d\n4:%@\n5:%f\n6:%@\n7:%@",
-                radioElement.selected ,
+            message:[NSString stringWithFormat:@"1: %ld\n2: %@\n3: %d\n4:%@\n5:%f\n6:%@\n7:%@",
+                (long)radioElement.selected ,
                 entryElement.textValue,
                 boolElement.boolValue,
                 dateElement.dateValue ,
@@ -301,7 +301,7 @@ + (QElement *)createRadioRoot {
 
     QRadioSection *section2 = [[QRadioSection alloc] initWithItems:[NSArray arrayWithObjects:@"Football", @"Soccer", @"Formula 1", nil] selected:0 title:@"Sport"];
     __weak QRadioSection *_section2 = section2;
-    section2.onSelected = ^{ NSLog(@"selected index: %d", _section2.selected); };
+    section2.onSelected = ^{ NSLog(@"selected index: %ld", (long)_section2.selected); };
     [root addSection:section2];
 
     return root;

diff --git a/sample/quickdialogexample-Info.plist b/sample/quickdialogexample-Info.plist
@@ -29,7 +29,7 @@
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.escoz.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -40,12 +40,12 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>UIPrerenderedIcon</key>
-	<true/>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIPrerenderedIcon</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>