Skip to content

Commit 5df6d60

Browse files
committed
UIKit Catalog: Version 13.3, 2016-11-17
Upgraded to Swift 3.0
1 parent 4419d7e commit 5df6d60

30 files changed

+308
-298
lines changed

UICatalog/LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Sample code project: UIKit Catalog (iOS): Creating and Customizing UIKit Controls
2-
Version: 13.2
2+
Version: 13.3
33

44
IMPORTANT: This Apple software is supplied to you by Apple
55
Inc. ("Apple") in consideration of your agreement to the following

UICatalog/Objective-C/UIKitCatalog.xcodeproj/project.pbxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
isa = PBXProject;
303303
attributes = {
304304
LastSwiftUpdateCheck = 0700;
305-
LastUpgradeCheck = 0800;
305+
LastUpgradeCheck = 0810;
306306
ORGANIZATIONNAME = f;
307307
};
308308
buildConfigurationList = 5356823518F3656900BAAD62 /* Build configuration list for PBXProject "UIKitCatalog" */;
@@ -418,8 +418,10 @@
418418
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
419419
CLANG_WARN_EMPTY_BODY = YES;
420420
CLANG_WARN_ENUM_CONVERSION = YES;
421+
CLANG_WARN_INFINITE_RECURSION = YES;
421422
CLANG_WARN_INT_CONVERSION = YES;
422423
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
424+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
423425
CLANG_WARN_UNREACHABLE_CODE = YES;
424426
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
425427
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -461,8 +463,10 @@
461463
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
462464
CLANG_WARN_EMPTY_BODY = YES;
463465
CLANG_WARN_ENUM_CONVERSION = YES;
466+
CLANG_WARN_INFINITE_RECURSION = YES;
464467
CLANG_WARN_INT_CONVERSION = YES;
465468
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
469+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
466470
CLANG_WARN_UNREACHABLE_CODE = YES;
467471
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
468472
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

UICatalog/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ You will also notice this sample shows how to localize string content by using t
88

99
## Build Requirements
1010

11-
Xcode 8.0 and iOS 10.0 SDK or later
11+
Xcode 8.1 and iOS 10.0 SDK or later
1212

1313
## Runtime Requirements
1414

UICatalog/Swift/UIKitCatalog.xcodeproj/project.pbxproj

+10-4
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@
244244
isa = PBXProject;
245245
attributes = {
246246
LastSwiftUpdateCheck = 0700;
247-
LastUpgradeCheck = 0800;
247+
LastUpgradeCheck = 0810;
248248
ORGANIZATIONNAME = Apple;
249249
TargetAttributes = {
250250
228DB9F218BC53F1002BA12A = {
251-
LastSwiftMigration = 0800;
251+
LastSwiftMigration = 0810;
252252
};
253253
};
254254
};
@@ -365,8 +365,10 @@
365365
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
366366
CLANG_WARN_EMPTY_BODY = YES;
367367
CLANG_WARN_ENUM_CONVERSION = YES;
368+
CLANG_WARN_INFINITE_RECURSION = YES;
368369
CLANG_WARN_INT_CONVERSION = YES;
369370
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
371+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
370372
CLANG_WARN_UNREACHABLE_CODE = YES;
371373
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
372374
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -391,6 +393,7 @@
391393
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
392394
ONLY_ACTIVE_ARCH = YES;
393395
SDKROOT = iphoneos;
396+
SWIFT_VERSION = "";
394397
TARGETED_DEVICE_FAMILY = "1,2";
395398
};
396399
name = Debug;
@@ -408,8 +411,10 @@
408411
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
409412
CLANG_WARN_EMPTY_BODY = YES;
410413
CLANG_WARN_ENUM_CONVERSION = YES;
414+
CLANG_WARN_INFINITE_RECURSION = YES;
411415
CLANG_WARN_INT_CONVERSION = YES;
412416
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
417+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
413418
CLANG_WARN_UNREACHABLE_CODE = YES;
414419
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
415420
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -426,6 +431,7 @@
426431
GCC_WARN_UNUSED_VARIABLE = YES;
427432
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
428433
SDKROOT = iphoneos;
434+
SWIFT_VERSION = "";
429435
TARGETED_DEVICE_FAMILY = "1,2";
430436
VALIDATE_PRODUCT = YES;
431437
};
@@ -441,7 +447,7 @@
441447
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
442448
PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}";
443449
PRODUCT_NAME = "$(TARGET_NAME)";
444-
SWIFT_VERSION = 2.3;
450+
SWIFT_VERSION = 3.0;
445451
};
446452
name = Debug;
447453
};
@@ -456,7 +462,7 @@
456462
PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}";
457463
PRODUCT_NAME = "$(TARGET_NAME)";
458464
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
459-
SWIFT_VERSION = 2.3;
465+
SWIFT_VERSION = 3.0;
460466
};
461467
name = Release;
462468
};

UICatalog/Swift/UIKitCatalog/ActivityIndicatorViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ class ActivityIndicatorViewController: UITableViewController {
2929
// MARK: - Configuration
3030

3131
func configureGrayActivityIndicatorView() {
32-
grayStyleActivityIndicatorView.activityIndicatorViewStyle = .Gray
32+
grayStyleActivityIndicatorView.activityIndicatorViewStyle = .gray
3333

3434
grayStyleActivityIndicatorView.startAnimating()
3535

3636
grayStyleActivityIndicatorView.hidesWhenStopped = true
3737
}
3838

3939
func configureTintedActivityIndicatorView() {
40-
tintedActivityIndicatorView.activityIndicatorViewStyle = .Gray
40+
tintedActivityIndicatorView.activityIndicatorViewStyle = .gray
4141

4242
tintedActivityIndicatorView.color = UIColor.applicationPurpleColor
4343

0 commit comments

Comments
 (0)