You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2015/03/19 17:56:09 UTC
[20/50] [abbrv] ios commit: CB-7428: Add bridging header. Make sure
all deployment targets are 7.0 Add swift runtime to search path (closes #133)
CB-7428: Add bridging header. Make sure all deployment targets are 7.0 Add swift runtime to search path (closes #133)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/5c6b4949
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/5c6b4949
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/5c6b4949
Branch: refs/heads/unplug-whitelist
Commit: 5c6b4949a390300db955273c6c736f97aa65d28a
Parents: f55cfb4
Author: Connor Pearson <cj...@gmail.com>
Authored: Mon Mar 9 19:07:53 2015 -0400
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Mar 16 18:06:09 2015 -0700
----------------------------------------------------------------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 6 ++---
.../project/__CLI__.xcodeproj/project.pbxproj | 6 +++++
.../__NON-CLI__.xcodeproj/project.pbxproj | 6 +++++
.../project/__PROJECT_NAME__/Bridging-Header.h | 28 ++++++++++++++++++++
.../CordovaLibApp/Bridging-Header.h | 28 ++++++++++++++++++++
.../CordovaLibTests.xcodeproj/project.pbxproj | 14 +++++++---
6 files changed, 81 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5c6b4949/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 2957580..65da551 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -360,7 +360,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INSTALL_PATH = /usr/local/lib;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = Cordova;
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SKIP_INSTALL = YES;
@@ -386,7 +386,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDEBUG";
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
@@ -415,7 +415,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = NO;
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SDKROOT = iphoneos;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5c6b4949/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
index f652e8d..725ce17 100755
--- a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
@@ -105,6 +105,7 @@
EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = "<group>"; };
EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = "<group>"; };
F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "__PROJECT_NAME__/config.xml"; sourceTree = "<group>"; };
+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Bridging-Header.h"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -166,6 +167,7 @@
children = (
32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */,
29B97316FDCFA39411CA2CEA /* main.m */,
+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */,
);
name = "Other Sources";
path = "__PROJECT_NAME__";
@@ -416,6 +418,7 @@
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -446,6 +449,7 @@
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -504,6 +508,7 @@
);
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
+ SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
USER_HEADER_SEARCH_PATHS = "";
};
name = Debug;
@@ -548,6 +553,7 @@
);
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
+ SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
USER_HEADER_SEARCH_PATHS = "";
};
name = Release;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5c6b4949/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
index db2ef14..e0f5ce8 100755
--- a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
@@ -100,6 +100,7 @@
8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "__PROJECT_NAME__-Info.plist"; path = "../__PROJECT_NAME__-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
D4A0D8751607E02300AEF8BB /* Default-568h@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x~iphone.png"; sourceTree = "<group>"; };
F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "__PROJECT_NAME__/config.xml"; sourceTree = "<group>"; };
+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Bridging-Header.h"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -159,6 +160,7 @@
children = (
32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */,
29B97316FDCFA39411CA2CEA /* main.m */,
+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */,
);
name = "Other Sources";
path = "__PROJECT_NAME__";
@@ -400,6 +402,7 @@
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -430,6 +433,7 @@
GCC_VERSION = "";
INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
OTHER_LDFLAGS = (
"-weak_framework",
CoreFoundation,
@@ -488,6 +492,7 @@
);
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
+ SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
USER_HEADER_SEARCH_PATHS = "";
};
name = Debug;
@@ -532,6 +537,7 @@
);
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
+ SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
USER_HEADER_SEARCH_PATHS = "";
};
name = Release;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5c6b4949/bin/templates/project/__PROJECT_NAME__/Bridging-Header.h
----------------------------------------------------------------------
diff --git a/bin/templates/project/__PROJECT_NAME__/Bridging-Header.h b/bin/templates/project/__PROJECT_NAME__/Bridging-Header.h
new file mode 100644
index 0000000..5d8abc9
--- /dev/null
+++ b/bin/templates/project/__PROJECT_NAME__/Bridging-Header.h
@@ -0,0 +1,28 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+//
+// Bridging-Header.h
+// __PROJECT_NAME__
+//
+// Created by ___FULLUSERNAME___ on ___DATE___.
+// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+//
+// Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import <Cordova/CDV.h>
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5c6b4949/tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h b/tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h
new file mode 100644
index 0000000..5d8abc9
--- /dev/null
+++ b/tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h
@@ -0,0 +1,28 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+//
+// Bridging-Header.h
+// __PROJECT_NAME__
+//
+// Created by ___FULLUSERNAME___ on ___DATE___.
+// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
+//
+//
+// Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import <Cordova/CDV.h>
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5c6b4949/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
index ef69b19..be2e74a 100644
--- a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
+++ b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
@@ -133,6 +133,7 @@
EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVFakeFileManager.m; sourceTree = "<group>"; };
EBA7F20417962CCD001A0CE6 /* CDVStartPageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVStartPageTests.m; sourceTree = "<group>"; };
F8EB14D0165FFD3200616F39 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = CordovaLibApp/config.xml; sourceTree = "<group>"; };
+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Bridging-Header.h"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -247,6 +248,7 @@
303A406F152124BB00182201 /* CordovaLibApp-Info.plist */,
303A4070152124BB00182201 /* InfoPlist.strings */,
303A4073152124BB00182201 /* main.m */,
+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -532,6 +534,8 @@
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+ SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "Classes/**";
};
@@ -567,6 +571,8 @@
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+ SWIFT_OBJC_BRIDGING_HEADER = "__PROJECT_NAME__/Bridging-Header.h";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "Classes/**";
};
@@ -592,7 +598,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "";
@@ -615,7 +621,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
@@ -642,7 +648,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "CordovaLibTests-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-all_load",
@@ -669,7 +675,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "CordovaLibTests-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-all_load",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org