Skip to content

Commit ce5c3f3

Browse files
committed
Update to Xcode 10.3 recommended settings
1 parent e1330d2 commit ce5c3f3

File tree

4 files changed

+27
-22
lines changed

4 files changed

+27
-22
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Simpler project quick start [#6](https://github.com/polydice/iCook-tvOS/pull/6)
1111
* Replace Freddy with Swift Codable [#11](https://github.com/polydice/iCook-tvOS/pull/11)
1212
* Replace Quick and Nimble with XCTest [#12](https://github.com/polydice/iCook-tvOS/pull/12)
13+
* Swift 5 [#13](https://github.com/polydice/iCook-tvOS/pull/13)
1314

1415
## v1.0.0
1516

README.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
11
# iCook tvOS App
22

33
[![Build Status](https://travis-ci.org/polydice/iCook-tvOS.svg)](https://travis-ci.org/polydice/iCook-tvOS)
4+
![Swift 5](https://img.shields.io/badge/Swift-5-orange.svg)
45
[![codecov.io](https://codecov.io/github/polydice/iCook-tvOS/coverage.svg?branch=develop)](https://codecov.io/github/polydice/iCook-tvOS?branch=develop)
5-
![Swift 3.2](https://img.shields.io/badge/Swift-3.2-orange.svg)
66

77
A tvOS app that plays [iCook TV](https://tv.icook.tw/) videos.
88

99
<img src="https://polydice.github.io/iCook-tvOS/images/Screenshot.png" width=800px>
1010

11-
## Setup
12-
13-
Install [Bundler](http://bundler.io/):
14-
15-
```
16-
gem install bundler
17-
```
18-
19-
### Quick Start
11+
## Quick Start
2012

2113
Run the following commands to install dependencies:
2214

2315
```
2416
make bootstrap
2517
```
2618

27-
### Production Setups
19+
## Production Setups
2820

2921
If you work at Polydice, instead of `make bootstrap`, set up the project step by step with the following commands. Fill in the credentials and ask admin for required files.
3022

@@ -63,10 +55,6 @@ Managed by CocoaPods-Keys:
6355

6456
* `icook-tv-top-shelf-image.png` is not included in the repo due to the license of image.
6557

66-
## Known Issues
67-
68-
* Initializing generic `DataSource` will cause `EXC_BAD_ACCESS` in Xcode 8. Fixed in Xcode 8.1.
69-
7058
## Demo
7159

7260
* Install the beta version via <https://testflight.icook.tw>.

iCookTV.xcodeproj/project.pbxproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,23 +412,23 @@
412412
B5F7BF401BA9C95F00A75099 /* Project object */ = {
413413
isa = PBXProject;
414414
attributes = {
415-
LastUpgradeCheck = 0810;
415+
LastUpgradeCheck = 1030;
416416
ORGANIZATIONNAME = "Polydice, Inc.";
417417
TargetAttributes = {
418418
B5F7BF471BA9C95F00A75099 = {
419419
CreatedOnToolsVersion = 7.1;
420-
LastSwiftMigration = 0800;
420+
LastSwiftMigration = 1030;
421421
};
422422
B5F7BF581BA9C95F00A75099 = {
423423
CreatedOnToolsVersion = 7.1;
424-
LastSwiftMigration = 0800;
424+
LastSwiftMigration = 1030;
425425
TestTargetID = B5F7BF471BA9C95F00A75099;
426426
};
427427
};
428428
};
429429
buildConfigurationList = B5F7BF431BA9C95F00A75099 /* Build configuration list for PBXProject "iCookTV" */;
430430
compatibilityVersion = "Xcode 3.2";
431-
developmentRegion = English;
431+
developmentRegion = en;
432432
hasScannedForEncodings = 0;
433433
knownRegions = (
434434
English,
@@ -707,14 +707,22 @@
707707
CLANG_CXX_LIBRARY = "libc++";
708708
CLANG_ENABLE_MODULES = YES;
709709
CLANG_ENABLE_OBJC_ARC = YES;
710+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
710711
CLANG_WARN_BOOL_CONVERSION = YES;
712+
CLANG_WARN_COMMA = YES;
711713
CLANG_WARN_CONSTANT_CONVERSION = YES;
714+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
712715
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
713716
CLANG_WARN_EMPTY_BODY = YES;
714717
CLANG_WARN_ENUM_CONVERSION = YES;
715718
CLANG_WARN_INFINITE_RECURSION = YES;
716719
CLANG_WARN_INT_CONVERSION = YES;
720+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
721+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
722+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
717723
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
724+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
725+
CLANG_WARN_STRICT_PROTOTYPES = YES;
718726
CLANG_WARN_SUSPICIOUS_MOVE = YES;
719727
CLANG_WARN_UNREACHABLE_CODE = YES;
720728
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -758,14 +766,22 @@
758766
CLANG_CXX_LIBRARY = "libc++";
759767
CLANG_ENABLE_MODULES = YES;
760768
CLANG_ENABLE_OBJC_ARC = YES;
769+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
761770
CLANG_WARN_BOOL_CONVERSION = YES;
771+
CLANG_WARN_COMMA = YES;
762772
CLANG_WARN_CONSTANT_CONVERSION = YES;
773+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
763774
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
764775
CLANG_WARN_EMPTY_BODY = YES;
765776
CLANG_WARN_ENUM_CONVERSION = YES;
766777
CLANG_WARN_INFINITE_RECURSION = YES;
767778
CLANG_WARN_INT_CONVERSION = YES;
779+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
780+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
781+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
768782
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
783+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
784+
CLANG_WARN_STRICT_PROTOTYPES = YES;
769785
CLANG_WARN_SUSPICIOUS_MOVE = YES;
770786
CLANG_WARN_UNREACHABLE_CODE = YES;
771787
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

iCookTV.xcodeproj/xcshareddata/xcschemes/iCookTV.xcscheme

Lines changed: 3 additions & 3 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 = "0810"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
3333
skipped = "NO">

0 commit comments

Comments
 (0)