Skip to content

Commit bc6db29

Browse files
hawkriveshawkrives
authored
Begin support for Xcode 8 (and fix iOS launch images) (#169)
* correctly resize the 1x launchimage asdj * enable the launchimages * give in to the inevitable and reorganize the plist for xcode there's a method to the madness, though: it's sorted alphabetically by key, and indented with tabs. so it should be easy enough to keep around. * prepare for entitlements * remove the XIB-based launchscreen
1 parent e509a66 commit bc6db29

File tree

7 files changed

+153
-136
lines changed

7 files changed

+153
-136
lines changed

‎ios/AllAboutOlaf.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = "<group>"; };
152152
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
153153
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
154+
00C8CB4C1D6EBA1A00E66E20 /* All About Olaf.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = "All About Olaf.entitlements"; path = "AllAboutOlaf/All About Olaf.entitlements"; sourceTree = "<group>"; };
154155
00CFAFAD1D61761D00A6B735 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
155156
00E356EE1AD99517003FC87E /* AllAboutOlafTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AllAboutOlafTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
156157
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -322,6 +323,7 @@
322323
13B07FAE1A68108700A75B9A /* AllAboutOlaf */ = {
323324
isa = PBXGroup;
324325
children = (
326+
00C8CB4C1D6EBA1A00E66E20 /* All About Olaf.entitlements */,
325327
008F07F21AC5B25A0029DE68 /* main.jsbundle */,
326328
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
327329
13B07FB01A68108700A75B9A /* AppDelegate.m */,
@@ -769,6 +771,7 @@
769771
isa = XCBuildConfiguration;
770772
buildSettings = {
771773
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
774+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
772775
DEAD_CODE_STRIPPING = NO;
773776
HEADER_SEARCH_PATHS = (
774777
"$(inherited)",
@@ -793,6 +796,7 @@
793796
isa = XCBuildConfiguration;
794797
buildSettings = {
795798
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
799+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
796800
HEADER_SEARCH_PATHS = (
797801
"$(inherited)",
798802
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

‎ios/AllAboutOlaf/All About Olaf.entitlements‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

‎ios/AllAboutOlaf/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -47,4 +57,4 @@
4757
"version" : 1,
4858
"author" : "xcode"
4959
}
50-
}
60+
}

‎ios/AllAboutOlaf/Images.xcassets/LaunchImage.launchimage/@1x 320 × 480.png‎

111 KB
Loading

‎ios/AllAboutOlaf/Images.xcassets/LaunchImage.launchimage/@1x 640 × 960-1.png‎

-406 KB
Binary file not shown.

‎ios/AllAboutOlaf/Images.xcassets/LaunchImage.launchimage/Contents.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
{
22
"images" : [
3+
{
4+
"orientation" : "portrait",
5+
"idiom" : "iphone",
6+
"filename" : "@1x 320 × 480.png",
7+
"extent" : "full-screen",
8+
"scale" : "1x"
9+
},
10+
{
11+
"orientation" : "portrait",
12+
"idiom" : "iphone",
13+
"filename" : "@1x 640 × 960.png",
14+
"extent" : "full-screen",
15+
"scale" : "2x"
16+
},
17+
{
18+
"orientation" : "portrait",
19+
"idiom" : "iphone",
20+
"filename" : "@2x 640 × 1136.png",
21+
"extent" : "full-screen",
22+
"subtype" : "retina4",
23+
"scale" : "2x"
24+
},
325
{
426
"extent" : "full-screen",
527
"idiom" : "iphone",
@@ -34,28 +56,6 @@
3456
"minimum-system-version" : "7.0",
3557
"orientation" : "portrait",
3658
"scale" : "2x"
37-
},
38-
{
39-
"orientation" : "portrait",
40-
"idiom" : "iphone",
41-
"filename" : "@1x 640 × 960-1.png",
42-
"extent" : "full-screen",
43-
"scale" : "1x"
44-
},
45-
{
46-
"orientation" : "portrait",
47-
"idiom" : "iphone",
48-
"filename" : "@1x 640 × 960.png",
49-
"extent" : "full-screen",
50-
"scale" : "2x"
51-
},
52-
{
53-
"orientation" : "portrait",
54-
"idiom" : "iphone",
55-
"filename" : "@2x 640 × 1136.png",
56-
"extent" : "full-screen",
57-
"subtype" : "retina4",
58-
"scale" : "2x"
5959
}
6060
],
6161
"info" : {

‎ios/AllAboutOlaf/Info.plist‎

Lines changed: 111 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,115 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
7-
<key>CFBundleExecutable</key>
8-
<string>$(EXECUTABLE_NAME)</string>
9-
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11-
<key>CFBundleInfoDictionaryVersion</key>
12-
<string>6.0</string>
13-
<key>CFBundleName</key>
14-
<string>$(PRODUCT_NAME)</string>
15-
<key>CFBundlePackageType</key>
16-
<string>APPL</string>
17-
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
19-
<key>CFBundleSignature</key>
20-
<string>????</string>
21-
<key>CFBundleVersion</key>
22-
<string>1</string>
23-
<key>LSRequiresIPhoneOS</key>
24-
<true/>
25-
<key>UILaunchStoryboardName</key>
26-
<string>LaunchScreen</string>
27-
<key>UIRequiredDeviceCapabilities</key>
28-
<array>
29-
<string>armv7</string>
30-
</array>
31-
<key>UISupportedInterfaceOrientations</key>
32-
<array>
33-
<string>UIInterfaceOrientationPortrait</string>
34-
</array>
35-
<key>UIViewControllerBasedStatusBarAppearance</key>
36-
<false/>
37-
<key>NSLocationWhenInUseUsageDescription</key>
38-
<string></string>
39-
<key>NSAppTransportSecurity</key>
40-
<dict>
41-
<key>NSExceptionDomains</key>
42-
<dict>
43-
<key>stolaf-flash.streamguys.net</key>
44-
<dict>
45-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
46-
<true/>
47-
</dict>
48-
<key>wp.stolaf.edu</key>
49-
<dict>
50-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
51-
<true/>
52-
</dict>
53-
<key>oleville.com</key>
54-
<dict>
55-
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
56-
<true/>
57-
</dict>
58-
<key>manitoumessenger.com</key>
59-
<dict>
60-
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
61-
<true/>
62-
</dict>
63-
<key>youarriveontime.com</key>
64-
<dict>
65-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
66-
<true/>
67-
</dict>
68-
<key>van-go.info</key>
69-
<dict>
70-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
71-
<true/>
72-
</dict>
73-
<key>localhost</key>
74-
<dict>
75-
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
76-
<true/>
77-
</dict>
78-
<key>stolaf.cafebonappetit.com</key>
79-
<dict>
80-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
81-
<true/>
82-
</dict>
83-
<key>template.cafebonappetit.com</key>
84-
<dict>
85-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
86-
<true/>
87-
</dict>
88-
<key>bamco.com</key>
89-
<dict>
90-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
91-
<true/>
92-
</dict>
93-
<key>hub.cafebonappetit.com</key>
94-
<dict>
95-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
96-
<true/>
97-
</dict>
98-
<key>legacy.cafebonappetit.com</key>
99-
<dict>
100-
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
101-
<true/>
102-
</dict>
103-
</dict>
104-
</dict>
105-
<key>UIAppFonts</key>
106-
<array>
107-
<string>Entypo.ttf</string>
108-
<string>EvilIcons.ttf</string>
109-
<string>FontAwesome.ttf</string>
110-
<string>Foundation.ttf</string>
111-
<string>Ionicons.ttf</string>
112-
<string>MaterialIcons.ttf</string>
113-
<string>Octicons.ttf</string>
114-
<string>Zocial.ttf</string>
115-
</array>
116-
</dict>
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>APPL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
<key>LSRequiresIPhoneOS</key>
24+
<true/>
25+
<key>NSAppTransportSecurity</key>
26+
<dict>
27+
<key>NSExceptionDomains</key>
28+
<dict>
29+
<key>bamco.com</key>
30+
<dict>
31+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
32+
<true/>
33+
</dict>
34+
<key>hub.cafebonappetit.com</key>
35+
<dict>
36+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
37+
<true/>
38+
</dict>
39+
<key>legacy.cafebonappetit.com</key>
40+
<dict>
41+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
42+
<true/>
43+
</dict>
44+
<key>localhost</key>
45+
<dict>
46+
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
47+
<true/>
48+
</dict>
49+
<key>manitoumessenger.com</key>
50+
<dict>
51+
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
52+
<true/>
53+
</dict>
54+
<key>oleville.com</key>
55+
<dict>
56+
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
57+
<true/>
58+
</dict>
59+
<key>stolaf-flash.streamguys.net</key>
60+
<dict>
61+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
62+
<true/>
63+
</dict>
64+
<key>stolaf.cafebonappetit.com</key>
65+
<dict>
66+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
67+
<true/>
68+
</dict>
69+
<key>template.cafebonappetit.com</key>
70+
<dict>
71+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
72+
<true/>
73+
</dict>
74+
<key>van-go.info</key>
75+
<dict>
76+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
77+
<true/>
78+
</dict>
79+
<key>wp.stolaf.edu</key>
80+
<dict>
81+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
82+
<true/>
83+
</dict>
84+
<key>youarriveontime.com</key>
85+
<dict>
86+
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
87+
<true/>
88+
</dict>
89+
</dict>
90+
</dict>
91+
<key>NSLocationWhenInUseUsageDescription</key>
92+
<string></string>
93+
<key>UIAppFonts</key>
94+
<array>
95+
<string>Entypo.ttf</string>
96+
<string>EvilIcons.ttf</string>
97+
<string>FontAwesome.ttf</string>
98+
<string>Foundation.ttf</string>
99+
<string>Ionicons.ttf</string>
100+
<string>MaterialIcons.ttf</string>
101+
<string>Octicons.ttf</string>
102+
<string>Zocial.ttf</string>
103+
</array>
104+
<key>UIRequiredDeviceCapabilities</key>
105+
<array>
106+
<string>armv7</string>
107+
</array>
108+
<key>UISupportedInterfaceOrientations</key>
109+
<array>
110+
<string>UIInterfaceOrientationPortrait</string>
111+
</array>
112+
<key>UIViewControllerBasedStatusBarAppearance</key>
113+
<false/>
114+
</dict>
117115
</plist>

0 commit comments

Comments
 (0)