6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit e1d3eba0
Changed files
.gitignore | 2 +- comwell_key_app/android/app/build.gradle | 1 + comwell_key_app/lib/main.dart | 2 +- concierge/example/pubspec.lock | 16 ++++++++++++++ concierge/lib/concierge_app.dart | 4 +++- payment_plugin/example/pubspec.lock | 36 +++++++++++++++++++++++--------- 6 files changed, 48 insertions(+), 13 deletions(-)
Diff
diff --git a/.gitignore b/.gitignore
index c081b867..86f45093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,5 @@ mobilekeys_sdk_plugin/.idea/
# common module
common/env/
common/build/
-common/.dart_tool
+common/.dart_tool/
diff --git a/comwell_key_app/android/app/build.gradle b/comwell_key_app/android/app/build.gradle
index 186a578b..93a5ace6 100644
--- a/comwell_key_app/android/app/build.gradle
+++ b/comwell_key_app/android/app/build.gradle
@@ -65,6 +65,7 @@ android {
}
buildTypes {
release {
+ println(getVersionCode())
signingConfig signingConfigs.release
minifyEnabled false
shrinkResources false
diff --git a/comwell_key_app/lib/main.dart b/comwell_key_app/lib/main.dart
index 0dcb4c6e..1f89f612 100644
--- a/comwell_key_app/lib/main.dart
+++ b/comwell_key_app/lib/main.dart
@@ -64,7 +64,7 @@ void main() async {
),
);
} catch (e, st) {
- print("Error init app: $e");
+ debugPrint("Error init app: $e");
if (!kDebugMode) Sentry.captureException(e, stackTrace: st);
rethrow;
}
diff --git a/concierge/example/pubspec.lock b/concierge/example/pubspec.lock
index a73324fb..c31c0cb7 100644
--- a/concierge/example/pubspec.lock
+++ b/concierge/example/pubspec.lock
@@ -458,6 +458,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.9.0"
+ json_pretty:
+ dependency: transitive
+ description:
+ name: json_pretty
+ sha256: "03795063131b8e4af00fb95a5b09cfa98abb710298f9a891a321fb7349d1f600"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.4"
leak_tracker:
dependency: transitive
description:
@@ -546,6 +554,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.0"
+ msal_auth:
+ dependency: transitive
+ description:
+ name: msal_auth
+ sha256: "3e563ef107e9d87a9645b7e21e23b8af50786786762d9f37324057c36c44f5c0"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.3.0"
nested:
dependency: transitive
description:
diff --git a/concierge/lib/concierge_app.dart b/concierge/lib/concierge_app.dart
index eeabfc91..f1f9785d 100644
--- a/concierge/lib/concierge_app.dart
+++ b/concierge/lib/concierge_app.dart
@@ -1,4 +1,5 @@
import 'package:common/services/msal_service.dart';
+import 'package:common/utils/env_utils.dart';
import 'package:concierge/data/remote/api/concierge_interceptor.dart';
import 'package:concierge/data/remote/api/concierge_service.dart';
import 'package:concierge/domain/repositories/property_repository.dart';
@@ -8,6 +9,7 @@ import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:payment_plugin/payment_plugin.dart';
import 'package:pretty_dio_logger/pretty_dio_logger.dart';
@@ -37,7 +39,7 @@ class ConciergeApp extends StatelessWidget {
if (kDebugMode) PrettyDioLogger(requestBody: true, requestHeader: true),
]);
final apimDio = Dio(
- BaseOptions(baseUrl: "https://apim-comwell-net-services-stage.azure-api.net/api"),
+ BaseOptions(baseUrl: dotenv.SERVICE_URL),
);
apimDio.interceptors.addAll([
ConciergeInterceptor(msal),
diff --git a/payment_plugin/example/pubspec.lock b/payment_plugin/example/pubspec.lock
index 9f5a5a8b..3a2402f7 100644
--- a/payment_plugin/example/pubspec.lock
+++ b/payment_plugin/example/pubspec.lock
@@ -53,10 +53,10 @@ packages:
dependency: transitive
description:
name: characters
- sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+ sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev"
source: hosted
- version: "1.4.0"
+ version: "1.4.1"
clock:
dependency: transitive
description:
@@ -283,6 +283,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.9.0"
+ json_pretty:
+ dependency: transitive
+ description:
+ name: json_pretty
+ sha256: "03795063131b8e4af00fb95a5b09cfa98abb710298f9a891a321fb7349d1f600"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.4"
leak_tracker:
dependency: transitive
description:
@@ -335,26 +343,26 @@ packages:
dependency: transitive
description:
name: matcher
- sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+ sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
url: "https://pub.dev"
source: hosted
- version: "0.12.17"
+ version: "0.12.18"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+ sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev"
source: hosted
- version: "0.11.1"
+ version: "0.13.0"
meta:
dependency: transitive
description:
name: meta
- sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+ sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
url: "https://pub.dev"
source: hosted
- version: "1.16.0"
+ version: "1.17.0"
mime:
dependency: transitive
description:
@@ -363,6 +371,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.0"
+ msal_auth:
+ dependency: transitive
+ description:
+ name: msal_auth
+ sha256: "3e563ef107e9d87a9645b7e21e23b8af50786786762d9f37324057c36c44f5c0"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.3.0"
nested:
dependency: transitive
description:
@@ -627,10 +643,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+ sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
url: "https://pub.dev"
source: hosted
- version: "0.7.6"
+ version: "0.7.9"
typed_data:
dependency: transitive
description: