6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 256572fc
Changed files
azure/android-prod.yml | 6 +- azure/android-staging.yml | 4 +- azure/android-test.yml | 15 ---- azure/templates/build-android.yml | 4 +- azure/templates/build-ios.yml | 8 +- azure/templates/env-vars.yml | 18 ++--- comwell_key_app/.fvm/fvm_config.json | 2 +- comwell_key_app/android/app/build.gradle | 15 +--- .../xcshareddata/xcschemes/Stage.xcscheme | 20 +++++ comwell_key_app/lib/firebase_options.dart | 89 ---------------------- comwell_key_app/lib/firebase_options_test.dart | 74 ------------------ comwell_key_app/lib/main.dart | 7 +- comwell_key_app/lib/utils/firebase.dart | 4 +- 13 files changed, 44 insertions(+), 222 deletions(-)
Diff
diff --git a/azure/android-prod.yml b/azure/android-prod.yml
index dc107367..acb08c17 100644
--- a/azure/android-prod.yml
+++ b/azure/android-prod.yml
@@ -1,5 +1,5 @@
trigger:
-- prod
+- main
pool:
vmImage: ubuntu-latest
@@ -7,9 +7,9 @@ pool:
variables:
- template: templates/env-vars.yml
parameters:
- env: prod
+ env: production
steps:
- template: templates/build-android.yml
parameters:
- env: prod
+ env: production
diff --git a/azure/android-staging.yml b/azure/android-staging.yml
index d5bbcc9b..bb8b3e45 100644
--- a/azure/android-staging.yml
+++ b/azure/android-staging.yml
@@ -7,9 +7,9 @@ pool:
variables:
- template: templates/env-vars.yml
parameters:
- env: 'staging'
+ env: staging
steps:
- template: templates/build-android.yml
parameters:
- env: 'staging'
+ env: staging
diff --git a/azure/android-test.yml b/azure/android-test.yml
deleted file mode 100644
index 78cb418b..00000000
--- a/azure/android-test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-trigger:
-- develop
-
-pool:
- vmImage: ubuntu-latest
-
-variables:
- - template: templates/env-vars.yml
- parameters:
- env: 'test'
-
-steps:
-- template: templates/build-android.yml
- parameters:
- env: 'test'
diff --git a/azure/templates/build-android.yml b/azure/templates/build-android.yml
index 4ca34450..dcca8c4a 100644
--- a/azure/templates/build-android.yml
+++ b/azure/templates/build-android.yml
@@ -2,11 +2,11 @@ parameters:
- name: env
displayName: environment
type: string
- default: test
+ default: develop
values:
- production
- staging
- - test
+ - develop
steps:
- template: install-flutter.yml
diff --git a/azure/templates/build-ios.yml b/azure/templates/build-ios.yml
index 23e9ae7f..9879cc0a 100644
--- a/azure/templates/build-ios.yml
+++ b/azure/templates/build-ios.yml
@@ -2,20 +2,16 @@ parameters:
- name: env
displayName: environment
type: string
- default: test
+ default: develop
values:
- production
- staging
- - test
-
-pool:
- vmImage: 'macOS-latest'
+ - develop
steps:
- template: download-env.yml
- template: install-flutter.yml
-
# Uncomment to run unit tests
# - task: FlutterTest@0
# displayName: "Run unit tests"
diff --git a/azure/templates/env-vars.yml b/azure/templates/env-vars.yml
index 45205215..0c792131 100644
--- a/azure/templates/env-vars.yml
+++ b/azure/templates/env-vars.yml
@@ -1,7 +1,7 @@
# We can only use variables in a template if the variables are defined in their own template.
parameters:
- env: 'test'
+ env: 'develop'
variables:
- name: dotenvFileName
@@ -9,21 +9,21 @@ variables:
value: '.env'
${{ if eq(parameters.env, 'staging') }}:
value: '.env.stage'
- ${{ if eq(parameters.env, 'test') }}:
+ ${{ if eq(parameters.env, 'develop') }}:
value: '.env.dev'
- name: bundleId
${{ if eq(parameters.env, 'production') }}:
value: 'com.comwell.phoenix'
${{ if eq(parameters.env, 'staging') }}:
value: 'com.comwell.phoenix.stage'
- ${{ if eq(parameters.env, 'test') }}:
- value: 'com.comwell.phoenix.rtest'
+ ${{ if eq(parameters.env, 'develop') }}:
+ value: 'com.comwell.phoenix.dev'
- name: flavor
${{ if eq(parameters.env, 'production') }}:
value: 'prod'
${{ if eq(parameters.env, 'staging') }}:
value: 'stage'
- ${{ if eq(parameters.env, 'test') }}:
+ ${{ if eq(parameters.env, 'develop') }}:
value: 'develop'
# iOS
- name: iosProvisionProfileFileName
@@ -31,21 +31,21 @@ variables:
value: 'CP_Prod.mobileprovision'
${{ if eq(parameters.env, 'staging') }}:
value: 'CP_Stage.mobileprovision'
- ${{ if eq(parameters.env, 'test') }}:
+ ${{ if eq(parameters.env, 'develop') }}:
value: 'CP_TEST.mobileprovision'
- name: iosScheme
${{ if eq(parameters.env, 'production') }}:
value: 'Prod'
${{ if eq(parameters.env, 'staging') }}:
value: 'Stage'
- ${{ if eq(parameters.env, 'test') }}:
+ ${{ if eq(parameters.env, 'develop') }}:
value: 'releasetest'
- name: iosConfiguration
${{ if eq(parameters.env, 'production') }}:
value: 'Release-Prod'
${{ if eq(parameters.env, 'staging') }}:
value: 'Release-Stage'
- ${{ if eq(parameters.env, 'test') }}:
+ ${{ if eq(parameters.env, 'develop') }}:
value: 'Release-releasetest'
# Android
- name: androidAABPath
@@ -53,5 +53,5 @@ variables:
value: 'prodRelease/app-prod-release.aab'
${{ if eq(parameters.env, 'staging') }}:
value: 'stageRelease/app-stage-release.aab'
- ${{ if eq(parameters.env, 'test') }}:
+ ${{ if eq(parameters.env, 'develop') }}:
value: 'developRelease/app-develop-release.aab'
diff --git a/comwell_key_app/.fvm/fvm_config.json b/comwell_key_app/.fvm/fvm_config.json
index 489810e6..bb6e5840 100644
--- a/comwell_key_app/.fvm/fvm_config.json
+++ b/comwell_key_app/.fvm/fvm_config.json
@@ -1,3 +1,3 @@
{
- "flutterSdkVersion": "3.24.4"
+ "flutterSdkVersion": "3.32.1"
}
\ No newline at end of file
diff --git a/comwell_key_app/android/app/build.gradle b/comwell_key_app/android/app/build.gradle
index 23052b29..d3ba9464 100644
--- a/comwell_key_app/android/app/build.gradle
+++ b/comwell_key_app/android/app/build.gradle
@@ -89,25 +89,14 @@ android {
productFlavors{
-
develop {
dimension = "env"
- resValue "string", "app_name", "CP Dev"
+ resValue "string", "app_name", "Comwell Phoenix Dev"
applicationIdSuffix = ".dev"
}
- debugtest {
- dimension = "env"
- resValue "string", "app_name", "CP DTest"
- applicationIdSuffix = ".dtest"
- }
- releasetest {
- dimension = "env"
- resValue "string", "app_name", "CP RTest"
- applicationIdSuffix = ".rtest"
- }
stage {
dimension = "env"
- resValue "string", "app_name", "CP Stage"
+ resValue "string", "app_name", "Comwell Phoenix Stage"
applicationIdSuffix = ".stage"
}
prod {
diff --git a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Stage.xcscheme b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Stage.xcscheme
index 6945c82a..ef96a55c 100644
--- a/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Stage.xcscheme
+++ b/comwell_key_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Stage.xcscheme
@@ -6,6 +6,24 @@
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"
@@ -27,6 +45,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
@@ -34,6 +53,7 @@
buildConfiguration = "Release-Stage"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
diff --git a/comwell_key_app/lib/firebase_options.dart b/comwell_key_app/lib/firebase_options.dart
deleted file mode 100644
index 6aa91fcf..00000000
--- a/comwell_key_app/lib/firebase_options.dart
+++ /dev/null
@@ -1,89 +0,0 @@
-// File generated by FlutterFire CLI.
-// ignore_for_file: type=lint
-import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
- show defaultTargetPlatform, kIsWeb, TargetPlatform;
-
-/// Default [FirebaseOptions] for use with your Firebase apps.
-///
-/// Example:
-/// ```dart
-/// import 'firebase_options.dart';
-/// // ...
-/// await Firebase.initializeApp(
-/// options: DefaultFirebaseOptions.currentPlatform,
-/// );
-/// ```
-class DefaultFirebaseOptions {
- static FirebaseOptions get currentPlatform {
- if (kIsWeb) {
- return web;
- }
- switch (defaultTargetPlatform) {
- case TargetPlatform.android:
- return android;
- case TargetPlatform.iOS:
- return ios;
- case TargetPlatform.macOS:
- return macos;
- case TargetPlatform.windows:
- return windows;
- case TargetPlatform.linux:
- throw UnsupportedError(
- 'DefaultFirebaseOptions have not been configured for linux - '
- 'you can reconfigure this by running the FlutterFire CLI again.',
- );
- default:
- throw UnsupportedError(
- 'DefaultFirebaseOptions are not supported for this platform.',
- );
- }
- }
-
- static const FirebaseOptions web = FirebaseOptions(
- apiKey: 'AIzaSyBa1nxiH7M5_9fBHk4DVHVpuPz4Ek-UPO4',
- appId: '1:1031550326508:web:ac21b20cf60305e9cdf7c9',
- messagingSenderId: '1031550326508',
- projectId: 'comwell-phoenix',
- authDomain: 'comwell-phoenix.firebaseapp.com',
- storageBucket: 'comwell-phoenix.firebasestorage.app',
- measurementId: 'G-VW2YPVJ3Y4',
- );
-
- static const FirebaseOptions android = FirebaseOptions(
- apiKey: 'AIzaSyC7AtY1V1dxx4B280yOvcOjhaMOsnhEMMA',
- appId: '1:1031550326508:android:04a896341af4f448cdf7c9',
- messagingSenderId: '1031550326508',
- projectId: 'comwell-phoenix',
- storageBucket: 'comwell-phoenix.firebasestorage.app',
- );
-
- static const FirebaseOptions ios = FirebaseOptions(
- apiKey: 'AIzaSyBgjzugYkBvtPwrx8SHqHsCCPFwxuOquyQ',
- appId: '1:1031550326508:ios:05ac9b069efbbac9cdf7c9',
- messagingSenderId: '1031550326508',
- projectId: 'comwell-phoenix',
- storageBucket: 'comwell-phoenix.firebasestorage.app',
- iosBundleId: 'com.comwell.phoenix',
- );
-
- static const FirebaseOptions macos = FirebaseOptions(
- apiKey: 'AIzaSyBgjzugYkBvtPwrx8SHqHsCCPFwxuOquyQ',
- appId: '1:1031550326508:ios:045894b7b1978c36cdf7c9',
- messagingSenderId: '1031550326508',
- projectId: 'comwell-phoenix',
- storageBucket: 'comwell-phoenix.firebasestorage.app',
- iosBundleId: 'com.assa.comwellKeyApp',
- );
-
- static const FirebaseOptions windows = FirebaseOptions(
- apiKey: 'AIzaSyBa1nxiH7M5_9fBHk4DVHVpuPz4Ek-UPO4',
- appId: '1:1031550326508:web:fc58da0d89a34cdecdf7c9',
- messagingSenderId: '1031550326508',
- projectId: 'comwell-phoenix',
- authDomain: 'comwell-phoenix.firebaseapp.com',
- storageBucket: 'comwell-phoenix.firebasestorage.app',
- measurementId: 'G-P559QWFQ0J',
- );
-
-}
\ No newline at end of file
diff --git a/comwell_key_app/lib/firebase_options_test.dart b/comwell_key_app/lib/firebase_options_test.dart
deleted file mode 100644
index a3128b86..00000000
--- a/comwell_key_app/lib/firebase_options_test.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-// File generated by FlutterFire CLI.
-// ignore_for_file: type=lint
-import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
- show defaultTargetPlatform, kIsWeb, TargetPlatform;
-
-/// Default [FirebaseOptions] for use with your Firebase apps.
-///
-/// Example:
-/// ```dart
-/// import 'firebase_options_test.dart';
-/// // ...
-/// await Firebase.initializeApp(
-/// options: DefaultFirebaseOptions.currentPlatform,
-/// );
-/// ```
-class DefaultFirebaseOptions {
- static FirebaseOptions get currentPlatform {
- if (kIsWeb) {
- return web;
- }
- switch (defaultTargetPlatform) {
- case TargetPlatform.android:
- return android;
- case TargetPlatform.iOS:
- return ios;
- case TargetPlatform.macOS:
- throw UnsupportedError(
- 'DefaultFirebaseOptions have not been configured for macos - '
- 'you can reconfigure this by running the FlutterFire CLI again.',
- );
- case TargetPlatform.windows:
- throw UnsupportedError(
- 'DefaultFirebaseOptions have not been configured for windows - '
- 'you can reconfigure this by running the FlutterFire CLI again.',
- );
- case TargetPlatform.linux:
- throw UnsupportedError(
- 'DefaultFirebaseOptions have not been configured for linux - '
- 'you can reconfigure this by running the FlutterFire CLI again.',
- );
- default:
- throw UnsupportedError(
- 'DefaultFirebaseOptions are not supported for this platform.',
- );
- }
- }
-
- static const FirebaseOptions web = FirebaseOptions(
- apiKey: 'AIzaSyDAbKlWqeu-fDqSBe3L_7Q1wI0vTLZ9UFc',
- appId: '1:454092419952:web:0a2aa7c1a9af8fd9a995b5',
- messagingSenderId: '454092419952',
- projectId: 'comwell-phoenix-releasetest',
- authDomain: 'comwell-phoenix-releasetest.firebaseapp.com',
- storageBucket: 'comwell-phoenix-releasetest.firebasestorage.app',
- );
-
- static const FirebaseOptions android = FirebaseOptions(
- apiKey: 'AIzaSyAFiPr2EhmahyiQ1u9Ka3-yaByAFMXNkss',
- appId: '1:454092419952:android:060b8e4744be03cca995b5',
- messagingSenderId: '454092419952',
- projectId: 'comwell-phoenix-test',
- storageBucket: 'comwell-phoenix-test.firebasestorage.app',
- );
-
- static const FirebaseOptions ios = FirebaseOptions(
- apiKey: 'AIzaSyBxrRSPwlP8zRk5afgGX4jiOu9l3M5F-60',
- appId: '1:454092419952:ios:4ebb640eb03646e8a995b5',
- messagingSenderId: '454092419952',
- projectId: 'comwell-phoenix-releasetest',
- storageBucket: 'comwell-phoenix-releasetest.firebasestorage.app',
- iosBundleId: 'com.comwell.phoenix.releasetest',
- );
-}
\ No newline at end of file
diff --git a/comwell_key_app/lib/main.dart b/comwell_key_app/lib/main.dart
index 646820b3..50027e63 100644
--- a/comwell_key_app/lib/main.dart
+++ b/comwell_key_app/lib/main.dart
@@ -18,14 +18,11 @@ void main() async {
runMainApp(fb_stage.DefaultFirebaseOptions.currentPlatform, '.env.stage');
} else if (appFlavor == 'prod') {
runMainApp(fb_prod.DefaultFirebaseOptions.currentPlatform, '.env.prod');
- } else if (appFlavor == 'debugtest') {
- runMainApp(fb_stage.DefaultFirebaseOptions.currentPlatform, '.env.stage');
- } else if (appFlavor == 'releasetest') {
- runMainApp(fb_stage.DefaultFirebaseOptions.currentPlatform, '.env.stage');
+ } else {
+ throw UnsupportedError('Invalid appFlavor: $appFlavor');
}
}
-//import 'firebase_options_test.dart' as test';
void runMainApp(FirebaseOptions firebaseOptions, String envFile) async {
WidgetsFlutterBinding.ensureInitialized();
await EasyLocalization.ensureInitialized();
diff --git a/comwell_key_app/lib/utils/firebase.dart b/comwell_key_app/lib/utils/firebase.dart
index 81e6a60c..cfae7b5d 100644
--- a/comwell_key_app/lib/utils/firebase.dart
+++ b/comwell_key_app/lib/utils/firebase.dart
@@ -2,16 +2,14 @@ import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/services.dart';
-import '../firebase_options.dart' as prod;
+import '../firebase_options_prod.dart' as prod;
import '../firebase_options_stage.dart' as stage;
-import '../firebase_options_test.dart' as test;
import '../firebase_options_dev.dart' as dev;
Future<void> configureFirebase() async {
final firebaseOptions = switch (appFlavor) {
'prod' => prod.DefaultFirebaseOptions.currentPlatform,
'stage' => stage.DefaultFirebaseOptions.currentPlatform,
- 'releasetest' => test.DefaultFirebaseOptions.currentPlatform,
'develop' => dev.DefaultFirebaseOptions.currentPlatform,
_ => throw UnsupportedError('Invalid flavor: $appFlavor'),
};