From fe8163a7e6016c8aea311afba1a68e57adf842f0 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Tue, 3 May 2022 08:57:41 +0700 Subject: [PATCH] published in the ios app store 0.1.0 37 --- docs/fastlane/ios/README.md | 94 ++++++++++--------- packages/admin/ios/Flutter/Generated.xcconfig | 8 +- .../ios/Flutter/flutter_export_environment.sh | 8 +- packages/admin/ios/Podfile.lock | 17 +--- packages/admin/ios/fastlane/report.xml | 4 +- .../plugins/GeneratedPluginRegistrant.java | 5 - packages/hotel/android/local.properties | 2 +- packages/hotel/ios/Flutter/Generated.xcconfig | 2 +- .../ios/Flutter/flutter_export_environment.sh | 2 +- .../ios/Runner/GeneratedPluginRegistrant.m | 7 -- packages/hotel/ios/Runner/Info.plist | 7 +- packages/hotel/ios/fastlane/report.xml | 4 +- .../lib/generated_plugin_registrant.dart | 2 - packages/hotel/pubspec.lock | 50 ++++------ packages/hotel/pubspec.yaml | 2 +- 15 files changed, 90 insertions(+), 124 deletions(-) diff --git a/docs/fastlane/ios/README.md b/docs/fastlane/ios/README.md index fa9d1b0b..9ed1a6d6 100644 --- a/docs/fastlane/ios/README.md +++ b/docs/fastlane/ios/README.md @@ -1,46 +1,48 @@ -To upload a new version to the appstore: - -start emulators from command line: -https://medium.com/@abrisad_it/how-to-launch-ios-simulator-and-android-emulator-on-mac-cd198295532e - -to create a missing emulator ipad: (adjust ios version and ipad version) -xcrun simctl create "iPad Pro (12.9-inch) (3rd generation)" "com.apple.CoreSimulator.SimDeviceType.iPad-Pro--12-9-inch---3rd-generation-" "com.apple.CoreSimulator.SimRuntime.iOS-14-5" - -1. Start all emulators you need screen shots from - iPhone 12 pro max, iPhone 8 Plus, iPad Pro 12.9 (2nd gen), iPad Pro 12.9 (3rd gen) -2. switch Ipad to horizontal layout - -dirs should exist: ios/fastlane/unframed/en-US -from app root: flutter pub run utils:screenshots - -to only run the frameit-chrome program:(project home) -flutter pub global run frameit_chrome \ - --base-dir=ios/fastlane/unframed \ - --frames-dir=ios/fastlane/frames \ - --chrome-binary=/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome \ - --pixel-ratio=2 - --skip_docs - -When generated then move from framed/en-US to metadata/screenshots/en-US - -Build and upload Manual: - https://flutter.dev/docs/deployment/ios -certicate access (rediculus!!) - https://stackoverflow.com/questions/10204320/mac-os-x-wants-to-use-system-keychain-when-compiling-the-project - -Fastlane: ---------- -1. increase numbers in ios/Runner/Info.plist: - CFBundleShortVersionString: major version seen by the user ie: 0.0.13 - CFBundleVersion: seqeuntial nuber within version -2. build flutter: (project home) - flutter build ios --release --no-codesign -3. compile and sign (in ios dir) - fastlane gym skip_docs -4. upload: (in ios dir) - binary only: fastlane upload - all including meta: fastlane deliver --overwrite_screenshots skip_docs - just screenshots: fastlane deliver --overwrite_screenshots skip_docs --skip_binary_upload - -login to the appstore console: -create new major version, give reason of update and submit for review +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## iOS + +### ios build + +```sh +[bundle exec] fastlane ios build +``` + + + +### ios codesign + +```sh +[bundle exec] fastlane ios codesign +``` + + + +### ios upload + +```sh +[bundle exec] fastlane ios upload +``` + + + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/packages/admin/ios/Flutter/Generated.xcconfig b/packages/admin/ios/Flutter/Generated.xcconfig index 41004de4..4cb91613 100644 --- a/packages/admin/ios/Flutter/Generated.xcconfig +++ b/packages/admin/ios/Flutter/Generated.xcconfig @@ -1,6 +1,6 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/home/dell/snap/flutter/common/flutter -FLUTTER_APPLICATION_PATH=/home/dell/growerp/packages/admin +FLUTTER_ROOT=/Users/hans/flutter +FLUTTER_APPLICATION_PATH=/Users/hans/growerp/packages/admin COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_TARGET=lib/main.dart FLUTTER_BUILD_DIR=build @@ -9,5 +9,5 @@ FLUTTER_BUILD_NUMBER=37 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=false -TREE_SHAKE_ICONS=false -PACKAGE_CONFIG=.packages +TREE_SHAKE_ICONS=true +PACKAGE_CONFIG=/Users/hans/growerp/packages/admin/.dart_tool/package_config.json diff --git a/packages/admin/ios/Flutter/flutter_export_environment.sh b/packages/admin/ios/Flutter/flutter_export_environment.sh index 649822e0..d909c39e 100755 --- a/packages/admin/ios/Flutter/flutter_export_environment.sh +++ b/packages/admin/ios/Flutter/flutter_export_environment.sh @@ -1,7 +1,7 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/home/dell/snap/flutter/common/flutter" -export "FLUTTER_APPLICATION_PATH=/home/dell/growerp/packages/admin" +export "FLUTTER_ROOT=/Users/hans/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/hans/growerp/packages/admin" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" @@ -9,5 +9,5 @@ export "FLUTTER_BUILD_NAME=0.1.0" export "FLUTTER_BUILD_NUMBER=37" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=false" -export "TREE_SHAKE_ICONS=false" -export "PACKAGE_CONFIG=.packages" +export "TREE_SHAKE_ICONS=true" +export "PACKAGE_CONFIG=/Users/hans/growerp/packages/admin/.dart_tool/package_config.json" diff --git a/packages/admin/ios/Podfile.lock b/packages/admin/ios/Podfile.lock index 22e7f74b..eb9be251 100644 --- a/packages/admin/ios/Podfile.lock +++ b/packages/admin/ios/Podfile.lock @@ -1,7 +1,4 @@ PODS: - - connectivity (0.0.1): - - Flutter - - Reachability - Flutter (1.0.0) - image_picker (0.0.1): - Flutter @@ -9,14 +6,12 @@ PODS: - Flutter - printing (1.0.0): - Flutter - - Reachability (3.2) - shared_preferences_ios (0.0.1): - Flutter - url_launcher_ios (0.0.1): - Flutter DEPENDENCIES: - - connectivity (from `.symlinks/plugins/connectivity/ios`) - Flutter (from `Flutter`) - image_picker (from `.symlinks/plugins/image_picker/ios`) - integration_test (from `.symlinks/plugins/integration_test/ios`) @@ -24,13 +19,7 @@ DEPENDENCIES: - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) -SPEC REPOS: - trunk: - - Reachability - EXTERNAL SOURCES: - connectivity: - :path: ".symlinks/plugins/connectivity/ios" Flutter: :path: Flutter image_picker: @@ -45,14 +34,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a image_picker: 541dcbb3b9cf32d87eacbd957845d8651d6c62c3 integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 printing: eafa00acb682c0ca029d4d98d0798f55a1e27102 - Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 - shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 - url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/packages/admin/ios/fastlane/report.xml b/packages/admin/ios/fastlane/report.xml index 64da190a..9b2b5149 100644 --- a/packages/admin/ios/fastlane/report.xml +++ b/packages/admin/ios/fastlane/report.xml @@ -5,12 +5,12 @@ - + - + diff --git a/packages/hotel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/packages/hotel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java index fa113fb6..5f84eed7 100644 --- a/packages/hotel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ b/packages/hotel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java @@ -15,11 +15,6 @@ public final class GeneratedPluginRegistrant { private static final String TAG = "GeneratedPluginRegistrant"; public static void registerWith(@NonNull FlutterEngine flutterEngine) { - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.connectivity.ConnectivityPlugin()); - } catch(Exception e) { - Log.e(TAG, "Error registering plugin connectivity, io.flutter.plugins.connectivity.ConnectivityPlugin", e); - } try { flutterEngine.getPlugins().add(new io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin()); } catch(Exception e) { diff --git a/packages/hotel/android/local.properties b/packages/hotel/android/local.properties index f7750617..91e99d27 100644 --- a/packages/hotel/android/local.properties +++ b/packages/hotel/android/local.properties @@ -1,5 +1,5 @@ sdk.dir=/home/dell/Android/Sdk -flutter.sdk=/home/dell/snap/flutter/common/flutter +flutter.sdk=/Users/hans/flutter flutter.buildMode=release flutter.versionName=0.1.0 flutter.versionCode=13 \ No newline at end of file diff --git a/packages/hotel/ios/Flutter/Generated.xcconfig b/packages/hotel/ios/Flutter/Generated.xcconfig index bedb7ec4..79f5c97c 100644 --- a/packages/hotel/ios/Flutter/Generated.xcconfig +++ b/packages/hotel/ios/Flutter/Generated.xcconfig @@ -5,7 +5,7 @@ COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_TARGET=lib/main.dart FLUTTER_BUILD_DIR=build FLUTTER_BUILD_NAME=0.1.0 -FLUTTER_BUILD_NUMBER=12 +FLUTTER_BUILD_NUMBER=13 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=false diff --git a/packages/hotel/ios/Flutter/flutter_export_environment.sh b/packages/hotel/ios/Flutter/flutter_export_environment.sh index a5ab9751..1c1a7d75 100755 --- a/packages/hotel/ios/Flutter/flutter_export_environment.sh +++ b/packages/hotel/ios/Flutter/flutter_export_environment.sh @@ -6,7 +6,7 @@ export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=0.1.0" -export "FLUTTER_BUILD_NUMBER=12" +export "FLUTTER_BUILD_NUMBER=13" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=false" export "TREE_SHAKE_ICONS=true" diff --git a/packages/hotel/ios/Runner/GeneratedPluginRegistrant.m b/packages/hotel/ios/Runner/GeneratedPluginRegistrant.m index 6018fab4..a911af3f 100644 --- a/packages/hotel/ios/Runner/GeneratedPluginRegistrant.m +++ b/packages/hotel/ios/Runner/GeneratedPluginRegistrant.m @@ -6,12 +6,6 @@ #import "GeneratedPluginRegistrant.h" -#if __has_include() -#import -#else -@import connectivity; -#endif - #if __has_include() #import #else @@ -45,7 +39,6 @@ @implementation GeneratedPluginRegistrant + (void)registerWithRegistry:(NSObject*)registry { - [FLTConnectivityPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTConnectivityPlugin"]]; [FLTImagePickerPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTImagePickerPlugin"]]; [IntegrationTestPlugin registerWithRegistrar:[registry registrarForPlugin:@"IntegrationTestPlugin"]]; [PrintingPlugin registerWithRegistrar:[registry registrarForPlugin:@"PrintingPlugin"]]; diff --git a/packages/hotel/ios/Runner/Info.plist b/packages/hotel/ios/Runner/Info.plist index e4938165..028ac056 100644 --- a/packages/hotel/ios/Runner/Info.plist +++ b/packages/hotel/ios/Runner/Info.plist @@ -28,6 +28,10 @@ LaunchScreen UIMainStoryboardFile Main + NSPhotoLibraryUsageDescription + The image you upload will be used on Business documents like invoices or shown on screen with the relevant data. + NSCameraUsageDescription + The app needs the camera to take pictures of persons and paper documents to show later as reference in the app. UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -43,5 +47,6 @@ UIViewControllerBasedStatusBarAppearance - + ITSAppUsesNonExemptEncryption + diff --git a/packages/hotel/ios/fastlane/report.xml b/packages/hotel/ios/fastlane/report.xml index 20f487e0..047086c6 100644 --- a/packages/hotel/ios/fastlane/report.xml +++ b/packages/hotel/ios/fastlane/report.xml @@ -5,12 +5,12 @@ - + - + diff --git a/packages/hotel/lib/generated_plugin_registrant.dart b/packages/hotel/lib/generated_plugin_registrant.dart index e1129a72..4dbe2fb0 100644 --- a/packages/hotel/lib/generated_plugin_registrant.dart +++ b/packages/hotel/lib/generated_plugin_registrant.dart @@ -5,7 +5,6 @@ // ignore_for_file: directives_ordering // ignore_for_file: lines_longer_than_80_chars -import 'package:connectivity_for_web/connectivity_for_web.dart'; import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:printing/printing_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; @@ -15,7 +14,6 @@ import 'package:flutter_web_plugins/flutter_web_plugins.dart'; // ignore: public_member_api_docs void registerPlugins(Registrar registrar) { - ConnectivityPlugin.registerWith(registrar); ImagePickerPlugin.registerWith(registrar); PrintingPlugin.registerWith(registrar); SharedPreferencesPlugin.registerWith(registrar); diff --git a/packages/hotel/pubspec.lock b/packages/hotel/pubspec.lock index 35066561..14d5883b 100644 --- a/packages/hotel/pubspec.lock +++ b/packages/hotel/pubspec.lock @@ -162,34 +162,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.15.0" - connectivity: - dependency: transitive - description: - name: connectivity - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.6" - connectivity_for_web: - dependency: transitive - description: - name: connectivity_for_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.0+1" - connectivity_macos: - dependency: transitive - description: - name: connectivity_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.1+2" - connectivity_platform_interface: - dependency: transitive - description: - name: connectivity_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" convert: dependency: transitive description: @@ -211,6 +183,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" + credit_card_type_detector: + dependency: transitive + description: + name: credit_card_type_detector + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + credit_card_validator: + dependency: transitive + description: + name: credit_card_validator + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" cross_file: dependency: transitive description: @@ -245,7 +231,7 @@ packages: name: decimal url: "https://pub.dartlang.org" source: hosted - version: "1.5.0" + version: "2.2.0" diff_match_patch: dependency: transitive description: @@ -266,7 +252,7 @@ packages: name: dropdown_search url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "2.0.1" equatable: dependency: "direct main" description: @@ -686,7 +672,7 @@ packages: name: rational url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "2.2.0" responsive_framework: dependency: "direct main" description: @@ -700,7 +686,7 @@ packages: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.26.0" + version: "0.27.3" shared_preferences: dependency: "direct main" description: diff --git a/packages/hotel/pubspec.yaml b/packages/hotel/pubspec.yaml index 38b7e694..c6dd438b 100644 --- a/packages/hotel/pubspec.yaml +++ b/packages/hotel/pubspec.yaml @@ -1,5 +1,5 @@ name: hotel -version: 0.1.0+13 +version: 0.1.1+1 publish_to: none environment: