From f424e4bb3a4d0fe87d2c8bc37c536ed8b42deb55 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 28 May 2024 19:14:43 -0700 Subject: [PATCH] refactor!: Template Modernizing --- lib/create.js | 8 +- templates/cordova/build-debug.xcconfig | 3 - templates/cordova/build-release.xcconfig | 4 - templates/cordova/build.xcconfig | 19 - .../project.pbxproj | 478 +++++++++--------- .../project/__PROJECT_NAME__/AppDelegate.h | 2 +- .../project/__PROJECT_NAME__/AppDelegate.m | 15 +- .../CDVLaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 60 +++ .../__PROJECT_NAME__/MainViewController.xib | 138 ----- .../project/__PROJECT_NAME__/SceneDelegate.h | 29 ++ ...JECT_NAME__-Prefix.pch => SceneDelegate.m} | 16 +- ...{MainViewController.h => ViewController.h} | 4 +- ...{MainViewController.m => ViewController.m} | 4 +- .../__PROJECT_NAME__-Info.plist | 27 +- 15 files changed, 379 insertions(+), 428 deletions(-) rename templates/project/__PROJECT_NAME__/{ => Base.lproj}/CDVLaunchScreen.storyboard (100%) create mode 100644 templates/project/__PROJECT_NAME__/Base.lproj/Main.storyboard delete mode 100644 templates/project/__PROJECT_NAME__/MainViewController.xib create mode 100644 templates/project/__PROJECT_NAME__/SceneDelegate.h rename templates/project/__PROJECT_NAME__/{__PROJECT_NAME__-Prefix.pch => SceneDelegate.m} (80%) rename templates/project/__PROJECT_NAME__/{MainViewController.h => ViewController.h} (89%) rename templates/project/__PROJECT_NAME__/{MainViewController.m => ViewController.m} (92%) diff --git a/lib/create.js b/lib/create.js index 5e0f630e6c..488fcabc86 100755 --- a/lib/create.js +++ b/lib/create.js @@ -175,11 +175,10 @@ class ProjectCreator { ['__PROJECT_NAME__.xcodeproj', 'project.pbxproj'], ['__PROJECT_NAME__', 'AppDelegate.h'], ['__PROJECT_NAME__', 'AppDelegate.m'], - ['__PROJECT_NAME__', 'MainViewController.h'], - ['__PROJECT_NAME__', 'MainViewController.m'], + ['__PROJECT_NAME__', 'ViewController.h'], + ['__PROJECT_NAME__', 'ViewController.m'], ['__PROJECT_NAME__', 'main.m'], - ['__PROJECT_NAME__', '__PROJECT_NAME__-Info.plist'], - ['__PROJECT_NAME__', '__PROJECT_NAME__-Prefix.pch'] + ['__PROJECT_NAME__', '__PROJECT_NAME__-Info.plist'] ]) { this.expandProjectNameInFileContents(this.projectPath(...p)); } @@ -192,7 +191,6 @@ class ProjectCreator { ['__PROJECT_NAME__.xcworkspace'], ['__PROJECT_NAME__.xcodeproj'], ['__PROJECT_NAME__', '__PROJECT_NAME__-Info.plist'], - ['__PROJECT_NAME__', '__PROJECT_NAME__-Prefix.pch'], ['__PROJECT_NAME__'] ]) { this.expandProjectNameInBaseName(this.projectPath(...p)); diff --git a/templates/cordova/build-debug.xcconfig b/templates/cordova/build-debug.xcconfig index 7e7985bb51..d7ee4f6257 100644 --- a/templates/cordova/build-debug.xcconfig +++ b/templates/cordova/build-debug.xcconfig @@ -22,9 +22,6 @@ // #include "build.xcconfig" - -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1 - #include "build-extras.xcconfig" // (CB-11792) diff --git a/templates/cordova/build-release.xcconfig b/templates/cordova/build-release.xcconfig index 70b0f0730c..886e822976 100644 --- a/templates/cordova/build-release.xcconfig +++ b/templates/cordova/build-release.xcconfig @@ -22,10 +22,6 @@ // #include "build.xcconfig" - -CODE_SIGN_IDENTITY = iPhone Distribution -CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution - #include "build-extras.xcconfig" // (CB-11792) diff --git a/templates/cordova/build.xcconfig b/templates/cordova/build.xcconfig index aaf29ec572..c96c940a2a 100644 --- a/templates/cordova/build.xcconfig +++ b/templates/cordova/build.xcconfig @@ -21,22 +21,3 @@ // XCode build settings shared by all Build Configurations. // Settings are overridden by configuration-level .xcconfig file (build-release/build-debug). // - -HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/usr/local/lib/include" "$(OBJROOT)/UninstalledProducts/include" "$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include" "$(BUILT_PRODUCTS_DIR)" -OTHER_LDFLAGS = -ObjC - -// Type of signing identity used for codesigning, resolves to first match of given type. -// "iPhone Developer": Development builds (default, local only; iOS Development certificate) or "iPhone Distribution": Distribution builds (Adhoc/In-House/AppStore; iOS Distribution certificate) -CODE_SIGN_IDENTITY = iPhone Developer -CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer - -// (CB-9721) Set ENABLE_BITCODE to NO in build.xcconfig -ENABLE_BITCODE = NO - -// (CB-9719) Set CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES to YES in build.xcconfig -CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES - -// (CB-10072) -SWIFT_OBJC_BRIDGING_HEADER = $(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h - -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) WK_WEB_VIEW_ONLY=$(WK_WEB_VIEW_ONLY) diff --git a/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj b/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj index a829029833..091464b8e5 100755 --- a/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj +++ b/templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj @@ -25,365 +25,288 @@ objects = { /* Begin PBXBuildFile section */ - 0207DA581B56EA530066E2B4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Assets.xcassets */; }; - 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; }; - 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; - 301BF552109A68D80062928A /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 301BF535109A57CC0062928A /* libCordova.a */; settings = {ATTRIBUTES = (Required, ); }; }; - 302D95F114D2391D003F00A1 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /* MainViewController.m */; }; - 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 302D95F014D2391D003F00A1 /* MainViewController.xib */; }; - 4E7CA2B6272ABB0D00177EF9 /* config.xml in Copy Staging Resources */ = {isa = PBXBuildFile; fileRef = F840E1F0165FE0F500CFE078 /* config.xml */; }; - 4E7CA2B7272ABB0D00177EF9 /* www in Copy Staging Resources */ = {isa = PBXBuildFile; fileRef = 301BF56E109A69640062928A /* www */; }; - 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; }; - 90B630EF2AECBBD0009EF368 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 90B630EE2AECBBD0009EF368 /* PrivacyInfo.xcprivacy */; }; + 907F98562C06B87200D2D242 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 907F98552C06B87200D2D242 /* PrivacyInfo.xcprivacy */; }; + 907F98612C06B8F000D2D242 /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 907F985D2C06B8DE00D2D242 /* libCordova.a */; }; + 907F98662C06BC1B00D2D242 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 907F98652C06BC1B00D2D242 /* config.xml */; }; + 907F986A2C06BCD300D2D242 /* www in Resources */ = {isa = PBXBuildFile; fileRef = 907F98692C06BCD300D2D242 /* www */; }; + 90BD9B712C06907D000DEBAB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BD9B702C06907D000DEBAB /* AppDelegate.m */; }; + 90BD9B742C06907D000DEBAB /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BD9B732C06907D000DEBAB /* SceneDelegate.m */; }; + 90BD9B772C06907D000DEBAB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BD9B762C06907D000DEBAB /* ViewController.m */; }; + 90BD9B7A2C06907D000DEBAB /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 90BD9B792C06907D000DEBAB /* Base */; }; + 90BD9B7C2C06907E000DEBAB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 90BD9B7B2C06907E000DEBAB /* Assets.xcassets */; }; + 90BD9B7F2C06907E000DEBAB /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 90BD9B7E2C06907E000DEBAB /* Base */; }; + 90BD9B822C06907E000DEBAB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BD9B812C06907E000DEBAB /* main.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 301BF534109A57CC0062928A /* PBXContainerItemProxy */ = { + 907F985C2C06B8DE00D2D242 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; + containerPortal = 907F98572C06B8DE00D2D242 /* CordovaLib.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; + remoteGlobalIDString = 68A32D7114102E1C006B237C; remoteInfo = CordovaLib; }; - 301BF550109A68C00062928A /* PBXContainerItemProxy */ = { + 907F985E2C06B8DE00D2D242 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = CordovaLib; - }; - 907D8123214C687600058A10 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; + containerPortal = 907F98572C06B8DE00D2D242 /* CordovaLib.xcodeproj */; proxyType = 2; remoteGlobalIDString = C0C01EB21E3911D50056E6CB; remoteInfo = Cordova; }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 857339E32710CC9700A1C74C /* Copy Staging Resources */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - 4E7CA2B6272ABB0D00177EF9 /* config.xml in Copy Staging Resources */, - 4E7CA2B7272ABB0D00177EF9 /* www in Copy Staging Resources */, - ); - name = "Copy Staging Resources"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - 0207DA571B56EA530066E2B4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 1D6058910D05DD3D006BFB54 /* __PROJECT_NAME__.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "__PROJECT_NAME__.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = ""; }; - 301BF56E109A69640062928A /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = SOURCE_ROOT; }; - 302D95EE14D2391D003F00A1 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; - 302D95EF14D2391D003F00A1 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; - 302D95F014D2391D003F00A1 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = ""; }; + 907F98552C06B87200D2D242 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + 907F98572C06B8DE00D2D242 /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "CordovaLib/CordovaLib.xcodeproj"; sourceTree = ""; }; + 907F98622C06B97000D2D242 /* Entitlements-Debug.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Entitlements-Debug.plist; sourceTree = ""; }; + 907F98632C06B9C800D2D242 /* Entitlements-Release.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Entitlements-Release.plist; sourceTree = ""; }; + 907F98652C06BC1B00D2D242 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; + 907F98692C06BCD300D2D242 /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = "../www"; sourceTree = ""; }; + 90BD9B6C2C06907D000DEBAB /* __PROJECT_NAME__.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "__PROJECT_NAME__.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 90BD9B6F2C06907D000DEBAB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 90BD9B702C06907D000DEBAB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 90BD9B722C06907D000DEBAB /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = ""; }; + 90BD9B732C06907D000DEBAB /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = ""; }; + 90BD9B752C06907D000DEBAB /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 90BD9B762C06907D000DEBAB /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 90BD9B792C06907D000DEBAB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 90BD9B7B2C06907E000DEBAB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 90BD9B7E2C06907E000DEBAB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CDVLaunchScreen.storyboard; sourceTree = ""; }; + 90BD9B802C06907E000DEBAB /* __PROJECT_NAME__-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "__PROJECT_NAME__-Info.plist"; sourceTree = ""; }; + 90BD9B812C06907E000DEBAB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 3047A50F1AB8059700498E2A /* build-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "build-debug.xcconfig"; path = "cordova/build-debug.xcconfig"; sourceTree = SOURCE_ROOT; }; 3047A5101AB8059700498E2A /* build-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "build-release.xcconfig"; path = "cordova/build-release.xcconfig"; sourceTree = SOURCE_ROOT; }; 3047A5111AB8059700498E2A /* build.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = build.xcconfig; path = cordova/build.xcconfig; sourceTree = SOURCE_ROOT; }; - 32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "__PROJECT_NAME__-Prefix.pch"; sourceTree = ""; }; - 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CDVLaunchScreen.storyboard; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "__PROJECT_NAME__-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; - 90B630EE2AECBBD0009EF368 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = ""; }; EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = ""; }; - ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = ""; }; - F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "__PROJECT_NAME__/config.xml"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { + 90BD9B692C06907D000DEBAB /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 301BF552109A68D80062928A /* libCordova.a in Frameworks */, + 907F98612C06B8F000D2D242 /* libCordova.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { + 907F98542C06B85800D2D242 /* Plugins */ = { isa = PBXGroup; children = ( - 1D6058910D05DD3D006BFB54 /* __PROJECT_NAME__.app */, ); - name = Products; + path = Plugins; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + 907F98582C06B8DE00D2D242 /* Products */ = { isa = PBXGroup; children = ( - EB87FDF41871DAF40020F90C /* config.xml */, - 3047A50E1AB8057F00498E2A /* config */, - EB87FDF31871DA8E0020F90C /* www */, - EB87FDF11871DA420020F90C /* Staging */, - 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */, - 29B97315FDCFA39411CA2CEA /* __PROJECT_NAME__ */, - 307C750510C5A3420062BCA9 /* Plugins */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, + 907F985D2C06B8DE00D2D242 /* libCordova.a */, + 907F985F2C06B8DE00D2D242 /* Cordova.framework */, ); - name = CustomTemplate; - sourceTree = ""; - }; - 29B97315FDCFA39411CA2CEA /* __PROJECT_NAME__ */ = { - isa = PBXGroup; - children = ( - 90B630EE2AECBBD0009EF368 /* PrivacyInfo.xcprivacy */, - 8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */, - 32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */, - 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */, - 0207DA571B56EA530066E2B4 /* Assets.xcassets */, - ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */, - 302D95EE14D2391D003F00A1 /* MainViewController.h */, - 302D95EF14D2391D003F00A1 /* MainViewController.m */, - 302D95F014D2391D003F00A1 /* MainViewController.xib */, - 1D3623240D0F684500981E51 /* AppDelegate.h */, - 1D3623250D0F684500981E51 /* AppDelegate.m */, - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "__PROJECT_NAME__"; - path = "__PROJECT_NAME__"; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = (); - name = Resources; - path = "__PROJECT_NAME__/Resources"; + name = Products; sourceTree = ""; }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + 907F98602C06B8F000D2D242 /* Frameworks */ = { isa = PBXGroup; children = ( ); name = Frameworks; sourceTree = ""; }; - 301BF52E109A57CC0062928A /* Products */ = { + 90BD9B632C06907D000DEBAB = { isa = PBXGroup; children = ( - 301BF535109A57CC0062928A /* libCordova.a */, - 907D8124214C687600058A10 /* Cordova.framework */, + 907F98572C06B8DE00D2D242 /* CordovaLib.xcodeproj */, + 90BD9B6E2C06907D000DEBAB /* __PROJECT_NAME__ */, + 90BD9B6D2C06907D000DEBAB /* Products */, + 907F98602C06B8F000D2D242 /* Frameworks */, ); - name = Products; sourceTree = ""; }; - 3047A50E1AB8057F00498E2A /* config */ = { + 90BD9B6D2C06907D000DEBAB /* Products */ = { isa = PBXGroup; children = ( - 3047A50F1AB8059700498E2A /* build-debug.xcconfig */, - 3047A5101AB8059700498E2A /* build-release.xcconfig */, - 3047A5111AB8059700498E2A /* build.xcconfig */, + 90BD9B6C2C06907D000DEBAB /* __PROJECT_NAME__.app */, ); - name = config; + name = Products; sourceTree = ""; }; - 307C750510C5A3420062BCA9 /* Plugins */ = { + 90BD9B6E2C06907D000DEBAB /* __PROJECT_NAME__ */ = { isa = PBXGroup; children = ( + 907F98542C06B85800D2D242 /* Plugins */, + 90BD9B6F2C06907D000DEBAB /* AppDelegate.h */, + 90BD9B702C06907D000DEBAB /* AppDelegate.m */, + 90BD9B722C06907D000DEBAB /* SceneDelegate.h */, + 90BD9B732C06907D000DEBAB /* SceneDelegate.m */, + 90BD9B752C06907D000DEBAB /* ViewController.h */, + 90BD9B762C06907D000DEBAB /* ViewController.m */, + 90BD9B7D2C06907E000DEBAB /* CDVLaunchScreen.storyboard */, + 90BD9B782C06907D000DEBAB /* Main.storyboard */, + 90BD9B7B2C06907E000DEBAB /* Assets.xcassets */, + 90BD9B802C06907E000DEBAB /* Info.plist */, + 907F98552C06B87200D2D242 /* PrivacyInfo.xcprivacy */, + 907F98622C06B97000D2D242 /* Entitlements-Debug.plist */, + 907F98632C06B9C800D2D242 /* Entitlements-Release.plist */, + 90BD9B812C06907E000DEBAB /* main.m */, + 907F98652C06BC1B00D2D242 /* config.xml */, + 907F98692C06BCD300D2D242 /* www */, ); - name = Plugins; - path = "__PROJECT_NAME__/Plugins"; - sourceTree = SOURCE_ROOT; - }; - EB87FDF11871DA420020F90C /* Staging */ = { - isa = PBXGroup; - children = ( - F840E1F0165FE0F500CFE078 /* config.xml */, - 301BF56E109A69640062928A /* www */, - ); - name = Staging; + name = "__PROJECT_NAME__"; + path = "__PROJECT_NAME__"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* __PROJECT_NAME__ */ = { + 90BD9B6B2C06907D000DEBAB /* __PROJECT_NAME__ */ = { isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "__PROJECT_NAME__" */; + buildConfigurationList = 90BD9B852C06907E000DEBAB /* Build configuration list for PBXNativeTarget "__PROJECT_NAME__" */; buildPhases = ( - 857339E32710CC9700A1C74C /* Copy Staging Resources */, - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, + 90BD9B682C06907D000DEBAB /* Sources */, + 90BD9B692C06907D000DEBAB /* Frameworks */, + 90BD9B6A2C06907D000DEBAB /* Resources */, ); buildRules = ( ); dependencies = ( - 301BF551109A68C00062928A /* PBXTargetDependency */, ); name = "__PROJECT_NAME__"; + packageProductDependencies = ( + ); productName = "__PROJECT_NAME__"; - productReference = 1D6058910D05DD3D006BFB54 /* __PROJECT_NAME__.app */; + productReference = 90BD9B6C2C06907D000DEBAB /* __PROJECT_NAME__.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { + 90BD9B642C06907D000DEBAB /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1130; + BuildIndependentTargetsInParallel = 1; + LastUpgradeCheck = 1540; TargetAttributes = { - 1D6058900D05DD3D006BFB54 = { - ProvisioningStyle = Automatic; + 90BD9B6B2C06907D000DEBAB = { + CreatedOnToolsVersion = 15.4; }; }; }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "__PROJECT_NAME__" */; + buildConfigurationList = 90BD9B672C06907D000DEBAB /* Build configuration list for PBXProject "__PROJECT_NAME__" */; compatibilityVersion = "Xcode 11.0"; developmentRegion = en; - hasScannedForEncodings = 1; + hasScannedForEncodings = 0; knownRegions = ( en, Base, ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + mainGroup = 90BD9B632C06907D000DEBAB; + packageReferences = ( + ); + productRefGroup = 90BD9B6D2C06907D000DEBAB /* Products */; projectDirPath = ""; projectReferences = ( { - ProductGroup = 301BF52E109A57CC0062928A /* Products */; - ProjectRef = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; + ProductGroup = 907F98582C06B8DE00D2D242 /* Products */; + ProjectRef = 907F98572C06B8DE00D2D242 /* CordovaLib.xcodeproj */; }, ); projectRoot = ""; targets = ( - 1D6058900D05DD3D006BFB54 /* __PROJECT_NAME__ */, + 90BD9B6B2C06907D000DEBAB /* __PROJECT_NAME__ */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 301BF535109A57CC0062928A /* libCordova.a */ = { + 907F985D2C06B8DE00D2D242 /* libCordova.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libCordova.a; - remoteRef = 301BF534109A57CC0062928A /* PBXContainerItemProxy */; + remoteRef = 907F985C2C06B8DE00D2D242 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 907D8124214C687600058A10 /* Cordova.framework */ = { + 907F985F2C06B8DE00D2D242 /* Cordova.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Cordova.framework; - remoteRef = 907D8123214C687600058A10 /* PBXContainerItemProxy */; + remoteRef = 907F985E2C06B8DE00D2D242 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { + 90BD9B6A2C06907D000DEBAB /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */, - 0207DA581B56EA530066E2B4 /* Assets.xcassets in Resources */, - 90B630EF2AECBBD0009EF368 /* PrivacyInfo.xcprivacy in Resources */, - 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */, + 907F986A2C06BCD300D2D242 /* www in Resources */, + 90BD9B7C2C06907E000DEBAB /* Assets.xcassets in Resources */, + 90BD9B7F2C06907E000DEBAB /* Base in Resources */, + 907F98562C06B87200D2D242 /* PrivacyInfo.xcprivacy in Resources */, + 90BD9B7A2C06907D000DEBAB /* Base in Resources */, + 907F98662C06BC1B00D2D242 /* config.xml in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { + 90BD9B682C06907D000DEBAB /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1D60589B0D05DD56006BFB54 /* main.m in Sources */, - 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */, - 302D95F114D2391D003F00A1 /* MainViewController.m in Sources */, + 90BD9B772C06907D000DEBAB /* ViewController.m in Sources */, + 90BD9B712C06907D000DEBAB /* AppDelegate.m in Sources */, + 90BD9B822C06907E000DEBAB /* main.m in Sources */, + 90BD9B742C06907D000DEBAB /* SceneDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 301BF551109A68C00062928A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = CordovaLib; - targetProxy = 301BF550109A68C00062928A /* PBXContainerItemProxy */; +/* Begin PBXVariantGroup section */ + 90BD9B782C06907D000DEBAB /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 90BD9B792C06907D000DEBAB /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 90BD9B7D2C06907E000DEBAB /* CDVLaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 90BD9B7E2C06907E000DEBAB /* Base */, + ); + name = CDVLaunchScreen.storyboard; + sourceTree = ""; }; -/* End PBXTargetDependency section */ +/* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3047A50F1AB8059700498E2A /* build-debug.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-$(CONFIGURATION).plist"; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "__PROJECT_NAME__/__PROJECT_NAME__-Prefix.pch"; - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = ""; - INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTS_MACCATALYST = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_WORKSPACE = NO; - }; - name = Debug; - }; - 1D6058950D05DD3E006BFB54 /* Release */ = { + 90BD9B832C06907E000DEBAB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3047A5101AB8059700498E2A /* build-release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-$(CONFIGURATION).plist"; - COPY_PHASE_STRIP = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "__PROJECT_NAME__/__PROJECT_NAME__-Prefix.pch"; - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = ""; - INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTS_MACCATALYST = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_WORKSPACE = NO; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3047A5111AB8059700498E2A /* build.xcconfig */; - buildSettings = { ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; @@ -391,46 +314,63 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; 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_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-$(CONFIGURATION).plist"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = c99; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = ""; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MERGED_BINARY_TYPE = automatic; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SKIP_INSTALL = NO; - WK_WEB_VIEW_ONLY = 1; + SUPPORTS_MACCATALYST = YES; }; name = Debug; }; - C01FCF5008A954540054247B /* Release */ = { + 90BD9B842C06907E000DEBAB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3047A5111AB8059700498E2A /* build.xcconfig */; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; @@ -438,53 +378,113 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; 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_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-$(CONFIGURATION).plist"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; + ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = c99; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; GCC_NO_COMMON_BLOCKS = YES; - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MERGED_BINARY_TYPE = automatic; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; SDKROOT = iphoneos; - SKIP_INSTALL = NO; - WK_WEB_VIEW_ONLY = 1; + SUPPORTS_MACCATALYST = YES; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 90BD9B862C06907E000DEBAB /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3047A50F1AB8059700498E2A /* build-debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = "__PROJECT_NAME__/Entitlements-Debug.plist"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = "$(OTHER_LDFLAGS) -ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_EMIT_LOC_STRINGS = YES; + TARGETED_DEVICE_FAMILY = "1,2,7"; + }; + name = Debug; + }; + 90BD9B872C06907E000DEBAB /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3047A5101AB8059700498E2A /* build-release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = "__PROJECT_NAME__/Entitlements-Release.plist"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + INFOPLIST_FILE = "__PROJECT_NAME__/__PROJECT_NAME__-Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = "$(OTHER_LDFLAGS) -ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "__PROJECT_ID__"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_EMIT_LOC_STRINGS = YES; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "__PROJECT_NAME__" */ = { + 90BD9B672C06907D000DEBAB /* Build configuration list for PBXProject "__PROJECT_NAME__" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - 1D6058950D05DD3E006BFB54 /* Release */, + 90BD9B832C06907E000DEBAB /* Debug */, + 90BD9B842C06907E000DEBAB /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "__PROJECT_NAME__" */ = { + 90BD9B852C06907E000DEBAB /* Build configuration list for PBXNativeTarget "__PROJECT_NAME__" */ = { isa = XCConfigurationList; buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, + 90BD9B862C06907E000DEBAB /* Debug */, + 90BD9B872C06907E000DEBAB /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; + rootObject = 90BD9B642C06907D000DEBAB /* Project object */; } diff --git a/templates/project/__PROJECT_NAME__/AppDelegate.h b/templates/project/__PROJECT_NAME__/AppDelegate.h index 8c27551c54..5fb789f55b 100644 --- a/templates/project/__PROJECT_NAME__/AppDelegate.h +++ b/templates/project/__PROJECT_NAME__/AppDelegate.h @@ -17,7 +17,7 @@ under the License. */ -#import +#import @interface AppDelegate : CDVAppDelegate diff --git a/templates/project/__PROJECT_NAME__/AppDelegate.m b/templates/project/__PROJECT_NAME__/AppDelegate.m index 3d2b6ffd43..a4659e356e 100644 --- a/templates/project/__PROJECT_NAME__/AppDelegate.m +++ b/templates/project/__PROJECT_NAME__/AppDelegate.m @@ -18,14 +18,19 @@ Licensed to the Apache Software Foundation (ASF) under one */ #import "AppDelegate.h" -#import "MainViewController.h" + +@interface AppDelegate() + +@end @implementation AppDelegate -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - self.viewController = [[MainViewController alloc] init]; - return [super application:application didFinishLaunchingWithOptions:launchOptions]; +#pragma mark - UISceneSession lifecycle + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 +- (UISceneConfiguration *)application:(UIApplication *)application configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession options:(UISceneConnectionOptions *)options API_AVAILABLE(ios(13)) { + return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role]; } +#endif @end diff --git a/templates/project/__PROJECT_NAME__/CDVLaunchScreen.storyboard b/templates/project/__PROJECT_NAME__/Base.lproj/CDVLaunchScreen.storyboard similarity index 100% rename from templates/project/__PROJECT_NAME__/CDVLaunchScreen.storyboard rename to templates/project/__PROJECT_NAME__/Base.lproj/CDVLaunchScreen.storyboard diff --git a/templates/project/__PROJECT_NAME__/Base.lproj/Main.storyboard b/templates/project/__PROJECT_NAME__/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..370e0fee9b --- /dev/null +++ b/templates/project/__PROJECT_NAME__/Base.lproj/Main.storyboard @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/project/__PROJECT_NAME__/MainViewController.xib b/templates/project/__PROJECT_NAME__/MainViewController.xib deleted file mode 100644 index e45d65c610..0000000000 --- a/templates/project/__PROJECT_NAME__/MainViewController.xib +++ /dev/null @@ -1,138 +0,0 @@ - - - - - 1280 - 11C25 - 1919 - 1138.11 - 566.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 916 - - - IBProxyObject - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - {{0, 20}, {320, 460}} - - - - 3 - MQA - - 2 - - - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - - - 0 - - - - - - 1 - - - - - -1 - - - File's Owner - - - -2 - - - - - - - MainViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 3 - - - - - MainViewController - UIViewController - - IBProjectSource - ./Classes/MainViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - 916 - - diff --git a/templates/project/__PROJECT_NAME__/SceneDelegate.h b/templates/project/__PROJECT_NAME__/SceneDelegate.h new file mode 100644 index 0000000000..fad3aa3b72 --- /dev/null +++ b/templates/project/__PROJECT_NAME__/SceneDelegate.h @@ -0,0 +1,29 @@ +/* + 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 + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 +API_AVAILABLE(ios(13)) +@interface SceneDelegate : UIResponder + +@property (strong, nonatomic) UIWindow * window; + +@end +#endif diff --git a/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Prefix.pch b/templates/project/__PROJECT_NAME__/SceneDelegate.m similarity index 80% rename from templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Prefix.pch rename to templates/project/__PROJECT_NAME__/SceneDelegate.m index f36e9da920..3599acb289 100644 --- a/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Prefix.pch +++ b/templates/project/__PROJECT_NAME__/SceneDelegate.m @@ -16,11 +16,15 @@ Licensed to the Apache Software Foundation (ASF) under one specific language governing permissions and limitations under the License. */ -// -// Prefix header for all source files of the '__PROJECT_NAME__' target in the '__PROJECT_NAME__' project -// -#ifdef __OBJC__ - #import - #import +#import "SceneDelegate.h" + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 +@interface SceneDelegate() + +@end + +@implementation SceneDelegate + +@end #endif diff --git a/templates/project/__PROJECT_NAME__/MainViewController.h b/templates/project/__PROJECT_NAME__/ViewController.h similarity index 89% rename from templates/project/__PROJECT_NAME__/MainViewController.h rename to templates/project/__PROJECT_NAME__/ViewController.h index 1bbe01c2d1..edc71f076c 100644 --- a/templates/project/__PROJECT_NAME__/MainViewController.h +++ b/templates/project/__PROJECT_NAME__/ViewController.h @@ -17,8 +17,8 @@ under the License. */ -#import +#import -@interface MainViewController : CDVViewController +@interface ViewController : CDVViewController @end diff --git a/templates/project/__PROJECT_NAME__/MainViewController.m b/templates/project/__PROJECT_NAME__/ViewController.m similarity index 92% rename from templates/project/__PROJECT_NAME__/MainViewController.m rename to templates/project/__PROJECT_NAME__/ViewController.m index fc3b893c86..0adc4c7299 100644 --- a/templates/project/__PROJECT_NAME__/MainViewController.m +++ b/templates/project/__PROJECT_NAME__/ViewController.m @@ -17,8 +17,8 @@ Licensed to the Apache Software Foundation (ASF) under one under the License. */ -#import "MainViewController.h" +#import "ViewController.h" -@implementation MainViewController +@implementation ViewController @end diff --git a/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist b/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist index 2f7101b6a6..a8552286a9 100644 --- a/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist +++ b/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist @@ -42,10 +42,10 @@ 1 LSRequiresIPhoneOS - NSMainNibFile - - NSMainNibFile~ipad - + UIApplicationSupportsIndirectInputEvents + + UIMainStoryboardFile + Main UILaunchStoryboardName CDVLaunchScreen UIRequiresFullScreen @@ -83,5 +83,24 @@ + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + SceneDelegate + UISceneStoryboardFile + Main + + + +