scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #197 from chrisgarrity/fix-build

Browse source 
Fix iOS build time warnings
This commit is contained in:
chrisgarrity 2018-10-29 10:28:23 -04:00 committed by GitHub
commit 366835b34e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editions/free/Free-Images.xcassets/AppIcon.appiconset/Contents.json
View file

@ -44,6 +44,11 @@
"idiom" : "ipad", "idiom" : "ipad",
"size" : "83.5x83.5", "size" : "83.5x83.5",
"scale" : "2x" "scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
} }
], ],
"info" : { "info" : {

6
editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/Contents.json
View file

@ -51,6 +51,12 @@
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "Icon-167.png", "filename" : "Icon-167.png",
"scale" : "2x" "scale" : "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "KITTEN-1024x1024.png",
"scale" : "1x"
} }
], ],
"info" : { "info" : {

BIN
editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/KITTEN-1024x1024.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 251 B

2
editions/free/Free-Info.plist
View file

@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>LSSupportsOpeningDocumentsInPlace</key>
<false/>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>Used to record sounds for your projects</string> <string>Used to record sounds for your projects</string>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>

8
ios/Pods/Pods.xcodeproj/project.pbxproj generated
View file

@ -481,7 +481,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
STRIP_INSTALLED_PRODUCT = NO; STRIP_INSTALLED_PRODUCT = NO;
SYMROOT = "${SRCROOT}/../build"; SYMROOT = "${SRCROOT}/../build";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
@ -493,7 +493,7 @@
baseConfigurationReference = 080B62B69F7897A2E100CCD98EFB9CC3 /* Pods.release.xcconfig */; baseConfigurationReference = 080B62B69F7897A2E100CCD98EFB9CC3 /* Pods.release.xcconfig */;
buildSettings = { buildSettings = {
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = ""; OTHER_LIBTOOLFLAGS = "";
@ -509,7 +509,7 @@
baseConfigurationReference = 409481B22BCA3781BAF3CBE47FCA34FB /* Pods.debug.xcconfig */; baseConfigurationReference = 409481B22BCA3781BAF3CBE47FCA34FB /* Pods.debug.xcconfig */;
buildSettings = { buildSettings = {
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = ""; OTHER_LIBTOOLFLAGS = "";
@ -616,7 +616,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
STRIP_INSTALLED_PRODUCT = NO; STRIP_INSTALLED_PRODUCT = NO;
SYMROOT = "${SRCROOT}/../build"; SYMROOT = "${SRCROOT}/../build";

2
ios/ScratchJr.xcodeproj/project.pbxproj
View file

@ -600,6 +600,7 @@
"COCOAPODS=1", "COCOAPODS=1",
); );
INFOPLIST_FILE = "$(SRCROOT)/../editions/free/Free-Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/../editions/free/Free-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_BUNDLE_IDENTIFIER = edu.mitmedialab.scratchjrfree; PRODUCT_BUNDLE_IDENTIFIER = edu.mitmedialab.scratchjrfree;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
@ -624,6 +625,7 @@
"COCOAPODS=1", "COCOAPODS=1",
); );
INFOPLIST_FILE = "$(SRCROOT)/../editions/free/Free-Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/../editions/free/Free-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_BUNDLE_IDENTIFIER = edu.mitmedialab.scratchjrfree; PRODUCT_BUNDLE_IDENTIFIER = edu.mitmedialab.scratchjrfree;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";