6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 08de96f1
Changed files
azure/templates/build-ios.yml | 2 +- azure/templates/env-vars.yml | 12 +-- comwell_key_app/ios/ExportOptionsDev.plist | 23 +++++ comwell_key_app/ios/ExportOptionsTest.plist | 23 ----- .../ios/Runner.xcodeproj/project.pbxproj | 29 +++--- .../xcshareddata/xcschemes/Develop.xcscheme | 98 +++++++++++++++++++ .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../xcshareddata/xcschemes/develop.xcscheme | 107 --------------------- 8 files changed, 143 insertions(+), 153 deletions(-)
Diff
diff --git a/azure/templates/build-ios.yml b/azure/templates/build-ios.yml
index fc2a095a..9d5ffa30 100644
--- a/azure/templates/build-ios.yml
+++ b/azure/templates/build-ios.yml
@@ -6,7 +6,7 @@ parameters:
values:
- production
- staging
- - develop
+ - test
- name: exportOptionsPlistPath
displayName: ExportOptions.plist path
type: string
diff --git a/azure/templates/env-vars.yml b/azure/templates/env-vars.yml
index 2aed6b32..aed4180c 100644
--- a/azure/templates/env-vars.yml
+++ b/azure/templates/env-vars.yml
@@ -17,7 +17,7 @@ variables:
${{ if eq(parameters.env, 'staging') }}:
value: 'com.comwell.phoenix.stage'
${{ if eq(parameters.env, 'develop') }}:
- value: 'com.comwell.phoenix.dev'
+ value: 'com.comwell.phoenix.test'
- name: flavor
${{ if eq(parameters.env, 'production') }}:
value: 'prod'
@@ -32,35 +32,35 @@ variables:
${{ if eq(parameters.env, 'staging') }}:
value: 'com.comwell.phoenix.stage'
${{ if eq(parameters.env, 'develop') }}:
- value: 'com.comwell.phoenix.test'
+ value: 'com.comwell.phoenix.dev'
- name: iosProvisionProfileFileName
${{ if eq(parameters.env, 'production') }}:
value: 'CP_Prod.mobileprovision'
${{ if eq(parameters.env, 'staging') }}:
value: 'CP_Stage.mobileprovision'
${{ if eq(parameters.env, 'develop') }}:
- value: 'CP_Test.mobileprovision'
+ value: 'CP_Dev.mobileprovision'
- name: iosScheme
${{ if eq(parameters.env, 'production') }}:
value: 'Prod'
${{ if eq(parameters.env, 'staging') }}:
value: 'Stage'
${{ if eq(parameters.env, 'develop') }}:
- value: 'Test'
+ value: 'Develop'
- name: iosConfiguration
${{ if eq(parameters.env, 'production') }}:
value: 'Release-Prod'
${{ if eq(parameters.env, 'staging') }}:
value: 'Release-Stage'
${{ if eq(parameters.env, 'develop') }}:
- value: 'Release-releasetest'
+ value: 'Release-Develop'
- name: iosExportOptionsPlist
${{ if eq(parameters.env, 'production') }}:
value: 'ExportOptions.plist'
${{ if eq(parameters.env, 'staging') }}:
value: 'ExportOptionsStage.plist'
${{ if eq(parameters.env, 'develop') }}:
- value: 'ExportOptionsTest.plist'
+ value: 'ExportOptionsDev.plist'
# Android
- name: androidAABPath
${{ if eq(parameters.env, 'production') }}:
diff --git a/comwell_key_app/ios/ExportOptionsDev.plist b/comwell_key_app/ios/ExportOptionsDev.plist
new file mode 100644
index 00000000..dbd956aa
--- /dev/null
+++ b/comwell_key_app/ios/ExportOptionsDev.plist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>method</key>
+ <string>app-store</string>
+ <key>teamID</key>
+ <string>8RNV6AX4ZL</string> <!-- Replace with your actual Team ID if different -->
+ <key>signingStyle</key>
+ <string>manual</string>
+ <key>provisioningProfiles</key>
+ <dict>
+ <key>com.comwell.phoenix.dev</key>
+ <string>CP Dev</string> <!-- Replace with your actual profile name -->
+ </dict>
+ <key>signingCertificate</key>
+ <string>Apple Distribution</string>
+ <key>stripSwiftSymbols</key>
+ <true/>
+ <key>compileBitcode</key>
+ <true/>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/comwell_key_app/ios/ExportOptionsTest.plist b/comwell_key_app/ios/ExportOptionsTest.plist
deleted file mode 100644
index 15508ca2..00000000
--- a/comwell_key_app/ios/ExportOptionsTest.plist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>method</key>
- <string>app-store</string>
- <key>teamID</key>
- <string>8RNV6AX4ZL</string> <!-- Replace with your actual Team ID if different -->
- <key>signingStyle</key>
- <string>manual</string>
- <key>provisioningProfiles</key>
- <dict>
- <key>com.comwell.phoenix.test</key>
- <string>CP Test</string> <!-- Replace with your actual profile name -->
- </dict>
- <key>signingCertificate</key>
- <string>Apple Distribution</string>
- <key>stripSwiftSymbols</key>
- <true/>
- <key>compileBitcode</key>
- <true/>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj b/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
index fe9af554..3e273e6d 100644
--- a/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
@@ -563,7 +563,7 @@
};
name = Profile;
};
- 6073D2A72C58F8E600183654 /* Debug-develop */ = {
+ 6073D2A72C58F8E600183654 /* Debug-Develop */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -620,9 +620,9 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
- name = "Debug-develop";
+ name = "Debug-Develop";
};
- 6073D2A82C58F8E600183654 /* Debug-develop */ = {
+ 6073D2A82C58F8E600183654 /* Debug-Develop */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
@@ -648,11 +648,10 @@
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
};
- name = "Debug-develop";
+ name = "Debug-Develop";
};
6073D2A92C58F8F500183654 /* Release-Develop */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -723,10 +722,10 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.test;
+ PRODUCT_BUNDLE_IDENTIFIER = com.comwell.phoenix.dev;
PRODUCT_NAME = "Comwell Hotels";
PROVISIONING_PROFILE_SPECIFIER = "";
- "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "CP Test";
+ "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "CP Dev";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
@@ -899,7 +898,7 @@
};
name = "Release-Prod";
};
- 6073D2BD2C59042900183654 /* Debug-test */ = {
+ 6073D2BD2C59042900183654 /* Debug-Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
@@ -953,9 +952,9 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
- name = "Debug-test";
+ name = "Debug-Test";
};
- 6073D2BE2C59042900183654 /* Debug-test */ = {
+ 6073D2BE2C59042900183654 /* Debug-Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
@@ -984,7 +983,7 @@
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
};
- name = "Debug-test";
+ name = "Debug-Test";
};
60A86E9C2E17C73600CE1F59 /* Release-Test */ = {
isa = XCBuildConfiguration;
@@ -1240,8 +1239,8 @@
buildConfigurations = (
97C147031CF9000F007C117D /* Debug */,
167B3F642DD32D08005BA376 /* Debug-Stage */,
- 6073D2BD2C59042900183654 /* Debug-test */,
- 6073D2A72C58F8E600183654 /* Debug-develop */,
+ 6073D2BD2C59042900183654 /* Debug-Test */,
+ 6073D2A72C58F8E600183654 /* Debug-Develop */,
97C147041CF9000F007C117D /* Release */,
60A86E9C2E17C73600CE1F59 /* Release-Test */,
6073D2AD2C58F91500183654 /* Release-Prod */,
@@ -1257,8 +1256,8 @@
buildConfigurations = (
97C147061CF9000F007C117D /* Debug */,
167B3F652DD32D08005BA376 /* Debug-Stage */,
- 6073D2BE2C59042900183654 /* Debug-test */,
- 6073D2A82C58F8E600183654 /* Debug-develop */,
+ 6073D2BE2C59042900183654 /* Debug-Test */,
+ 6073D2A82C58F8E600183654 /* Debug-Develop */,
97C147071CF9000F007C117D /* Release */,
60A86E9D2E17C73600CE1F59 /* Release-Test */,
6073D2AE2C58F91500183654 /* Release-Prod */,
diff --git a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme
new file mode 100644
index 00000000..fd732f70
--- /dev/null
+++ b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1640"
+ version = "1.7">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES"
+ buildArchitectures = "Automatic">
+ <PreActions>
+ <ExecutionAction
+ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+ <ActionContent
+ title = "Run Prepare Flutter Framework Script"
+ scriptText = "/bin/sh "$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh" prepare ">
+ <EnvironmentBuildable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+ BuildableName = "Runner.app"
+ BlueprintName = "Runner"
+ ReferencedContainer = "container:Runner.xcodeproj">
+ </BuildableReference>
+ </EnvironmentBuildable>
+ </ActionContent>
+ </ExecutionAction>
+ </PreActions>
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+ BuildableName = "Runner.app"
+ BlueprintName = "Runner"
+ ReferencedContainer = "container:Runner.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ shouldAutocreateTestPlan = "YES">
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug-Develop"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+ BuildableName = "Runner.app"
+ BlueprintName = "Runner"
+ ReferencedContainer = "container:Runner.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+ BuildableName = "Runner.app"
+ BlueprintName = "Runner"
+ ReferencedContainer = "container:Runner.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release-Develop"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
diff --git a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 5db441f5..16b76ec3 100644
--- a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
diff --git a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme
deleted file mode 100644
index f4865d3c..00000000
--- a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "1540"
- version = "2.2">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES"
- buildArchitectures = "Automatic">
- <PreActions>
- <ExecutionAction
- ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
- <ActionContent
- title = "Run Prepare Flutter Framework Script"
- scriptText = "/bin/sh "$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh" prepare ">
- <EnvironmentBuildable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </EnvironmentBuildable>
- </ActionContent>
- </ExecutionAction>
- </PreActions>
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <AutocreatedTestPlanReference>
- </AutocreatedTestPlanReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- buildConfiguration = "Debug-develop"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
- shouldUseLaunchSchemeArgsEnv = "YES"
- shouldAutocreateTestPlan = "YES">
- </TestAction>
- <LaunchAction
- buildConfiguration = "Debug-develop"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- debugServiceExtension = "internal"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </LaunchAction>
- <ProfileAction
- buildConfiguration = "Debug-develop"
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "97C146ED1CF9000F007C117D"
- BuildableName = "Runner.app"
- BlueprintName = "Runner"
- ReferencedContainer = "container:Runner.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug-develop">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release-Develop"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>