This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-ios.git
The following commit(s) were added to refs/heads/master by this push:
new 98910def fix: Xcode 15 Beta (#1336)
98910def is described below
commit 98910defd385a29afd3f26fa301e095c1db4a8c7
Author: Darryl Pogue <[email protected]>
AuthorDate: Tue Jun 6 09:40:28 2023 -0700
fix: Xcode 15 Beta (#1336)
* Don't use @import in framework headers
Once upon a time, Xcode was eagerly telling me to change everything to
use @import... and now it's giving me errors saying that's absolutely
not allowed in framework headers. So we'll go back to the #import way of
doing things (until Xcode complains about it again in some future
version)
* SwiftPM complains CordovaLib/cordova.js doesn't exist
Remove it from the list of excluded files, since I'm pretty sure this
doesn't get generated and put here anymore.
* Update some Xcode recommended settings
---
CordovaLib/Cordova/Cordova.h | 2 +-
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 21 +++++++++++++++++++--
CordovaLib/include/Cordova/CDVAllowList.h | 2 +-
CordovaLib/include/Cordova/CDVAppDelegate.h | 3 +--
.../include/Cordova/CDVAvailabilityDeprecated.h | 2 +-
CordovaLib/include/Cordova/CDVCommandQueue.h | 2 +-
CordovaLib/include/Cordova/CDVConfigParser.h | 2 +-
CordovaLib/include/Cordova/CDVInvokedUrlCommand.h | 2 +-
CordovaLib/include/Cordova/CDVPlugin+Resources.h | 2 +-
CordovaLib/include/Cordova/CDVPlugin.h | 5 ++---
CordovaLib/include/Cordova/CDVPluginResult.h | 3 +--
.../include/Cordova/CDVScreenOrientationDelegate.h | 2 +-
CordovaLib/include/Cordova/CDVTimer.h | 2 +-
CordovaLib/include/Cordova/CDVURLSchemeHandler.h | 5 ++---
CordovaLib/include/Cordova/CDVViewController.h | 4 ++--
.../include/Cordova/CDVWebViewEngineProtocol.h | 4 ++--
.../include/Cordova/CDVWebViewProcessPoolFactory.h | 2 +-
.../Cordova/NSDictionary+CordovaPreferences.h | 4 ++--
.../include/Cordova/NSMutableArray+QueueAdditions.h | 2 +-
Package.swift | 2 +-
.../__PROJECT_NAME__.xcodeproj/project.pbxproj | 7 +++++++
21 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/CordovaLib/Cordova/Cordova.h b/CordovaLib/Cordova/Cordova.h
index 4085f6a8..b49d56c4 100644
--- a/CordovaLib/Cordova/Cordova.h
+++ b/CordovaLib/Cordova/Cordova.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
//! Project version number for Cordova.
FOUNDATION_EXPORT double CordovaVersionNumber;
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 6a0ce951..04a7b35c 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -490,6 +490,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1010;
TargetAttributes = {
C0C01EB11E3911D50056E6CB = {
@@ -588,6 +589,9 @@
1DEB921F08733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ENABLE_MODULE_VERIFIER = YES;
+ MODULE_VERIFIER_SUPPORTED_LANGUAGES =
"objective-c objective-c++";
+ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS =
"gnu11 gnu++14";
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -596,6 +600,9 @@
1DEB922008733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ENABLE_MODULE_VERIFIER = YES;
+ MODULE_VERIFIER_SUPPORTED_LANGUAGES =
"objective-c objective-c++";
+ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS =
"gnu11 gnu++14";
PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -637,8 +644,10 @@
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
+ DEFINES_MODULE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
+ ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
@@ -655,6 +664,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ MERGEABLE_LIBRARY = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -701,8 +711,10 @@
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEFINES_MODULE = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -714,6 +726,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ MERGEABLE_LIBRARY = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
@@ -727,8 +740,8 @@
C0C01EB71E3911D50056E6CB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- DEFINES_MODULE = YES;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ ENABLE_MODULE_VERIFIER = YES;
INFOPLIST_FILE = Cordova/Info.plist;
INSTALL_PATH =
"$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
@@ -736,6 +749,8 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
+ MODULE_VERIFIER_SUPPORTED_LANGUAGES =
"objective-c objective-c++";
+ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS =
"gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER =
org.apache.cordova.Cordova;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
@@ -746,8 +761,8 @@
C0C01EB81E3911D50056E6CB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- DEFINES_MODULE = YES;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ ENABLE_MODULE_VERIFIER = YES;
INFOPLIST_FILE = Cordova/Info.plist;
INSTALL_PATH =
"$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
@@ -755,6 +770,8 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
+ MODULE_VERIFIER_SUPPORTED_LANGUAGES =
"objective-c objective-c++";
+ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS =
"gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER =
org.apache.cordova.Cordova;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
diff --git a/CordovaLib/include/Cordova/CDVAllowList.h
b/CordovaLib/include/Cordova/CDVAllowList.h
index 2c482032..57814b1e 100644
--- a/CordovaLib/include/Cordova/CDVAllowList.h
+++ b/CordovaLib/include/Cordova/CDVAllowList.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
extern NSString* const kCDVDefaultAllowListRejectionString;
diff --git a/CordovaLib/include/Cordova/CDVAppDelegate.h
b/CordovaLib/include/Cordova/CDVAppDelegate.h
index 9a15a517..cce9c342 100644
--- a/CordovaLib/include/Cordova/CDVAppDelegate.h
+++ b/CordovaLib/include/Cordova/CDVAppDelegate.h
@@ -17,8 +17,7 @@
under the License.
*/
-@import Foundation;
-
+#import <Foundation/Foundation.h>
#import <Cordova/CDVViewController.h>
@interface CDVAppDelegate : NSObject <UIApplicationDelegate>{}
diff --git a/CordovaLib/include/Cordova/CDVAvailabilityDeprecated.h
b/CordovaLib/include/Cordova/CDVAvailabilityDeprecated.h
index 4e34bb7f..abf7a16a 100644
--- a/CordovaLib/include/Cordova/CDVAvailabilityDeprecated.h
+++ b/CordovaLib/include/Cordova/CDVAvailabilityDeprecated.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import UIKit;
+#import <UIKit/UIKit.h>
#ifdef __clang__
#define CDV_DEPRECATED(version, msg) __attribute__((deprecated("Deprecated
in Cordova " #version ". " msg)))
diff --git a/CordovaLib/include/Cordova/CDVCommandQueue.h
b/CordovaLib/include/Cordova/CDVCommandQueue.h
index c7caf5fe..cb7bd6e4 100644
--- a/CordovaLib/include/Cordova/CDVCommandQueue.h
+++ b/CordovaLib/include/Cordova/CDVCommandQueue.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
@class CDVInvokedUrlCommand;
@class CDVViewController;
diff --git a/CordovaLib/include/Cordova/CDVConfigParser.h
b/CordovaLib/include/Cordova/CDVConfigParser.h
index f3dbefc7..0a937031 100644
--- a/CordovaLib/include/Cordova/CDVConfigParser.h
+++ b/CordovaLib/include/Cordova/CDVConfigParser.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
@interface CDVConfigParser : NSObject <NSXMLParserDelegate>
{
diff --git a/CordovaLib/include/Cordova/CDVInvokedUrlCommand.h
b/CordovaLib/include/Cordova/CDVInvokedUrlCommand.h
index 6d6dc3c1..993e0a28 100644
--- a/CordovaLib/include/Cordova/CDVInvokedUrlCommand.h
+++ b/CordovaLib/include/Cordova/CDVInvokedUrlCommand.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
@interface CDVInvokedUrlCommand : NSObject {
NSString* _callbackId;
diff --git a/CordovaLib/include/Cordova/CDVPlugin+Resources.h
b/CordovaLib/include/Cordova/CDVPlugin+Resources.h
index 7432a240..178ecb3a 100644
--- a/CordovaLib/include/Cordova/CDVPlugin+Resources.h
+++ b/CordovaLib/include/Cordova/CDVPlugin+Resources.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import UIKit;
+#import <UIKit/UIKit.h>
#import <Cordova/CDVPlugin.h>
@interface CDVPlugin (CDVPluginResources)
diff --git a/CordovaLib/include/Cordova/CDVPlugin.h
b/CordovaLib/include/Cordova/CDVPlugin.h
index 1e2a9280..a29b34c7 100644
--- a/CordovaLib/include/Cordova/CDVPlugin.h
+++ b/CordovaLib/include/Cordova/CDVPlugin.h
@@ -17,9 +17,8 @@
under the License.
*/
-@import Foundation;
-@import UIKit;
-
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
#import <Cordova/CDVPluginResult.h>
#import <Cordova/NSMutableArray+QueueAdditions.h>
#import <Cordova/CDVCommandDelegate.h>
diff --git a/CordovaLib/include/Cordova/CDVPluginResult.h
b/CordovaLib/include/Cordova/CDVPluginResult.h
index 9bfd6b21..39b56e85 100644
--- a/CordovaLib/include/Cordova/CDVPluginResult.h
+++ b/CordovaLib/include/Cordova/CDVPluginResult.h
@@ -17,8 +17,7 @@
under the License.
*/
-@import Foundation;
-
+#import <Foundation/Foundation.h>
#import <Cordova/CDVAvailability.h>
typedef NS_ENUM(NSUInteger, CDVCommandStatus) {
diff --git a/CordovaLib/include/Cordova/CDVScreenOrientationDelegate.h
b/CordovaLib/include/Cordova/CDVScreenOrientationDelegate.h
index 72afe88d..49c3c270 100644
--- a/CordovaLib/include/Cordova/CDVScreenOrientationDelegate.h
+++ b/CordovaLib/include/Cordova/CDVScreenOrientationDelegate.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
@protocol CDVScreenOrientationDelegate <NSObject>
diff --git a/CordovaLib/include/Cordova/CDVTimer.h
b/CordovaLib/include/Cordova/CDVTimer.h
index 1d402849..6d31593f 100644
--- a/CordovaLib/include/Cordova/CDVTimer.h
+++ b/CordovaLib/include/Cordova/CDVTimer.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
@interface CDVTimer : NSObject
diff --git a/CordovaLib/include/Cordova/CDVURLSchemeHandler.h
b/CordovaLib/include/Cordova/CDVURLSchemeHandler.h
index a0f25e08..f0440ab2 100644
--- a/CordovaLib/include/Cordova/CDVURLSchemeHandler.h
+++ b/CordovaLib/include/Cordova/CDVURLSchemeHandler.h
@@ -17,9 +17,8 @@
under the License.
*/
-@import Foundation;
-@import WebKit;
-
+#import <Foundation/Foundation.h>
+#import <WebKit/WebKit.h>
#import <Cordova/CDVViewController.h>
diff --git a/CordovaLib/include/Cordova/CDVViewController.h
b/CordovaLib/include/Cordova/CDVViewController.h
index 945709ff..84295051 100644
--- a/CordovaLib/include/Cordova/CDVViewController.h
+++ b/CordovaLib/include/Cordova/CDVViewController.h
@@ -17,8 +17,8 @@
under the License.
*/
-@import UIKit;
-@import WebKit;
+#import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
#import <Foundation/NSJSONSerialization.h>
#import <Cordova/CDVAvailability.h>
#import <Cordova/CDVInvokedUrlCommand.h>
diff --git a/CordovaLib/include/Cordova/CDVWebViewEngineProtocol.h
b/CordovaLib/include/Cordova/CDVWebViewEngineProtocol.h
index 2faf62d1..40187bca 100644
--- a/CordovaLib/include/Cordova/CDVWebViewEngineProtocol.h
+++ b/CordovaLib/include/Cordova/CDVWebViewEngineProtocol.h
@@ -17,8 +17,8 @@
under the License.
*/
-@import UIKit;
-@import WebKit;
+#import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
#define kCDVWebViewEngineScriptMessageHandlers
@"kCDVWebViewEngineScriptMessageHandlers"
#define kCDVWebViewEngineWKNavigationDelegate
@"kCDVWebViewEngineWKNavigationDelegate"
diff --git a/CordovaLib/include/Cordova/CDVWebViewProcessPoolFactory.h
b/CordovaLib/include/Cordova/CDVWebViewProcessPoolFactory.h
index 852fd6ee..b1562891 100644
--- a/CordovaLib/include/Cordova/CDVWebViewProcessPoolFactory.h
+++ b/CordovaLib/include/Cordova/CDVWebViewProcessPoolFactory.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import WebKit;
+#import <WebKit/WebKit.h>
@interface CDVWebViewProcessPoolFactory : NSObject
@property (nonatomic, retain) WKProcessPool* sharedPool;
diff --git a/CordovaLib/include/Cordova/NSDictionary+CordovaPreferences.h
b/CordovaLib/include/Cordova/NSDictionary+CordovaPreferences.h
index 5d27f005..9be2be2d 100644
--- a/CordovaLib/include/Cordova/NSDictionary+CordovaPreferences.h
+++ b/CordovaLib/include/Cordova/NSDictionary+CordovaPreferences.h
@@ -17,8 +17,8 @@
under the License.
*/
-@import Foundation;
-@import UIKit;
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
@interface NSDictionary (CordovaPreferences)
diff --git a/CordovaLib/include/Cordova/NSMutableArray+QueueAdditions.h
b/CordovaLib/include/Cordova/NSMutableArray+QueueAdditions.h
index 0ab614d7..79e65164 100644
--- a/CordovaLib/include/Cordova/NSMutableArray+QueueAdditions.h
+++ b/CordovaLib/include/Cordova/NSMutableArray+QueueAdditions.h
@@ -17,7 +17,7 @@
under the License.
*/
-@import Foundation;
+#import <Foundation/Foundation.h>
@interface NSMutableArray (QueueAdditions)
diff --git a/Package.swift b/Package.swift
index 7c9ca2ac..e85bff47 100644
--- a/Package.swift
+++ b/Package.swift
@@ -34,7 +34,7 @@ let package = Package(
.target(
name: "Cordova",
path: "CordovaLib/",
- exclude: ["cordova.js", "Cordova/Cordova.h", "Cordova/Info.plist"],
+ exclude: ["Cordova/Cordova.h", "Cordova/Info.plist"],
cSettings: [
.headerSearchPath("Classes/Private")
]
diff --git a/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj
b/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj
index dc6f30ab..3ce8caf9 100755
--- a/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj
+++ b/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj
@@ -224,6 +224,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
+ BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1130;
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
@@ -375,6 +376,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER =
YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -382,6 +384,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
+ ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@@ -392,6 +395,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ MERGED_BINARY_TYPE = automatic;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
@@ -418,12 +422,14 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER =
YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@@ -434,6 +440,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ MERGED_BINARY_TYPE = automatic;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
WK_WEB_VIEW_ONLY = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
