Skip to content

Commit 5232dbb

Browse files
yutailang0119yutailang0119
authored
Merge pull request #91 from pyconjp/release/v2.0.2
Release v2.0.2
2 parents 3816790 + 2af0367 commit 5232dbb

File tree

74 files changed

+432
-429
lines changed

Some content is hidden

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

74 files changed

+432
-429
lines changed

‎PyConJP.xcodeproj/project.pbxproj

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,34 +1053,36 @@
10531053
isa = PBXProject;
10541054
attributes = {
10551055
LastSwiftUpdateCheck = 0810;
1056-
LastUpgradeCheck = 0810;
1056+
LastUpgradeCheck = 0900;
10571057
ORGANIZATIONNAME = "PyCon JP";
10581058
TargetAttributes = {
10591059
DB77FD491E06720C00504869 = {
10601060
CreatedOnToolsVersion = 8.1;
1061+
LastSwiftMigration = 0900;
10611062
ProvisioningStyle = Automatic;
10621063
};
10631064
DB77FD511E06720D00504869 = {
10641065
CreatedOnToolsVersion = 8.1;
1066+
LastSwiftMigration = 0900;
10651067
ProvisioningStyle = Automatic;
10661068
TestTargetID = DBA1C0A81C7228E2004F0C8D;
10671069
};
10681070
DBA1C0A81C7228E2004F0C8D = {
10691071
CreatedOnToolsVersion = 7.2;
10701072
DevelopmentTeam = KP7AT73S3W;
1071-
LastSwiftMigration = 0800;
1073+
LastSwiftMigration = 0900;
10721074
ProvisioningStyle = Automatic;
10731075
};
10741076
DBA1C0BC1C7228E2004F0C8D = {
10751077
CreatedOnToolsVersion = 7.2;
10761078
DevelopmentTeam = 3T8B5JQDB8;
1077-
LastSwiftMigration = 0800;
1079+
LastSwiftMigration = 0900;
10781080
TestTargetID = DBA1C0A81C7228E2004F0C8D;
10791081
};
10801082
DBA1C0C71C7228E2004F0C8D = {
10811083
CreatedOnToolsVersion = 7.2;
10821084
DevelopmentTeam = 3T8B5JQDB8;
1083-
LastSwiftMigration = 0800;
1085+
LastSwiftMigration = 0900;
10841086
TestTargetID = DBA1C0A81C7228E2004F0C8D;
10851087
};
10861088
};
@@ -1526,7 +1528,8 @@
15261528
PRODUCT_NAME = "$(TARGET_NAME)";
15271529
SKIP_INSTALL = YES;
15281530
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1529-
SWIFT_VERSION = 3.0;
1531+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1532+
SWIFT_VERSION = 4.0;
15301533
VERSIONING_SYSTEM = "apple-generic";
15311534
VERSION_INFO_PREFIX = "";
15321535
};
@@ -1558,7 +1561,8 @@
15581561
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.WebAPIFramework;
15591562
PRODUCT_NAME = "$(TARGET_NAME)";
15601563
SKIP_INSTALL = YES;
1561-
SWIFT_VERSION = 3.0;
1564+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1565+
SWIFT_VERSION = 4.0;
15621566
VERSIONING_SYSTEM = "apple-generic";
15631567
VERSION_INFO_PREFIX = "";
15641568
};
@@ -1577,7 +1581,8 @@
15771581
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.WebAPIFrameworkTests;
15781582
PRODUCT_NAME = "$(TARGET_NAME)";
15791583
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1580-
SWIFT_VERSION = 3.0;
1584+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1585+
SWIFT_VERSION = 4.0;
15811586
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
15821587
};
15831588
name = Debug;
@@ -1594,7 +1599,8 @@
15941599
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15951600
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.WebAPIFrameworkTests;
15961601
PRODUCT_NAME = "$(TARGET_NAME)";
1597-
SWIFT_VERSION = 3.0;
1602+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1603+
SWIFT_VERSION = 4.0;
15981604
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
15991605
};
16001606
name = Release;
@@ -1608,14 +1614,20 @@
16081614
CLANG_CXX_LIBRARY = "libc++";
16091615
CLANG_ENABLE_MODULES = YES;
16101616
CLANG_ENABLE_OBJC_ARC = YES;
1617+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
16111618
CLANG_WARN_BOOL_CONVERSION = YES;
1619+
CLANG_WARN_COMMA = YES;
16121620
CLANG_WARN_CONSTANT_CONVERSION = YES;
16131621
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
16141622
CLANG_WARN_EMPTY_BODY = YES;
16151623
CLANG_WARN_ENUM_CONVERSION = YES;
16161624
CLANG_WARN_INFINITE_RECURSION = YES;
16171625
CLANG_WARN_INT_CONVERSION = YES;
1626+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1627+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
16181628
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1629+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1630+
CLANG_WARN_STRICT_PROTOTYPES = YES;
16191631
CLANG_WARN_SUSPICIOUS_MOVE = YES;
16201632
CLANG_WARN_UNREACHABLE_CODE = YES;
16211633
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1656,14 +1668,20 @@
16561668
CLANG_CXX_LIBRARY = "libc++";
16571669
CLANG_ENABLE_MODULES = YES;
16581670
CLANG_ENABLE_OBJC_ARC = YES;
1671+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
16591672
CLANG_WARN_BOOL_CONVERSION = YES;
1673+
CLANG_WARN_COMMA = YES;
16601674
CLANG_WARN_CONSTANT_CONVERSION = YES;
16611675
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
16621676
CLANG_WARN_EMPTY_BODY = YES;
16631677
CLANG_WARN_ENUM_CONVERSION = YES;
16641678
CLANG_WARN_INFINITE_RECURSION = YES;
16651679
CLANG_WARN_INT_CONVERSION = YES;
1680+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1681+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
16661682
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1683+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1684+
CLANG_WARN_STRICT_PROTOTYPES = YES;
16671685
CLANG_WARN_SUSPICIOUS_MOVE = YES;
16681686
CLANG_WARN_UNREACHABLE_CODE = YES;
16691687
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1708,7 +1726,8 @@
17081726
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.pyconjp;
17091727
PRODUCT_NAME = "$(TARGET_NAME)";
17101728
PROVISIONING_PROFILE = "";
1711-
SWIFT_VERSION = 3.0;
1729+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1730+
SWIFT_VERSION = 4.0;
17121731
TARGETED_DEVICE_FAMILY = 1;
17131732
};
17141733
name = Debug;
@@ -1732,7 +1751,8 @@
17321751
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.pyconjp;
17331752
PRODUCT_NAME = "$(TARGET_NAME)";
17341753
PROVISIONING_PROFILE = "";
1735-
SWIFT_VERSION = 3.0;
1754+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1755+
SWIFT_VERSION = 4.0;
17361756
TARGETED_DEVICE_FAMILY = 1;
17371757
};
17381758
name = Release;
@@ -1751,7 +1771,8 @@
17511771
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
17521772
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPTests;
17531773
PRODUCT_NAME = "$(TARGET_NAME)";
1754-
SWIFT_VERSION = 3.0;
1774+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1775+
SWIFT_VERSION = 4.0;
17551776
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
17561777
};
17571778
name = Debug;
@@ -1770,7 +1791,8 @@
17701791
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
17711792
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPTests;
17721793
PRODUCT_NAME = "$(TARGET_NAME)";
1773-
SWIFT_VERSION = 3.0;
1794+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1795+
SWIFT_VERSION = 4.0;
17741796
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
17751797
};
17761798
name = Release;
@@ -1789,7 +1811,8 @@
17891811
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPUITests;
17901812
PRODUCT_NAME = "$(TARGET_NAME)";
17911813
PROVISIONING_PROFILE = "";
1792-
SWIFT_VERSION = 3.0;
1814+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1815+
SWIFT_VERSION = 4.0;
17931816
TEST_TARGET_NAME = PyConJP;
17941817
USES_XCTRUNNER = YES;
17951818
};
@@ -1809,7 +1832,8 @@
18091832
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPUITests;
18101833
PRODUCT_NAME = "$(TARGET_NAME)";
18111834
PROVISIONING_PROFILE = "";
1812-
SWIFT_VERSION = 3.0;
1835+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1836+
SWIFT_VERSION = 4.0;
18131837
TEST_TARGET_NAME = PyConJP;
18141838
USES_XCTRUNNER = YES;
18151839
};

‎PyConJP.xcodeproj/xcshareddata/xcschemes/PyConJP.xcscheme

Lines changed: 3 additions & 1 deletion
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 = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -75,6 +76,7 @@
7576
buildConfiguration = "Debug"
7677
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7778
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
79+
language = ""
7880
launchStyle = "0"
7981
useCustomWorkingDirectory = "NO"
8082
ignoresPersistentStateOnLaunch = "NO"

‎PyConJP/Application/AppDelegate.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, ReceiveLocalNotificationP
2121

2222
UINavigationBar.appearance().barTintColor = UIColor.PyConJP2017.navy
2323
UINavigationBar.appearance().tintColor = .white
24-
UINavigationBar.appearance().titleTextAttributes = [NSForegroundColorAttributeName: UIColor.white]
24+
UINavigationBar.appearance().titleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white]
25+
if #available(iOS 11.0, *) {
26+
UINavigationBar.appearance().largeTitleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white]
27+
}
2528

2629
UITabBar.appearance().tintColor = UIColor.PyConJP2017.yellow
27-
UITabBarItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont.boldSystemFont(ofSize: 10), NSForegroundColorAttributeName: UIColor.PyConJP2017.yellow], for: .selected)
30+
UITabBarItem.appearance().setTitleTextAttributes([NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 10), NSAttributedStringKey.foregroundColor: UIColor.PyConJP2017.yellow], for: .selected)
2831

2932
let configuration = Realm.Configuration(schemaVersion: 1, deleteRealmIfMigrationNeeded: true)
3033
Realm.Configuration.defaultConfiguration = configuration

‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "bookmark_collections.png",
5+
"filename" : "bookmark_collections@1x.png",
66
"scale" : "1x"
77
},
88
{
99
"idiom" : "universal",
10-
"filename" : "bookmark_collections2x.png",
10+
"filename" : "bookmark_collections@2x.png",
1111
"scale" : "2x"
1212
},
1313
{
1414
"idiom" : "universal",
15-
"filename" : "bookmark_collections3x.png",
15+
"filename" : "bookmark_collections@3x.png",
1616
"scale" : "3x"
1717
}
1818
],

‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/bookmark_collections.png renamed to ‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/bookmark_collections@1x.png

File renamed without changes.

‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/bookmark_collections2x.png renamed to ‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/bookmark_collections@2x.png

File renamed without changes.

‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/bookmark_collections3x.png renamed to ‎PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/bookmark_collections@3x.png

File renamed without changes.

‎PyConJP/Assets.xcassets/App/Icon/BarItem/Conference.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "record_voice_over.png",
5+
"filename" : "record_voice_over@1x.png",
66
"scale" : "1x"
77
},
88
{
99
"idiom" : "universal",
10-
"filename" : "record_voice_over2x.png",
10+
"filename" : "record_voice_over@2x.png",
1111
"scale" : "2x"
1212
},
1313
{
1414
"idiom" : "universal",
15-
"filename" : "record_voice_over3x.png",
15+
"filename" : "record_voice_over@3x.png",
1616
"scale" : "3x"
1717
}
1818
],

‎PyConJP/Assets.xcassets/App/Icon/BarItem/Conference.imageset/record_voice_over.png renamed to ‎PyConJP/Assets.xcassets/App/Icon/BarItem/Conference.imageset/record_voice_over@1x.png

File renamed without changes.

‎PyConJP/Assets.xcassets/App/Icon/BarItem/Conference.imageset/record_voice_over2x.png renamed to ‎PyConJP/Assets.xcassets/App/Icon/BarItem/Conference.imageset/record_voice_over@2x.png

File renamed without changes.

0 commit comments

Comments
 (0)