6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit ec6351cf
Changed files
.../ios/Runner.xcodeproj/project.pbxproj | 48 ++++++++++------------ comwell_key_app/ios/Runner/AppDelegate.swift | 2 +- comwell_key_app/macos/Runner/AppDelegate.swift | 2 +- 3 files changed, 24 insertions(+), 28 deletions(-)
Diff
diff --git a/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj b/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
index d0b940e2..d93f53ac 100644
--- a/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 60;
+ objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -33,6 +33,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ 055B6462DE5F3272E9043098 /* Pods-Runner.debug-debugtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-debugtest.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-debugtest.xcconfig"; sourceTree = "<group>"; };
0A1E7BB2101DAF01F6C15D64 /* Pods-Runner.develop.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.develop.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.develop.xcconfig"; sourceTree = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@@ -108,6 +109,7 @@
8B41816419A8F62074653D8D /* Pods-Runner.debug-testdebug.xcconfig */,
EF7564CDF6516A842D79AD12 /* Pods-Runner.release-testrelease.xcconfig */,
A7F79964D71D90466A3CB571 /* Pods-Runner.release-releasetest.xcconfig */,
+ 055B6462DE5F3272E9043098 /* Pods-Runner.debug-debugtest.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
@@ -527,21 +529,18 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
- CODE_SIGN_STYLE = Manual;
+ CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = "";
- "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RNV6AX4ZL;
+ DEVELOPMENT_TEAM = 8RNV6AX4ZL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.test;
+ PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.dev;
PRODUCT_NAME = Debug;
PROVISIONING_PROFILE_SPECIFIER = "";
- "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "CP Test";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@@ -610,11 +609,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
- CODE_SIGN_STYLE = Manual;
+ CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = "";
- "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RNV6AX4ZL;
+ DEVELOPMENT_TEAM = 8RNV6AX4ZL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -624,7 +621,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.test;
PRODUCT_NAME = releasetest;
PROVISIONING_PROFILE_SPECIFIER = "";
- "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "CP Test";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
@@ -694,7 +690,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = CFFA9L7882;
+ DEVELOPMENT_TEAM = 8RNV6AX4ZL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -702,7 +698,7 @@
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = NO;
- PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.stage11;
+ PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.stage;
PRODUCT_NAME = Stage;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -773,14 +769,14 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = CFFA9L7882;
+ DEVELOPMENT_TEAM = 8RNV6AX4ZL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix123;
+ PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix;
PRODUCT_NAME = Prod;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -789,7 +785,7 @@
};
name = "Release-Prod";
};
- 6073D2BD2C59042900183654 /* Debug-TestDebug */ = {
+ 6073D2BD2C59042900183654 /* Debug-debugtest */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -842,9 +838,9 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
- name = "Debug-TestDebug";
+ name = "Debug-debugtest";
};
- 6073D2BE2C59042900183654 /* Debug-TestDebug */ = {
+ 6073D2BE2C59042900183654 /* Debug-debugtest */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
@@ -853,14 +849,14 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = CFFA9L7882;
+ DEVELOPMENT_TEAM = 8RNV6AX4ZL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix123;
+ PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.test;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -868,7 +864,7 @@
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
};
- name = "Debug-TestDebug";
+ name = "Debug-debugtest";
};
97C147031CF9000F007C117D /* Debug */ = {
isa = XCBuildConfiguration;
@@ -986,14 +982,14 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = CFFA9L7882;
+ DEVELOPMENT_TEAM = 8RNV6AX4ZL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix123;
+ PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.dev;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -1037,7 +1033,7 @@
isa = XCConfigurationList;
buildConfigurations = (
97C147031CF9000F007C117D /* Debug */,
- 6073D2BD2C59042900183654 /* Debug-TestDebug */,
+ 6073D2BD2C59042900183654 /* Debug-debugtest */,
6073D2A72C58F8E600183654 /* Debug-Develop */,
97C147041CF9000F007C117D /* Release */,
6073D2AD2C58F91500183654 /* Release-Prod */,
@@ -1052,7 +1048,7 @@
isa = XCConfigurationList;
buildConfigurations = (
97C147061CF9000F007C117D /* Debug */,
- 6073D2BE2C59042900183654 /* Debug-TestDebug */,
+ 6073D2BE2C59042900183654 /* Debug-debugtest */,
6073D2A82C58F8E600183654 /* Debug-Develop */,
97C147071CF9000F007C117D /* Release */,
6073D2AE2C58F91500183654 /* Release-Prod */,
diff --git a/comwell_key_app/ios/Runner/AppDelegate.swift b/comwell_key_app/ios/Runner/AppDelegate.swift
index 70693e4a..b6363034 100644
--- a/comwell_key_app/ios/Runner/AppDelegate.swift
+++ b/comwell_key_app/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
import UIKit
import Flutter
-@UIApplicationMain
+@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
diff --git a/comwell_key_app/macos/Runner/AppDelegate.swift b/comwell_key_app/macos/Runner/AppDelegate.swift
index d53ef643..8e02df28 100644
--- a/comwell_key_app/macos/Runner/AppDelegate.swift
+++ b/comwell_key_app/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
import Cocoa
import FlutterMacOS
-@NSApplicationMain
+@main
class AppDelegate: FlutterAppDelegate {
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true