diff --git a/.ratignore b/.ratignore index 841e3a8d77..a0279089db 100644 --- a/.ratignore +++ b/.ratignore @@ -14,4 +14,7 @@ IDEWorkspaceChecks.plist # Testing Figures fixtures +#Xcode Test Plans are JSON with no comment support +(.*).xctestplan + node_modules diff --git a/package.json b/package.json index b445a4d0ff..0ed205af08 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,7 @@ "test": "npm run coverage && npm run objc-tests", "coverage": "nyc jasmine --config=tests/spec/coverage.json", "e2e-tests": "jasmine tests/spec/create.spec.js", - "objc-tests": "npm run objc-tests-lib && npm run objc-tests-framework", - "objc-tests-lib": "npm run xcodebuild -- -scheme CordovaLibTests", - "objc-tests-framework": "npm run xcodebuild -- -scheme CordovaFrameworkApp", - "xcodebuild": "xcodebuild -quiet test -workspace tests/cordova-ios.xcworkspace -destination \"platform=iOS Simulator,name=iPhone 15\" -derivedDataPath \"`mktemp -d 2>/dev/null || mktemp -d -t 'cordova-ios'`\"", + "objc-tests": "xcodebuild -quiet test -workspace tests/cordova-ios.xcworkspace -scheme CordovaTestApp -destination \"platform=iOS Simulator,name=${CDV_IOS_SIM:-iPhone SE (3rd generation)}\" -derivedDataPath \"`mktemp -d 2>/dev/null || mktemp -d -t 'cordova-ios'`\"", "preobjc-tests": "killall Simulator || true", "unit-tests": "jasmine --config=tests/spec/unit.json", "lint": "eslint . \"templates/cordova/lib/!(*.*)\"" diff --git a/tests/CordovaLibTests/CDVAllowListTests.m b/tests/CordovaLibTests/CDVAllowListTests.m index a6a771ef09..1d5178179b 100644 --- a/tests/CordovaLibTests/CDVAllowListTests.m +++ b/tests/CordovaLibTests/CDVAllowListTests.m @@ -239,6 +239,18 @@ - (void)testSpecificProtocol XCTAssertFalse([allowList URLIsAllowed:[NSURL URLWithString:@"http://www.google.com"]]); } +- (void)testSpecificPort +{ + NSArray* allowedHosts = [NSArray arrayWithObjects: + @"http://www.apache.org:8080", + nil]; + + CDVAllowList* allowList = [[CDVAllowList alloc] initWithArray:allowedHosts]; + + XCTAssertFalse([allowList URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org/index.html"]]); + XCTAssertTrue([allowList URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org:8080/index.html"]]); +} + - (void)testWildcardPlusOtherUrls { // test for https://issues.apache.org/jira/browse/CB-3394 diff --git a/tests/CordovaLibTests/CDVPluginInitTests.m b/tests/CordovaLibTests/CDVPluginInitTests.m index f3e1fc4724..226ec011d1 100644 --- a/tests/CordovaLibTests/CDVPluginInitTests.m +++ b/tests/CordovaLibTests/CDVPluginInitTests.m @@ -19,7 +19,8 @@ Licensed to the Apache Software Foundation (ASF) under one #import #import -#import "AppDelegate.h" + +#import "CordovaApp-Swift.h" @interface CDVPluginInitTests : XCTestCase @property AppDelegate* appDelegate; diff --git a/tests/CordovaLibTests/CordovaApp/AppDelegate.swift b/tests/CordovaLibTests/CordovaApp/AppDelegate.swift new file mode 100644 index 0000000000..96b75865b5 --- /dev/null +++ b/tests/CordovaLibTests/CordovaApp/AppDelegate.swift @@ -0,0 +1,58 @@ +/* + 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. +*/ + +import UIKit +import Cordova + +@main +@objc class AppDelegate : CDVAppDelegate { + fileprivate var _window : UIWindow? + fileprivate var _viewController : ViewController? + + @objc public var testViewController : CDVViewController? { + return _viewController + } + + @objc func createViewController() { + _viewController = ViewController(); + _viewController?.webContentFolderName = "www"; + _viewController?.startPage = "index.html"; + + _window?.rootViewController = _viewController; + _window?.makeKeyAndVisible(); + } + + @objc func destroyViewController() { + _viewController = nil + } + + override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { + let retVal = super.application(application, didFinishLaunchingWithOptions:launchOptions); + + let bounds = UIScreen.main.bounds; + _window = UIWindow(frame: bounds); + _window?.autoresizesSubviews = true; + + if NSClassFromString("CDVWebViewTest") != nil { + createViewController(); + } + + return retVal; + } +} diff --git a/tests/CordovaLibTests/CordovaLibApp/SwiftInitPlugin.swift b/tests/CordovaLibTests/CordovaApp/Plugins/SwiftInitPlugin.swift similarity index 98% rename from tests/CordovaLibTests/CordovaLibApp/SwiftInitPlugin.swift rename to tests/CordovaLibTests/CordovaApp/Plugins/SwiftInitPlugin.swift index 904d4b276a..6889036ab6 100644 --- a/tests/CordovaLibTests/CordovaLibApp/SwiftInitPlugin.swift +++ b/tests/CordovaLibTests/CordovaApp/Plugins/SwiftInitPlugin.swift @@ -17,6 +17,8 @@ under the License. */ +import Cordova + @objc class SwiftInitPlugin : CDVPlugin { let initStr : String = "Successfully initialized"; diff --git a/tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h b/tests/CordovaLibTests/CordovaApp/ViewController.swift similarity index 92% rename from tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h rename to tests/CordovaLibTests/CordovaApp/ViewController.swift index 82c5749c01..827ddd305c 100644 --- a/tests/CordovaLibTests/CordovaLibApp/Bridging-Header.h +++ b/tests/CordovaLibTests/CordovaApp/ViewController.swift @@ -15,7 +15,9 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - */ +*/ -#import +import Cordova +class ViewController: CDVViewController { +} diff --git a/tests/CordovaLibTests/CordovaLibApp/config.xml b/tests/CordovaLibTests/CordovaApp/config.xml similarity index 100% rename from tests/CordovaLibTests/CordovaLibApp/config.xml rename to tests/CordovaLibTests/CordovaApp/config.xml diff --git a/tests/CordovaLibTests/CordovaLibApp/www/index.html b/tests/CordovaLibTests/CordovaApp/www/index.html similarity index 100% rename from tests/CordovaLibTests/CordovaLibApp/www/index.html rename to tests/CordovaLibTests/CordovaApp/www/index.html diff --git a/tests/CordovaLibTests/CordovaLibApp/AppDelegate.h b/tests/CordovaLibTests/CordovaLibApp/AppDelegate.h deleted file mode 100644 index 952f504ad4..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/AppDelegate.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - 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. - */ - -#import -#import - -@class CDVViewController; - -@interface AppDelegate : CDVAppDelegate - -@property (nullable, nonatomic, strong, readonly) CDVViewController *testViewController; - -- (void)createViewController; -- (void)destroyViewController; - -@end diff --git a/tests/CordovaLibTests/CordovaLibApp/AppDelegate.m b/tests/CordovaLibTests/CordovaLibApp/AppDelegate.m deleted file mode 100644 index 16fc907311..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/AppDelegate.m +++ /dev/null @@ -1,68 +0,0 @@ -/* - 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. - */ - -#import "AppDelegate.h" - -#import "ViewController.h" - -@interface AppDelegate () { - UIWindow *_window; - CDVViewController *_viewController; -} -@end - -@implementation AppDelegate - -@synthesize testViewController = _viewController; - -- (void)createViewController -{ - _viewController = [[ViewController alloc] init]; - _viewController.webContentFolderName = @"www"; - _viewController.startPage = @"index.html"; - - // NOTE: To customize the view's frame size (which defaults to full screen), override - // [self.viewController viewWillAppear:] in your view controller. - - _window.rootViewController = _viewController; - [_window makeKeyAndVisible]; -} - -- (void)destroyViewController -{ - _viewController = nil; -} - -- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions -{ - BOOL retVal = [super application:application didFinishLaunchingWithOptions:launchOptions]; - - CGRect screenBounds = [[UIScreen mainScreen] bounds]; - _window = [[UIWindow alloc] initWithFrame:screenBounds]; - _window.autoresizesSubviews = YES; - - // Create the main view on start-up only when not running unit tests. - if (!NSClassFromString(@"CDVWebViewTest")) { - [self createViewController]; - } - - return retVal; -} - -@end diff --git a/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist b/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist deleted file mode 100644 index 19fce15a56..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/tests/CordovaLibTests/CordovaLibApp/ViewController.h b/tests/CordovaLibTests/CordovaLibApp/ViewController.h deleted file mode 100644 index 841d1e8211..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/ViewController.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - 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. - */ - -#import -#import - -@interface ViewController : CDVViewController - -@end diff --git a/tests/CordovaLibTests/CordovaLibApp/ViewController.m b/tests/CordovaLibTests/CordovaLibApp/ViewController.m deleted file mode 100644 index 9fb1e73203..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/ViewController.m +++ /dev/null @@ -1,42 +0,0 @@ -/* - 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. - */ - -#import "ViewController.h" - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewWillAppear:(BOOL)animated -{ - // View defaults to full size. If you want to customize the view's size, or its subviews (e.g. webView), - // you can do so here. - - [super viewWillAppear:animated]; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -@end diff --git a/tests/CordovaLibTests/CordovaLibApp/en.lproj/InfoPlist.strings b/tests/CordovaLibTests/CordovaLibApp/en.lproj/InfoPlist.strings deleted file mode 100644 index 01d5c8cfab..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,20 +0,0 @@ -/* - 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. - */ -/* Localized versions of Info.plist keys */ - diff --git a/tests/CordovaLibTests/CordovaLibApp/main.m b/tests/CordovaLibTests/CordovaLibApp/main.m deleted file mode 100644 index 120ac53418..0000000000 --- a/tests/CordovaLibTests/CordovaLibApp/main.m +++ /dev/null @@ -1,29 +0,0 @@ -/* - 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. - */ - -#import - -#import "AppDelegate.h" - -int main(int argc, char* argv[]) -{ - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/tests/CordovaLibTests/CordovaLibTests-Info.plist b/tests/CordovaLibTests/CordovaTests-Info.plist similarity index 100% rename from tests/CordovaLibTests/CordovaLibTests-Info.plist rename to tests/CordovaLibTests/CordovaTests-Info.plist diff --git a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj b/tests/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj similarity index 54% rename from tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj rename to tests/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj index e301b350c0..537ae212ce 100644 --- a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj +++ b/tests/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj @@ -21,37 +21,18 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 3006BCEA1D1A859B0035385C /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3006BCE91D1A859B0035385C /* libCordova.a */; }; - 3035621714104C34006C2D43 /* CDVAllowListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 30356213141049E1006C2D43 /* CDVAllowListTests.m */; }; - 303A4072152124BB00182201 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 303A4070152124BB00182201 /* InfoPlist.strings */; }; - 303A4074152124BB00182201 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A4073152124BB00182201 /* main.m */; }; - 303A4078152124BB00182201 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A4077152124BB00182201 /* AppDelegate.m */; }; - 303A407B152124BB00182201 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A407A152124BB00182201 /* ViewController.m */; }; - 30610C9219AD9B95000B3781 /* CDVCommandDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 30610C9119AD9B95000B3781 /* CDVCommandDelegateTests.m */; }; - 30D1B08C15A2B36D0060C291 /* CDVBase64Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 30D1B08B15A2B36D0060C291 /* CDVBase64Tests.m */; }; - 30F8AE1D152129DA006625B3 /* www in Resources */ = {isa = PBXBuildFile; fileRef = 30F8AE1C152129DA006625B3 /* www */; }; - 4E23F90223E175AD006CD852 /* CDVWebViewEngineTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E23F90123E175AD006CD852 /* CDVWebViewEngineTest.m */; }; - 5C4C91761C2ACE450055AFC3 /* CDVViewControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C4C91751C2ACE450055AFC3 /* CDVViewControllerTest.m */; }; - 5C4C917B1C2AD44E0055AFC3 /* config-custom.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5C4C91771C2ACF130055AFC3 /* config-custom.xml */; }; - 686357B5141002F200DF4CF2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 686357B3141002F200DF4CF2 /* InfoPlist.strings */; }; - 686357BA141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 686357B9141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m */; }; - 7EF33BD71911ABA20048544E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF33BD61911ABA20048544E /* Default-568h@2x.png */; }; - 902530FB29A6DC53004AF1CF /* CDVPluginInitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 902530FA29A6DC53004AF1CF /* CDVPluginInitTests.m */; }; + 900A9F542CF0677F00FECE7A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900A9F532CF0677F00FECE7A /* ViewController.swift */; }; + 900A9F5A2CF0696300FECE7A /* SwiftInitPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900A9F582CF0695D00FECE7A /* SwiftInitPlugin.swift */; }; 902530FC29A6DC53004AF1CF /* CDVPluginInitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 902530FA29A6DC53004AF1CF /* CDVPluginInitTests.m */; }; - 908630C829A6D003002963FA /* SwiftInitPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 908630C729A6D003002963FA /* SwiftInitPlugin.swift */; }; - 908630C929A6D003002963FA /* SwiftInitPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 908630C729A6D003002963FA /* SwiftInitPlugin.swift */; }; + 905C8BA82CF0756E007EECEF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 905C8BA72CF0756E007EECEF /* AppDelegate.swift */; }; + 9085EE302CF0617800603B73 /* Cordova.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0FA7CAC1E4BB6B30077B045 /* Cordova.framework */; }; 90A775DD2C6F257500FC5BB0 /* CDVSettingsDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A775DC2C6F256D00FC5BB0 /* CDVSettingsDictionaryTests.m */; }; - 90A775DE2C6F257500FC5BB0 /* CDVSettingsDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A775DC2C6F256D00FC5BB0 /* CDVSettingsDictionaryTests.m */; }; - C0FA7C9B1E4BB6420077B045 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A4073152124BB00182201 /* main.m */; }; - C0FA7C9C1E4BB6420077B045 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A4077152124BB00182201 /* AppDelegate.m */; }; - C0FA7C9D1E4BB6420077B045 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A407A152124BB00182201 /* ViewController.m */; }; C0FA7CA11E4BB6420077B045 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = F8EB14D0165FFD3200616F39 /* config.xml */; }; C0FA7CA21E4BB6420077B045 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EF33BD61911ABA20048544E /* Default-568h@2x.png */; }; - C0FA7CA31E4BB6420077B045 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 303A4070152124BB00182201 /* InfoPlist.strings */; }; C0FA7CA41E4BB6420077B045 /* www in Resources */ = {isa = PBXBuildFile; fileRef = 30F8AE1C152129DA006625B3 /* www */; }; C0FA7CA51E4BB6420077B045 /* config-custom.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5C4C91771C2ACF130055AFC3 /* config-custom.xml */; }; C0FA7CB51E4BBBBE0077B045 /* CDVAllowListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 30356213141049E1006C2D43 /* CDVAllowListTests.m */; }; @@ -62,22 +43,11 @@ C0FA7CBC1E4BBBBE0077B045 /* CDVInvokedUrlCommandTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */; }; C0FA7CBF1E4BBBBE0077B045 /* CDVCommandDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 30610C9119AD9B95000B3781 /* CDVCommandDelegateTests.m */; }; C0FA7CC31E4BBBBE0077B045 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 686357B3141002F200DF4CF2 /* InfoPlist.strings */; }; - C0FA7CCE1E4BBE400077B045 /* Cordova.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0FA7CAC1E4BB6B30077B045 /* Cordova.framework */; }; C0FA7CDB1E4BC4FE0077B045 /* Cordova.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0FA7CAC1E4BB6B30077B045 /* Cordova.framework */; }; C0FA7CDD1E4BC5020077B045 /* Cordova.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C0FA7CAC1E4BB6B30077B045 /* Cordova.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - EB89634A15FE66EA00E12277 /* CDVInvokedUrlCommandTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */; }; - EBA3554615A731F100F4DE24 /* CDVFakeFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */; }; - F8EB14D1165FFD3200616F39 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = F8EB14D0165FFD3200616F39 /* config.xml */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 30F8AE3215212F07006625B3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 303A4067152124BB00182201; - remoteInfo = CordovaLibApp; - }; C0FA7CCC1E4BBD870077B045 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -102,56 +72,33 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 3006BCE91D1A859B0035385C /* libCordova.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCordova.a; path = "../Debug-iphonesimulator/libCordova.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 30356213141049E1006C2D43 /* CDVAllowListTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVAllowListTests.m; sourceTree = ""; }; - 303A4068152124BB00182201 /* CordovaLibApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CordovaLibApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 303A406F152124BB00182201 /* CordovaLibApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "CordovaLibApp-Info.plist"; sourceTree = ""; }; - 303A4071152124BB00182201 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 303A4073152124BB00182201 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 303A4076152124BB00182201 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 303A4077152124BB00182201 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 303A4079152124BB00182201 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 303A407A152124BB00182201 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 30610C9119AD9B95000B3781 /* CDVCommandDelegateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVCommandDelegateTests.m; sourceTree = ""; }; 30D1B08B15A2B36D0060C291 /* CDVBase64Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVBase64Tests.m; sourceTree = ""; }; 30F8AE1C152129DA006625B3 /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = ""; }; 4E23F90123E175AD006CD852 /* CDVWebViewEngineTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVWebViewEngineTest.m; sourceTree = ""; }; 5C4C91751C2ACE450055AFC3 /* CDVViewControllerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVViewControllerTest.m; sourceTree = ""; }; 5C4C91771C2ACF130055AFC3 /* config-custom.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "config-custom.xml"; sourceTree = ""; }; - 686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CordovaLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 686357B2141002F200DF4CF2 /* CordovaLibTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "CordovaLibTests-Info.plist"; sourceTree = ""; }; + 686357B2141002F200DF4CF2 /* CordovaTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "CordovaTests-Info.plist"; sourceTree = ""; }; 686357B4141002F200DF4CF2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 686357B9141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CDVPluginResultJSONSerializationTests.m; sourceTree = ""; }; 7EF33BD61911ABA20048544E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 900A9F532CF0677F00FECE7A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 900A9F582CF0695D00FECE7A /* SwiftInitPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftInitPlugin.swift; sourceTree = ""; }; 902530FA29A6DC53004AF1CF /* CDVPluginInitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVPluginInitTests.m; sourceTree = ""; }; - 908630C729A6D003002963FA /* SwiftInitPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftInitPlugin.swift; sourceTree = ""; }; + 905C8BA72CF0756E007EECEF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 9085EE2F2CF05B5900603B73 /* CordovaTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = CordovaTests.xctestplan; sourceTree = ""; }; 90A775DC2C6F256D00FC5BB0 /* CDVSettingsDictionaryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CDVSettingsDictionaryTests.m; sourceTree = ""; }; - C0FA7CAA1E4BB6420077B045 /* CordovaFrameworkApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CordovaFrameworkApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C0FA7CAA1E4BB6420077B045 /* CordovaApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CordovaApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; C0FA7CAC1E4BB6B30077B045 /* Cordova.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cordova.framework; path = "../Debug-iphonesimulator/Cordova.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - C0FA7CC71E4BBBBE0077B045 /* CordovaFrameworkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CordovaFrameworkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C0FA7CC71E4BBBBE0077B045 /* CordovaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CordovaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; EB89634915FE66EA00E12277 /* CDVInvokedUrlCommandTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVInvokedUrlCommandTests.m; sourceTree = ""; }; EBA3554415A731F100F4DE24 /* CDVFakeFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVFakeFileManager.h; sourceTree = ""; }; EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVFakeFileManager.m; sourceTree = ""; }; - ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = ""; }; - F8EB14D0165FFD3200616F39 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = CordovaLibApp/config.xml; sourceTree = ""; }; + F8EB14D0165FFD3200616F39 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = CordovaApp/config.xml; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 303A4065152124BB00182201 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3006BCEA1D1A859B0035385C /* libCordova.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 686357A5141002F100DF4CF2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; C0FA7C9E1E4BB6420077B045 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -164,7 +111,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C0FA7CCE1E4BBE400077B045 /* Cordova.framework in Frameworks */, + 9085EE302CF0617800603B73 /* Cordova.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -174,10 +121,8 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - 686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */, - 303A4068152124BB00182201 /* CordovaLibApp.app */, - C0FA7CAA1E4BB6420077B045 /* CordovaFrameworkApp.app */, - C0FA7CC71E4BBBBE0077B045 /* CordovaFrameworkTests.xctest */, + C0FA7CAA1E4BB6420077B045 /* CordovaApp.app */, + C0FA7CC71E4BBBBE0077B045 /* CordovaTests.xctest */, ); name = Products; sourceTree = CORDOVALIB; @@ -185,11 +130,12 @@ 0867D691FE84028FC02AAC07 /* CordovaLib */ = { isa = PBXGroup; children = ( + 9085EE2F2CF05B5900603B73 /* CordovaTests.xctestplan */, 7EF33BD61911ABA20048544E /* Default-568h@2x.png */, F8EB14D0165FFD3200616F39 /* config.xml */, 5C4C91771C2ACF130055AFC3 /* config-custom.xml */, - EB3B34F4161B585D003DBE7D /* CordovaLibTests */, - 303A406D152124BB00182201 /* CordovaLibApp */, + EB3B34F4161B585D003DBE7D /* CordovaTests */, + 303A406D152124BB00182201 /* CordovaApp */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, ); @@ -200,46 +146,39 @@ isa = PBXGroup; children = ( C0FA7CAC1E4BB6B30077B045 /* Cordova.framework */, - 3006BCE91D1A859B0035385C /* libCordova.a */, ); name = Frameworks; sourceTree = ""; }; - 303A406D152124BB00182201 /* CordovaLibApp */ = { + 303A406D152124BB00182201 /* CordovaApp */ = { isa = PBXGroup; children = ( + 905C8BA72CF0756E007EECEF /* AppDelegate.swift */, + 900A9F532CF0677F00FECE7A /* ViewController.swift */, + 900A9F592CF0695D00FECE7A /* Plugins */, 30F8AE1C152129DA006625B3 /* www */, - 303A4076152124BB00182201 /* AppDelegate.h */, - 303A4077152124BB00182201 /* AppDelegate.m */, - 303A4079152124BB00182201 /* ViewController.h */, - 303A407A152124BB00182201 /* ViewController.m */, - 303A406E152124BB00182201 /* Supporting Files */, - 908630C729A6D003002963FA /* SwiftInitPlugin.swift */, ); - path = CordovaLibApp; + path = CordovaApp; sourceTree = ""; }; - 303A406E152124BB00182201 /* Supporting Files */ = { + 686357B1141002F200DF4CF2 /* Supporting Files */ = { isa = PBXGroup; children = ( - 303A406F152124BB00182201 /* CordovaLibApp-Info.plist */, - 303A4070152124BB00182201 /* InfoPlist.strings */, - 303A4073152124BB00182201 /* main.m */, - ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */, + 686357B2141002F200DF4CF2 /* CordovaTests-Info.plist */, + 686357B3141002F200DF4CF2 /* InfoPlist.strings */, ); name = "Supporting Files"; sourceTree = ""; }; - 686357B1141002F200DF4CF2 /* Supporting Files */ = { + 900A9F592CF0695D00FECE7A /* Plugins */ = { isa = PBXGroup; children = ( - 686357B2141002F200DF4CF2 /* CordovaLibTests-Info.plist */, - 686357B3141002F200DF4CF2 /* InfoPlist.strings */, + 900A9F582CF0695D00FECE7A /* SwiftInitPlugin.swift */, ); - name = "Supporting Files"; + path = Plugins; sourceTree = ""; }; - EB3B34F4161B585D003DBE7D /* CordovaLibTests */ = { + EB3B34F4161B585D003DBE7D /* CordovaTests */ = { isa = PBXGroup; children = ( 90A775DC2C6F256D00FC5BB0 /* CDVSettingsDictionaryTests.m */, @@ -255,51 +194,15 @@ 30356213141049E1006C2D43 /* CDVAllowListTests.m */, 686357B1141002F200DF4CF2 /* Supporting Files */, ); - name = CordovaLibTests; + name = CordovaTests; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 303A4067152124BB00182201 /* CordovaLibApp */ = { - isa = PBXNativeTarget; - buildConfigurationList = 303A4082152124BB00182201 /* Build configuration list for PBXNativeTarget "CordovaLibApp" */; - buildPhases = ( - 303A4064152124BB00182201 /* Sources */, - 303A4065152124BB00182201 /* Frameworks */, - 303A4066152124BB00182201 /* Resources */, - 30F8AE1615212883006625B3 /* Copy cordova.js into www directory */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CordovaLibApp; - productName = CordovaLibApp; - productReference = 303A4068152124BB00182201 /* CordovaLibApp.app */; - productType = "com.apple.product-type.application"; - }; - 686357A8141002F100DF4CF2 /* CordovaLibTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 686357BD141002F200DF4CF2 /* Build configuration list for PBXNativeTarget "CordovaLibTests" */; - buildPhases = ( - 686357A4141002F100DF4CF2 /* Sources */, - 686357A5141002F100DF4CF2 /* Frameworks */, - 686357A6141002F100DF4CF2 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 30F8AE3315212F07006625B3 /* PBXTargetDependency */, - ); - name = CordovaLibTests; - productName = CordovaLibTests; - productReference = 686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - C0FA7C991E4BB6420077B045 /* CordovaFrameworkApp */ = { + C0FA7C991E4BB6420077B045 /* CordovaApp */ = { isa = PBXNativeTarget; - buildConfigurationList = C0FA7CA71E4BB6420077B045 /* Build configuration list for PBXNativeTarget "CordovaFrameworkApp" */; + buildConfigurationList = C0FA7CA71E4BB6420077B045 /* Build configuration list for PBXNativeTarget "CordovaApp" */; buildPhases = ( C0FA7C9A1E4BB6420077B045 /* Sources */, C0FA7C9E1E4BB6420077B045 /* Frameworks */, @@ -311,14 +214,14 @@ ); dependencies = ( ); - name = CordovaFrameworkApp; + name = CordovaApp; productName = CordovaLibApp; - productReference = C0FA7CAA1E4BB6420077B045 /* CordovaFrameworkApp.app */; + productReference = C0FA7CAA1E4BB6420077B045 /* CordovaApp.app */; productType = "com.apple.product-type.application"; }; - C0FA7CB11E4BBBBE0077B045 /* CordovaFrameworkTests */ = { + C0FA7CB11E4BBBBE0077B045 /* CordovaTests */ = { isa = PBXNativeTarget; - buildConfigurationList = C0FA7CC41E4BBBBE0077B045 /* Build configuration list for PBXNativeTarget "CordovaFrameworkTests" */; + buildConfigurationList = C0FA7CC41E4BBBBE0077B045 /* Build configuration list for PBXNativeTarget "CordovaTests" */; buildPhases = ( C0FA7CB41E4BBBBE0077B045 /* Sources */, C0FA7CC11E4BBBBE0077B045 /* Frameworks */, @@ -329,9 +232,9 @@ dependencies = ( C0FA7CCD1E4BBD870077B045 /* PBXTargetDependency */, ); - name = CordovaFrameworkTests; + name = CordovaTests; productName = CordovaLibTests; - productReference = C0FA7CC71E4BBBBE0077B045 /* CordovaFrameworkTests.xctest */; + productReference = C0FA7CC71E4BBBBE0077B045 /* CordovaTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -340,14 +243,15 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1130; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1620; TargetAttributes = { C0FA7CB11E4BBBBE0077B045 = { TestTargetID = C0FA7C991E4BB6420077B045; }; }; }; - buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "CordovaLibTests" */; + buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "CordovaTests" */; compatibilityVersion = "Xcode 11.0"; developmentRegion = en; hasScannedForEncodings = 1; @@ -363,42 +267,19 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 686357A8141002F100DF4CF2 /* CordovaLibTests */, - 303A4067152124BB00182201 /* CordovaLibApp */, - C0FA7C991E4BB6420077B045 /* CordovaFrameworkApp */, - C0FA7CB11E4BBBBE0077B045 /* CordovaFrameworkTests */, + C0FA7C991E4BB6420077B045 /* CordovaApp */, + C0FA7CB11E4BBBBE0077B045 /* CordovaTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 303A4066152124BB00182201 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - F8EB14D1165FFD3200616F39 /* config.xml in Resources */, - 7EF33BD71911ABA20048544E /* Default-568h@2x.png in Resources */, - 303A4072152124BB00182201 /* InfoPlist.strings in Resources */, - 30F8AE1D152129DA006625B3 /* www in Resources */, - 5C4C917B1C2AD44E0055AFC3 /* config-custom.xml in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 686357A6141002F100DF4CF2 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 686357B5141002F200DF4CF2 /* InfoPlist.strings in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; C0FA7CA01E4BB6420077B045 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( C0FA7CA11E4BB6420077B045 /* config.xml in Resources */, C0FA7CA21E4BB6420077B045 /* Default-568h@2x.png in Resources */, - C0FA7CA31E4BB6420077B045 /* InfoPlist.strings in Resources */, C0FA7CA41E4BB6420077B045 /* www in Resources */, C0FA7CA51E4BB6420077B045 /* config-custom.xml in Resources */, ); @@ -415,24 +296,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 30F8AE1615212883006625B3 /* Copy cordova.js into www directory */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "", - "$(SRCROOT)/../../templates/project/www/cordova.js", - ); - name = "Copy cordova.js into www directory"; - outputPaths = ( - $BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/www/cordova.js, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp ../../templates/project/www/cordova.js \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/www/cordova.js\"\n"; - showEnvVarsInLog = 0; - }; C0FA7CA61E4BB6420077B045 /* Copy cordova.js into www directory */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -454,42 +317,13 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 303A4064152124BB00182201 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 908630C829A6D003002963FA /* SwiftInitPlugin.swift in Sources */, - 303A4074152124BB00182201 /* main.m in Sources */, - 303A4078152124BB00182201 /* AppDelegate.m in Sources */, - 303A407B152124BB00182201 /* ViewController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 686357A4141002F100DF4CF2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3035621714104C34006C2D43 /* CDVAllowListTests.m in Sources */, - 686357BA141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m in Sources */, - 90A775DE2C6F257500FC5BB0 /* CDVSettingsDictionaryTests.m in Sources */, - 902530FB29A6DC53004AF1CF /* CDVPluginInitTests.m in Sources */, - 30D1B08C15A2B36D0060C291 /* CDVBase64Tests.m in Sources */, - EBA3554615A731F100F4DE24 /* CDVFakeFileManager.m in Sources */, - 4E23F90223E175AD006CD852 /* CDVWebViewEngineTest.m in Sources */, - 5C4C91761C2ACE450055AFC3 /* CDVViewControllerTest.m in Sources */, - EB89634A15FE66EA00E12277 /* CDVInvokedUrlCommandTests.m in Sources */, - 30610C9219AD9B95000B3781 /* CDVCommandDelegateTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; C0FA7C9A1E4BB6420077B045 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 908630C929A6D003002963FA /* SwiftInitPlugin.swift in Sources */, - C0FA7C9B1E4BB6420077B045 /* main.m in Sources */, - C0FA7C9C1E4BB6420077B045 /* AppDelegate.m in Sources */, - C0FA7C9D1E4BB6420077B045 /* ViewController.m in Sources */, + 900A9F5A2CF0696300FECE7A /* SwiftInitPlugin.swift in Sources */, + 900A9F542CF0677F00FECE7A /* ViewController.swift in Sources */, + 905C8BA82CF0756E007EECEF /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -512,27 +346,14 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 30F8AE3315212F07006625B3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 303A4067152124BB00182201 /* CordovaLibApp */; - targetProxy = 30F8AE3215212F07006625B3 /* PBXContainerItemProxy */; - }; C0FA7CCD1E4BBD870077B045 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C0FA7C991E4BB6420077B045 /* CordovaFrameworkApp */; + target = C0FA7C991E4BB6420077B045 /* CordovaApp */; targetProxy = C0FA7CCC1E4BBD870077B045 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 303A4070152124BB00182201 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 303A4071152124BB00182201 /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; 686357B3141002F200DF4CF2 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -547,6 +368,7 @@ 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -568,6 +390,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -593,7 +416,6 @@ PUBLIC_HEADERS_FOLDER_PATH = include/Cordova; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = "CordovaLibApp/Bridging-Header.h"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ( "Classes/**", @@ -605,6 +427,7 @@ 1DEB922408733DC00010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -626,6 +449,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = c99; @@ -649,7 +473,7 @@ PUBLIC_HEADERS_FOLDER_PATH = include/Cordova; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = "CordovaLibApp/Bridging-Header.h"; + SWIFT_COMPILATION_MODE = wholemodule; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ( "Classes/**", @@ -658,129 +482,6 @@ }; name = Release; }; - 303A4083152124BB00182201 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - 303A4084152124BB00182201 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; - VALIDATE_PRODUCT = YES; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; - 686357BB141002F200DF4CF2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/CordovaLibApp.app/CordovaLibApp"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(BUILT_PRODUCTS_DIR)/usr/local/include", - "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", - ); - INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "-all_load", - "-ObjC", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; - }; - name = Debug; - }; - 686357BC141002F200DF4CF2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/CordovaLibApp.app/CordovaLibApp"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(BUILT_PRODUCTS_DIR)/usr/local/include", - "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", - ); - INFOPLIST_FILE = "CordovaLibTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - ONLY_ACTIVE_ARCH = NO; - OTHER_LDFLAGS = ( - "-all_load", - "-ObjC", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; - }; - name = Release; - }; C0FA7CA81E4BB6420077B045 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -788,7 +489,8 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -798,14 +500,15 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GENERATE_INFOPLIST_FILE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "$(SRCROOT)/CordovaLibApp/CordovaLibApp-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -822,19 +525,21 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GENERATE_INFOPLIST_FILE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "$(SRCROOT)/CordovaLibApp/CordovaLibApp-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MARKETING_VERSION = 1.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -866,7 +571,7 @@ "$(BUILT_PRODUCTS_DIR)/usr/local/include", "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); - INFOPLIST_FILE = "CordovaLibTests-Info.plist"; + INFOPLIST_FILE = "CordovaTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( @@ -875,8 +580,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CordovaFrameworkApp.app/CordovaFrameworkApp"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CordovaApp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CordovaApp"; + USER_HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../CordovaLib/Classes/Private/**", + "$(CONFIGURATION_TEMP_DIR)/CordovaApp.build/DerivedSources\"", + ); }; name = Debug; }; @@ -898,7 +606,7 @@ "$(BUILT_PRODUCTS_DIR)/usr/local/include", "$(BUILT_PRODUCTS_DIR)/include/Cordova/**", ); - INFOPLIST_FILE = "CordovaLibTests-Info.plist"; + INFOPLIST_FILE = "CordovaTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( @@ -907,15 +615,18 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CordovaFrameworkApp.app/CordovaFrameworkApp"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../CordovaLib/Classes/Private/**"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CordovaApp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CordovaApp"; + USER_HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../CordovaLib/Classes/Private/**", + "$(CONFIGURATION_TEMP_DIR)/CordovaApp.build/DerivedSources\"", + ); }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "CordovaLibTests" */ = { + 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "CordovaTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB922308733DC00010E9CD /* Debug */, @@ -924,25 +635,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 303A4082152124BB00182201 /* Build configuration list for PBXNativeTarget "CordovaLibApp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 303A4083152124BB00182201 /* Debug */, - 303A4084152124BB00182201 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 686357BD141002F200DF4CF2 /* Build configuration list for PBXNativeTarget "CordovaLibTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 686357BB141002F200DF4CF2 /* Debug */, - 686357BC141002F200DF4CF2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0FA7CA71E4BB6420077B045 /* Build configuration list for PBXNativeTarget "CordovaFrameworkApp" */ = { + C0FA7CA71E4BB6420077B045 /* Build configuration list for PBXNativeTarget "CordovaApp" */ = { isa = XCConfigurationList; buildConfigurations = ( C0FA7CA81E4BB6420077B045 /* Debug */, @@ -951,7 +644,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C0FA7CC41E4BBBBE0077B045 /* Build configuration list for PBXNativeTarget "CordovaFrameworkTests" */ = { + C0FA7CC41E4BBBBE0077B045 /* Build configuration list for PBXNativeTarget "CordovaTests" */ = { isa = XCConfigurationList; buildConfigurations = ( C0FA7CC51E4BBBBE0077B045 /* Debug */, diff --git a/tests/CordovaLibTests/CordovaTests.xctestplan b/tests/CordovaLibTests/CordovaTests.xctestplan new file mode 100644 index 0000000000..6c5bf6932c --- /dev/null +++ b/tests/CordovaLibTests/CordovaTests.xctestplan @@ -0,0 +1,40 @@ +{ + "configurations" : [ + { + "id" : "3DDF2475-8F46-4982-ABB2-1015DBA9EAF0", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : { + "targets" : [ + { + "containerPath" : "container:..\/CordovaLib\/CordovaLib.xcodeproj", + "identifier" : "C0C01EB11E3911D50056E6CB", + "name" : "Cordova" + } + ] + }, + "repeatInNewRunnerProcess" : true, + "targetForVariableExpansion" : { + "containerPath" : "container:CordovaLibTests\/CordovaLibTests.xcodeproj", + "identifier" : "C0FA7C991E4BB6420077B045", + "name" : "CordovaFrameworkApp" + }, + "testExecutionOrdering" : "random", + "testRepetitionMode" : "retryOnFailure" + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:CordovaLibTests\/CordovaTests.xcodeproj", + "identifier" : "C0FA7CB11E4BBBBE0077B045", + "name" : "CordovaTests" + } + } + ], + "version" : 1 +} diff --git a/tests/cordova-ios.xcworkspace/contents.xcworkspacedata b/tests/cordova-ios.xcworkspace/contents.xcworkspacedata index 75ac22f2e9..6780b15789 100644 --- a/tests/cordova-ios.xcworkspace/contents.xcworkspacedata +++ b/tests/cordova-ios.xcworkspace/contents.xcworkspacedata @@ -23,6 +23,6 @@ location = "group:../CordovaLib/CordovaLib.xcodeproj"> + location = "group:CordovaLibTests/CordovaTests.xcodeproj"> diff --git a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme deleted file mode 100644 index 7e866a1c76..0000000000 --- a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme deleted file mode 100644 index 1f955e099b..0000000000 --- a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme deleted file mode 100644 index e94f261402..0000000000 --- a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaTestApp.xcscheme similarity index 84% rename from tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme rename to tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaTestApp.xcscheme index 2865727a82..081bc60aa5 100644 --- a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme +++ b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaTestApp.xcscheme @@ -19,7 +19,7 @@ --> + version = "1.7"> @@ -47,9 +47,9 @@ + BuildableName = "CordovaApp.app" + BlueprintName = "CordovaApp" + ReferencedContainer = "container:CordovaLibTests/CordovaTests.xcodeproj"> + BuildableName = "CordovaTests.xctest" + BlueprintName = "CordovaTests" + ReferencedContainer = "container:CordovaLibTests/CordovaTests.xcodeproj"> @@ -77,20 +77,26 @@ + BuildableName = "CordovaApp.app" + BlueprintName = "CordovaApp" + ReferencedContainer = "container:CordovaLibTests/CordovaTests.xcodeproj"> + + + + + BuildableName = "CordovaTests.xctest" + BlueprintName = "CordovaTests" + ReferencedContainer = "container:CordovaLibTests/CordovaTests.xcodeproj"> @@ -110,9 +116,9 @@ + BuildableName = "CordovaApp.app" + BlueprintName = "CordovaApp" + ReferencedContainer = "container:CordovaLibTests/CordovaTests.xcodeproj"> @@ -127,9 +133,9 @@ + BuildableName = "CordovaApp.app" + BlueprintName = "CordovaApp" + ReferencedContainer = "container:CordovaLibTests/CordovaTests.xcodeproj">