kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #752 from fbricker/develop

Browse Source 
Add NSAppTransportSecurity section to info.plist with NSAllowsArbitraryLoads enabled
This commit is contained in:
Joshua Granick
2016-05-31 08:54:38 -07:00
parent a8a4b83464 15875bce73
commit 1cb99147c1
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lime/tools/platforms/TVOSPlatform.hx
View File

@@ -132,7 +132,7 @@ class TVOSPlatform extends PlatformTarget {
for (dependency in project.dependencies) { for (dependency in project.dependencies) {
if (!StringTools.endsWith (dependency.name, ".framework") && !StringTools.endsWith (dependency.path, ".framework")) { if (!StringTools.endsWith (dependency.name, ".framework") && !StringTools.endsWith (dependency.name, ".tbd") && !StringTools.endsWith (dependency.path, ".framework")) {
if (dependency.path != "") { if (dependency.path != "") {
@@ -254,16 +254,25 @@ class TVOSPlatform extends PlatformTarget {
var name = null; var name = null;
var path = null; var path = null;
var fileType = null;
if (Path.extension (dependency.name) == "framework") { if (Path.extension (dependency.name) == "framework") {
name = dependency.name; name = dependency.name;
path = "/System/Library/Frameworks/" + dependency.name; path = "/System/Library/Frameworks/" + dependency.name;
fileType = "wrapper.framework";
} else if (Path.extension (dependency.name) == "tbd") {
name = dependency.name;
path = "usr/lib/" + dependency.name;
fileType = "sourcecode.text-based-dylib-definition";
} else if (Path.extension (dependency.path) == "framework") { } else if (Path.extension (dependency.path) == "framework") {
name = Path.withoutDirectory (dependency.path); name = Path.withoutDirectory (dependency.path);
path = PathHelper.tryFullPath (dependency.path); path = PathHelper.tryFullPath (dependency.path);
fileType = "wrapper.framework";
} }
@@ -275,7 +284,7 @@ class TVOSPlatform extends PlatformTarget {
ArrayHelper.addUnique (context.frameworkSearchPaths, Path.directory (path)); ArrayHelper.addUnique (context.frameworkSearchPaths, Path.directory (path));
context.ADDL_PBX_BUILD_FILE += " " + frameworkID + " /* " + name + " in Frameworks */ = {isa = PBXBuildFile; fileRef = " + fileID + " /* " + name + " */; };\n"; context.ADDL_PBX_BUILD_FILE += " " + frameworkID + " /* " + name + " in Frameworks */ = {isa = PBXBuildFile; fileRef = " + fileID + " /* " + name + " */; };\n";
context.ADDL_PBX_FILE_REFERENCE += " " + fileID + " /* " + name + " */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = \"" + name + "\"; path = \"" + path + "\"; sourceTree = SDKROOT; };\n"; context.ADDL_PBX_FILE_REFERENCE += " " + fileID + " /* " + name + " */ = {isa = PBXFileReference; lastKnownFileType = \"" + fileType + "\"; name = \"" + name + "\"; path = \"" + path + "\"; sourceTree = SDKROOT; };\n";
context.ADDL_PBX_FRAMEWORKS_BUILD_PHASE += " " + frameworkID + " /* " + name + " in Frameworks */,\n"; context.ADDL_PBX_FRAMEWORKS_BUILD_PHASE += " " + frameworkID + " /* " + name + " in Frameworks */,\n";
context.ADDL_PBX_FRAMEWORK_GROUP += " " + fileID + " /* " + name + " */,\n"; context.ADDL_PBX_FRAMEWORK_GROUP += " " + fileID + " /* " + name + " */,\n";

4
templates/iphone/PROJ/PROJ-Info.plist
View File

@@ -38,5 +38,9 @@
::if (IOS_APP_ORIENTATION != null):: ::if (IOS_APP_ORIENTATION != null)::
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
::IOS_APP_ORIENTATION::::end:: ::IOS_APP_ORIENTATION::::end::
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key><true/>
</dict>
</dict> </dict>
</plist> </plist>

4
templates/tvos/PROJ/PROJ-Info.plist
View File

@@ -38,5 +38,9 @@
::if (IOS_APP_ORIENTATION != null):: ::if (IOS_APP_ORIENTATION != null)::
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
::IOS_APP_ORIENTATION::::end:: ::IOS_APP_ORIENTATION::::end::
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key><true/>
</dict>
</dict> </dict>
</plist> </plist>