From f25355ee3e26cd85b309ea855925818010faa001 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Thu, 12 Dec 2024 19:33:30 +0100 Subject: [PATCH 1/7] gearing up towards a working build pipeline --- frontend/ios/.gitignore | 6 + frontend/ios/Flutter/Debug.xcconfig | 1 + frontend/ios/Flutter/Release.xcconfig | 1 + frontend/ios/Gemfile | 5 + frontend/ios/Gemfile.lock | 288 ++++++++++++++++++ frontend/ios/Podfile | 44 +++ frontend/ios/Podfile.lock | 89 ++++++ frontend/ios/Runner.xcodeproj/project.pbxproj | 201 +++++++++++- .../contents.xcworkspacedata | 3 + frontend/ios/Runner/AppDelegate.swift | 2 +- frontend/ios/Runner/Info.plist | 8 +- frontend/ios/fastlane/Appfile | 8 + frontend/ios/fastlane/Fastfile | 47 +++ frontend/ios/fastlane/Matchfile | 8 + frontend/ios/fastlane/README.md | 48 +++ frontend/macos/Flutter/Flutter-Debug.xcconfig | 1 + .../macos/Flutter/Flutter-Release.xcconfig | 1 + frontend/macos/Podfile | 43 +++ 18 files changed, 790 insertions(+), 14 deletions(-) create mode 100644 frontend/ios/Gemfile create mode 100644 frontend/ios/Gemfile.lock create mode 100644 frontend/ios/Podfile create mode 100644 frontend/ios/Podfile.lock create mode 100644 frontend/ios/fastlane/Appfile create mode 100644 frontend/ios/fastlane/Fastfile create mode 100644 frontend/ios/fastlane/Matchfile create mode 100644 frontend/ios/fastlane/README.md create mode 100644 frontend/macos/Podfile diff --git a/frontend/ios/.gitignore b/frontend/ios/.gitignore index 7a7f987..f57f0a3 100644 --- a/frontend/ios/.gitignore +++ b/frontend/ios/.gitignore @@ -1,3 +1,9 @@ +# fastlane secret +.env +secret.env +*.mobileprovision +report.xml + **/dgph *.mode1v3 *.mode2v3 diff --git a/frontend/ios/Flutter/Debug.xcconfig b/frontend/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/frontend/ios/Flutter/Debug.xcconfig +++ b/frontend/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/frontend/ios/Flutter/Release.xcconfig b/frontend/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/frontend/ios/Flutter/Release.xcconfig +++ b/frontend/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/frontend/ios/Gemfile b/frontend/ios/Gemfile new file mode 100644 index 0000000..6653b13 --- /dev/null +++ b/frontend/ios/Gemfile @@ -0,0 +1,5 @@ +source "https://rubygems.org" + +gem "fastlane" +gem "cocoapods" + diff --git a/frontend/ios/Gemfile.lock b/frontend/ios/Gemfile.lock new file mode 100644 index 0000000..31610d7 --- /dev/null +++ b/frontend/ios/Gemfile.lock @@ -0,0 +1,288 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + activesupport (5.2.8.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.1004.0) + aws-sdk-core (3.212.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.170.1) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + cocoapods (1.10.2) + addressable (~> 2.6) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.10.2) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + nap (~> 1.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.2) + activesupport (> 5.0, < 6) + addressable (~> 2.6) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + concurrent-ruby (1.3.4) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + escape (0.0.4) + ethon (0.16.0) + ffi (>= 1.15.0) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.225.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + ffi (1.17.0) + ffi (1.17.0-x86_64-darwin) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.7) + domain_name (~> 0.5) + httpclient (2.8.3) + i18n (1.14.6) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + json (2.8.1) + jwt (2.9.3) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + minitest (5.25.1) + molinillo (0.6.6) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.4.0) + nap (1.1.0) + naturally (2.2.1) + netrc (0.11.0) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.3.9) + rouge (2.0.7) + ruby-macho (1.4.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thread_safe (0.3.6) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (1.2.11) + thread_safe (~> 0.1) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + x86_64-darwin-23 + +DEPENDENCIES + cocoapods + fastlane + +BUNDLED WITH + 2.5.23 diff --git a/frontend/ios/Podfile b/frontend/ios/Podfile new file mode 100644 index 0000000..d97f17e --- /dev/null +++ b/frontend/ios/Podfile @@ -0,0 +1,44 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '12.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/frontend/ios/Podfile.lock b/frontend/ios/Podfile.lock new file mode 100644 index 0000000..fbeaa09 --- /dev/null +++ b/frontend/ios/Podfile.lock @@ -0,0 +1,89 @@ +PODS: + - Flutter (1.0.0) + - geocoding_ios (1.0.5): + - Flutter + - geolocator_apple (1.2.0): + - Flutter + - Google-Maps-iOS-Utils (6.0.0): + - GoogleMaps (~> 9.0) + - google_maps_flutter_ios (0.0.1): + - Flutter + - Google-Maps-iOS-Utils (< 7.0, >= 5.0) + - GoogleMaps (< 10.0, >= 8.4) + - GoogleMaps (9.1.1): + - GoogleMaps/Maps (= 9.1.1) + - GoogleMaps/Base (9.1.1) + - GoogleMaps/Maps (9.1.1): + - GoogleMaps/Base + - map_launcher (0.0.1): + - Flutter + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - permission_handler_apple (9.3.0): + - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - sqflite (0.0.3): + - Flutter + - FlutterMacOS + - url_launcher_ios (0.0.1): + - Flutter + +DEPENDENCIES: + - Flutter (from `Flutter`) + - geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`) + - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) + - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`) + - map_launcher (from `.symlinks/plugins/map_launcher/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - sqflite (from `.symlinks/plugins/sqflite/darwin`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) + +SPEC REPOS: + trunk: + - Google-Maps-iOS-Utils + - GoogleMaps + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + geocoding_ios: + :path: ".symlinks/plugins/geocoding_ios/ios" + geolocator_apple: + :path: ".symlinks/plugins/geolocator_apple/ios" + google_maps_flutter_ios: + :path: ".symlinks/plugins/google_maps_flutter_ios/ios" + map_launcher: + :path: ".symlinks/plugins/map_launcher/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + permission_handler_apple: + :path: ".symlinks/plugins/permission_handler_apple/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + sqflite: + :path: ".symlinks/plugins/sqflite/darwin" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" + +SPEC CHECKSUMS: + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + geocoding_ios: bcbdaa6bddd7d3129c9bcb8acddc5d8778689768 + geolocator_apple: d981750b9f47dbdb02427e1476d9a04397beb8d9 + Google-Maps-iOS-Utils: cfe6a0239c7ca634b7e001ad059a6707143dc8dc + google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264 + GoogleMaps: 80ea184ed6bf44139f383a8b0e248ba3ec1cc8c9 + map_launcher: fe43bda6720bb73c12fcc1bdd86123ff49a4d4d6 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + +PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 + +COCOAPODS: 1.10.2 diff --git a/frontend/ios/Runner.xcodeproj/project.pbxproj b/frontend/ios/Runner.xcodeproj/project.pbxproj index 440759b..d011f2f 100644 --- a/frontend/ios/Runner.xcodeproj/project.pbxproj +++ b/frontend/ios/Runner.xcodeproj/project.pbxproj @@ -11,9 +11,11 @@ 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 8F724AF5AC92A8A68D89C67E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03CCEF89D4BD42ADA86AEDF9 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + CDD1C9EB82AEC89C2181F722 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB8B4133CEB7949B7EEBD81 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,14 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 03CCEF89D4BD42ADA86AEDF9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 282EA28E78AB3F765E4BA719 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 3023467726A2A8275ED51C3E /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 4CB8B4133CEB7949B7EEBD81 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5F8BB7E700693DEAB89BBE69 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7B8A81C772249160491754F9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -55,19 +63,43 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A565AAB9FE158487ABF3A5BF /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + DC475F5210027479529644C3 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 03EC59CC2AABC9D86B4ABFD7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + CDD1C9EB82AEC89C2181F722 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8F724AF5AC92A8A68D89C67E /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1C946B8D83A95663C2489C91 /* Pods */ = { + isa = PBXGroup; + children = ( + 3023467726A2A8275ED51C3E /* Pods-Runner.debug.xcconfig */, + 5F8BB7E700693DEAB89BBE69 /* Pods-Runner.release.xcconfig */, + 7B8A81C772249160491754F9 /* Pods-Runner.profile.xcconfig */, + DC475F5210027479529644C3 /* Pods-RunnerTests.debug.xcconfig */, + A565AAB9FE158487ABF3A5BF /* Pods-RunnerTests.release.xcconfig */, + 282EA28E78AB3F765E4BA719 /* Pods-RunnerTests.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -76,6 +108,15 @@ path = RunnerTests; sourceTree = ""; }; + 3ECCC9BD7D0792871219624C /* Frameworks */ = { + isa = PBXGroup; + children = ( + 03CCEF89D4BD42ADA86AEDF9 /* Pods_Runner.framework */, + 4CB8B4133CEB7949B7EEBD81 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -94,6 +135,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, + 1C946B8D83A95663C2489C91 /* Pods */, + 3ECCC9BD7D0792871219624C /* Frameworks */, ); sourceTree = ""; }; @@ -128,8 +171,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + F27C1B361CA1B045C8D36B3B /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, + 03EC59CC2AABC9D86B4ABFD7 /* Frameworks */, ); buildRules = ( ); @@ -145,12 +190,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 2116AEE9DABFBBDED304ABEB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + FE4BAF74959AF0624BA808EE /* [CP] Embed Pods Frameworks */, + EE58653D94051600FD646EBE /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -222,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2116AEE9DABFBBDED304ABEB /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -253,6 +323,62 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + EE58653D94051600FD646EBE /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + F27C1B361CA1B045C8D36B3B /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + FE4BAF74959AF0624BA808EE /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -327,6 +453,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -361,27 +488,45 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 3; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = L32Y3D8V83; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = Any.Way; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.travel"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.fastNetworkNavigation; + MARKETING_VERSION = 1.0.0; + PRODUCT_BUNDLE_IDENTIFIER = info.anydev.anyway; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore info.anydev.anyway"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore info.anydev.anyway"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = DC475F5210027479529644C3 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; + DEVELOPMENT_TEAM = L32Y3D8V83; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.example.fastNetworkNavigation.RunnerTests; @@ -395,10 +540,12 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = A565AAB9FE158487ABF3A5BF /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; + DEVELOPMENT_TEAM = L32Y3D8V83; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.example.fastNetworkNavigation.RunnerTests; @@ -410,10 +557,12 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 282EA28E78AB3F765E4BA719 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; + DEVELOPMENT_TEAM = L32Y3D8V83; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.example.fastNetworkNavigation.RunnerTests; @@ -447,6 +596,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -504,6 +654,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -540,18 +691,34 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 3; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = L32Y3D8V83; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = Any.Way; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.travel"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.fastNetworkNavigation; + MARKETING_VERSION = 1.0.0; + PRODUCT_BUNDLE_IDENTIFIER = info.anydev.anyway; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore info.anydev.anyway"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore info.anydev.anyway"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -562,17 +729,33 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 3; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = L32Y3D8V83; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = Any.Way; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.travel"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.fastNetworkNavigation; + MARKETING_VERSION = 1.0.0; + PRODUCT_BUNDLE_IDENTIFIER = info.anydev.anyway; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore info.anydev.anyway"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore info.anydev.anyway"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/frontend/ios/Runner.xcworkspace/contents.xcworkspacedata b/frontend/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/frontend/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/frontend/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/frontend/ios/Runner/AppDelegate.swift b/frontend/ios/Runner/AppDelegate.swift index 70693e4..b636303 100644 --- a/frontend/ios/Runner/AppDelegate.swift +++ b/frontend/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/frontend/ios/Runner/Info.plist b/frontend/ios/Runner/Info.plist index ef83866..3ac1912 100644 --- a/frontend/ios/Runner/Info.plist +++ b/frontend/ios/Runner/Info.plist @@ -2,6 +2,8 @@ + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -24,6 +26,8 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSupportsIndirectInputEvents + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,9 +45,5 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - diff --git a/frontend/ios/fastlane/Appfile b/frontend/ios/fastlane/Appfile new file mode 100644 index 0000000..2f8fca8 --- /dev/null +++ b/frontend/ios/fastlane/Appfile @@ -0,0 +1,8 @@ +app_identifier("info.anydev.testing") # The bundle identifier of your app +apple_id("me@moll.re") # Your Apple Developer Portal username + +itc_team_id("127439860") # App Store Connect Team ID +team_id("L32Y3D8V83") # Developer Portal Team ID + +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile new file mode 100644 index 0000000..3ee508b --- /dev/null +++ b/frontend/ios/fastlane/Fastfile @@ -0,0 +1,47 @@ + + +default_platform(:ios) + +platform :ios do + before_all do + load_asc_api_token + end + + desc "Load the App Store Connect API token" + lane :load_asc_api_token do + app_store_connect_api_key( + key_id: ENV["ASC_KEY_ID"], + issuer_id: ENV["ASC_ISSUER_ID"], + key_content: ENV["ASC_KEY_P8"], + is_key_content_base64: true, + in_house: false + ) + end + + desc "Push a new beta build to TestFlight" + lane :deploy_testing do + api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] + sync_code_signing( + api_key: api_key, + type: "appstore", + readonly: true, + ) + + sh( + "flutter", + "build", + "ipa", + "--release", + "--build-name=1.0.10", + "--build-number=4" + ) + # sign the app (whithout rebuilding it) + build_app( + skip_build_archive: true, + archive_path: "../build/ios/archive/Runner.xarchive" + ) + upload_to_testflight + end +end + + diff --git a/frontend/ios/fastlane/Matchfile b/frontend/ios/fastlane/Matchfile new file mode 100644 index 0000000..4fd95b4 --- /dev/null +++ b/frontend/ios/fastlane/Matchfile @@ -0,0 +1,8 @@ +git_url("ssh://git@git.kluster.moll.re:2222/anydev/anyway-app-secrets.git") + +storage_mode("git") + +type("appstore") # The default type, can be: appstore, adhoc, enterprise or development + +app_identifier(["info.anydev.anyway"]) +username("me@moll.re") # Your Apple Developer Portal username diff --git a/frontend/ios/fastlane/README.md b/frontend/ios/fastlane/README.md new file mode 100644 index 0000000..3c643db --- /dev/null +++ b/frontend/ios/fastlane/README.md @@ -0,0 +1,48 @@ +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 load_asc_api_token + +```sh +[bundle exec] fastlane ios load_asc_api_token +``` + +Load the App Store Connect API token + +### ios beta + +```sh +[bundle exec] fastlane ios beta +``` + +Push a new beta build to TestFlight + +### ios deploy_testing + +```sh +[bundle exec] fastlane ios deploy_testing +``` + + + +---- + +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/frontend/macos/Flutter/Flutter-Debug.xcconfig b/frontend/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b..4b81f9b 100644 --- a/frontend/macos/Flutter/Flutter-Debug.xcconfig +++ b/frontend/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/frontend/macos/Flutter/Flutter-Release.xcconfig b/frontend/macos/Flutter/Flutter-Release.xcconfig index c2efd0b..5caa9d1 100644 --- a/frontend/macos/Flutter/Flutter-Release.xcconfig +++ b/frontend/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/frontend/macos/Podfile b/frontend/macos/Podfile new file mode 100644 index 0000000..c795730 --- /dev/null +++ b/frontend/macos/Podfile @@ -0,0 +1,43 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end From 4a542a4a1f20e41ab711de48e8ff52ce6916abc1 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Fri, 13 Dec 2024 15:05:18 +0100 Subject: [PATCH 2/7] switch secrets to loading from env - towards a more unified way of handling secrets --- .../.github/workflows/build_app_android.yaml | 3 +- frontend/.github/workflows/build_app_ios.yaml | 53 +++++++++++++++++ frontend/android/app/build.gradle | 4 +- frontend/android/fastlane/Fastfile | 31 +++++----- frontend/ios/Runner/AppDelegate.swift | 4 ++ frontend/ios/fastlane/Fastfile | 59 ++++++++++++++++--- 6 files changed, 127 insertions(+), 27 deletions(-) create mode 100644 frontend/.github/workflows/build_app_ios.yaml diff --git a/frontend/.github/workflows/build_app_android.yaml b/frontend/.github/workflows/build_app_android.yaml index 515010c..3769cf5 100644 --- a/frontend/.github/workflows/build_app_android.yaml +++ b/frontend/.github/workflows/build_app_android.yaml @@ -51,8 +51,9 @@ jobs: working-directory: android - name: Run fastlane lane - run: bundle exec fastlane deploy_testing + run: bundle exec fastlane deploy_release working-directory: android env: BUILD_NUMBER: ${{ github.run_number }} # BUILD_NAME is implicitly available + GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} diff --git a/frontend/.github/workflows/build_app_ios.yaml b/frontend/.github/workflows/build_app_ios.yaml new file mode 100644 index 0000000..544ec74 --- /dev/null +++ b/frontend/.github/workflows/build_app_ios.yaml @@ -0,0 +1,53 @@ +on: + push: + tags: + - 'v*' + +jobs: + build: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up ruby env + uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.2.1 + bundler-cache: true + + - name: Install Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + flutter-version: 3.22.0 + cache: true + + - name: Infer version number from git tag + id: version + env: + REF_NAME: ${{ github.ref_name }} + run: + # remove the 'v' prefix from the tag name + echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV + + - name: Load secrets from github + run: | + echo "${{ secrets.IOS_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties + echo "${{ secrets.IOS_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json + echo "${{ secrets.IOS_KEYSTORE_BASE64 }}" | base64 -d > release.keystore + working-directory: ios + + - name: Install fastlane + run: bundle install + working-directory: ios + + - name: Run fastlane lane + run: bundle exec fastlane deploy_release + working-directory: ios + env: + BUILD_NUMBER: ${{ github.run_number }} + # BUILD_NAME is implicitly available + GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} + IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} + IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }} + IOS_ASC_KEY_P8: ${{ secrets.IOS_ASC_KEY_P8 }} diff --git a/frontend/android/app/build.gradle b/frontend/android/app/build.gradle index a01905d..0cd6cdd 100644 --- a/frontend/android/app/build.gradle +++ b/frontend/android/app/build.gradle @@ -65,7 +65,7 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.anydev.anyway" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. @@ -77,7 +77,7 @@ android { versionCode flutterVersionCode.toInteger() versionName flutterVersionName // // Placeholders of keys that are replaced by the build system. - manifestPlaceholders += ['MAPS_API_KEY': secretProperties.getProperty('MAPS_API_KEY')] + manifestPlaceholders += ['MAPS_API_KEY': System.getenv('GOOGLE_MAPS_API_KEY')] } diff --git a/frontend/android/fastlane/Fastfile b/frontend/android/fastlane/Fastfile index 5a22870..edaf308 100644 --- a/frontend/android/fastlane/Fastfile +++ b/frontend/android/fastlane/Fastfile @@ -1,11 +1,8 @@ -# Uncomment the line if you want fastlane to automatically update itself -# update_fastlane - default_platform(:android) platform :android do - desc "Deploy a new version to closed testing" + desc "Deploy a new version to closed testing (play store)" lane :deploy_testing do build_name = ENV["BUILD_NAME"] build_number = ENV["BUILD_NUMBER"] @@ -30,24 +27,26 @@ platform :android do ) end + desc "Deploy a new version as a full release" lane :deploy_release do - gradle( - task: "clean assembleRelease", - # todo update to a flutter call - properties: { - # loaded from environment - "android.injected.version.name" => ENV["VERSION_NAME"], - } + build_name = ENV["BUILD_NAME"] + build_number = ENV["BUILD_NUMBER"] + + sh( + "flutter", + "build", + "appbundle", + "--release", + "--build-name=#{build_name}", + "--build-number=#{build_number}", ) + upload_to_play_store( - track: "production", + track: 'production', skip_upload_apk: true, skip_upload_changelogs: true, aab: "../build/app/outputs/bundle/release/app-release.aab", - # this is the default output of flutter build ... --release - # in particular this the build folder lies in the flutter root folder - # this is the parent folder for the android folder - ) + ) end end diff --git a/frontend/ios/Runner/AppDelegate.swift b/frontend/ios/Runner/AppDelegate.swift index b636303..6896c5d 100644 --- a/frontend/ios/Runner/AppDelegate.swift +++ b/frontend/ios/Runner/AppDelegate.swift @@ -1,5 +1,6 @@ import UIKit import Flutter +import GoogleMaps @main @objc class AppDelegate: FlutterAppDelegate { @@ -7,6 +8,9 @@ import Flutter _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { + // load the key from env + let key = ProcessInfo.processInfo.environment["GOOGLE_MAPS_API_KEY"]! + GMSServices.provideAPI(key) GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index 3ee508b..ca7cbba 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -1,5 +1,3 @@ - - default_platform(:ios) platform :ios do @@ -10,16 +8,19 @@ platform :ios do desc "Load the App Store Connect API token" lane :load_asc_api_token do app_store_connect_api_key( - key_id: ENV["ASC_KEY_ID"], - issuer_id: ENV["ASC_ISSUER_ID"], - key_content: ENV["ASC_KEY_P8"], + key_id: ENV["IOS_ASC_KEY_ID"], + issuer_id: ENV["IOS_ASC_ISSUER_ID"], + key_content: ENV["IOS_ASC_KEY_P8"], is_key_content_base64: true, in_house: false ) end - desc "Push a new beta build to TestFlight" + desc "Deploy a new version to closed testing (testflight)" lane :deploy_testing do + build_name = ENV["BUILD_NAME"] + build_number = ENV["BUILD_NUMBER"] + api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] sync_code_signing( api_key: api_key, @@ -32,16 +33,58 @@ platform :ios do "build", "ipa", "--release", - "--build-name=1.0.10", - "--build-number=4" + "--build-name=#{build_name}", + "--build-number=#{build_number}", ) + # sign the app (whithout rebuilding it) build_app( skip_build_archive: true, archive_path: "../build/ios/archive/Runner.xarchive" ) + upload_to_testflight end + + + desc "Deploy a new version as a full release" + lane :deploy_release do + + build_name = ENV["BUILD_NAME"] + build_number = ENV["BUILD_NUMBER"] + + api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] + sync_code_signing( + api_key: api_key, + type: "appstore", + readonly: true, + ) + + sh( + "flutter", + "build", + "ipa", + "--release", + "--build-name=#{build_name}", + "--build-number=#{build_number}", + ) + + # sign the app (whithout rebuilding it) + build_app( + skip_build_archive: true, + archive_path: "../build/ios/archive/Runner.xarchive" + ) + + upload_to_app_store( + skip_screenshots: true, + skip_metadata: true, + skip_app_rating_config: true, + skip_app_review_information: true, + skip_submission: false, + # automatically submit the app for review + automatic_release: true, + # automatically release the app after review + ) end From cbada7e4a466c74b7a6282dcad49078a6433aa3b Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 14 Dec 2024 16:39:27 +0100 Subject: [PATCH 3/7] move secrets to hashicorp, don't use match (wip) --- .../.github/workflows/build_app_android.yaml | 22 ++++-- frontend/.github/workflows/build_app_ios.yaml | 25 ++++--- frontend/README.md | 21 +++--- frontend/android/README.md | 8 --- frontend/ios/fastlane/Fastfile | 70 ++++++++++++++++--- frontend/ios/local.env.sample | 10 +++ 6 files changed, 115 insertions(+), 41 deletions(-) create mode 100644 frontend/ios/local.env.sample diff --git a/frontend/.github/workflows/build_app_android.yaml b/frontend/.github/workflows/build_app_android.yaml index 3769cf5..9a5c35a 100644 --- a/frontend/.github/workflows/build_app_android.yaml +++ b/frontend/.github/workflows/build_app_android.yaml @@ -39,11 +39,23 @@ jobs: # remove the 'v' prefix from the tag name echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV - - name: Load secrets from github + - name: Load secrets + id: load-secrets + uses: hashicorp/vault-action@v3 + with: + url: https://api.hashicorp.com + token: ${{ secrets.VAULT_TOKEN }} + secrets: | + secret/release GOOGLE_MAPS_API_KEY | GOOGLE_MAPS_API_KEY ; + secret/release ANDROID_SECRET_PROPERTIES_BASE64 | ANDROID_SECRET_PROPERTIES_BASE64 ; + secret/release ANDROID_GOOGLE_PLAY_JSON_BASE64 | ANDROID_GOOGLE_PLAY_JSON_BASE64 ; + secret/release ANDROID_KEYSTORE_BASE64 | ANDROID_KEYSTORE_BASE64 ; + + - name: Put selected secrets into files run: | - echo "${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties - echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json - echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore + echo "${{ steps.load-secrets.outputs.ANDROID_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties + echo "${{ steps.load-secrets.outputs.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json + echo "${{ steps.load-secrets.outputs.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore working-directory: android - name: Install fastlane @@ -56,4 +68,4 @@ jobs: env: BUILD_NUMBER: ${{ github.run_number }} # BUILD_NAME is implicitly available - GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} + GOOGLE_MAPS_API_KEY: ${{ steps.load-secrets.outputs.GOOGLE_MAPS_API_KEY }} diff --git a/frontend/.github/workflows/build_app_ios.yaml b/frontend/.github/workflows/build_app_ios.yaml index 544ec74..d0ac83d 100644 --- a/frontend/.github/workflows/build_app_ios.yaml +++ b/frontend/.github/workflows/build_app_ios.yaml @@ -30,12 +30,17 @@ jobs: # remove the 'v' prefix from the tag name echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV - - name: Load secrets from github - run: | - echo "${{ secrets.IOS_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties - echo "${{ secrets.IOS_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json - echo "${{ secrets.IOS_KEYSTORE_BASE64 }}" | base64 -d > release.keystore - working-directory: ios + - name: Load secrets + id: load-secrets + uses: hashicorp/vault-action@v3 + with: + url: https://api.hashicorp.com + token: ${{ secrets.VAULT_TOKEN }} + secrets: | + secret/release GOOGLE_MAPS_API_KEY | GOOGLE_MAPS_API_KEY ; + secret/release IOS_ASC_KEY_ID | IOS_ASC_KEY_ID ; + secret/release IOS_ASC_ISSUER_ID | IOS_ASC_ISSUER_ID ; + secret/release IOS_ASC_KEY_P8 | IOS_ASC_KEY_P8 ; - name: Install fastlane run: bundle install @@ -47,7 +52,7 @@ jobs: env: BUILD_NUMBER: ${{ github.run_number }} # BUILD_NAME is implicitly available - GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} - IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} - IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }} - IOS_ASC_KEY_P8: ${{ secrets.IOS_ASC_KEY_P8 }} + GOOGLE_MAPS_API_KEY: ${{ steps.load-secrets.outputs.GOOGLE_MAPS_API_KEY }} + IOS_ASC_KEY_ID: ${{ GOOGLE_MAPS_API_KEY.IOS_ASC_KEY_ID }} + IOS_ASC_ISSUER_ID: ${{ GOOGLE_MAPS_API_KEY.IOS_ASC_ISSUER_ID }} + IOS_ASC_KEY_P8: ${{ GOOGLE_MAPS_API_KEY.IOS_ASC_KEY_P8 }} diff --git a/frontend/README.md b/frontend/README.md index ea008c1..954d60d 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -46,12 +46,17 @@ bundle exec fastlane ``` This is reused in the CI/CD pipeline to automate the deployment process. -Fastlane assumes mutliple secrets to be present as files in the platform directories. These are: -- for android: - - `secrets.properties` used by gradle to load secrets needed at execution time - - `release.keystore` used by gradle to sign the apk - - `google-key.json` used by fastlane to authenticate with the Google Play Store -- for ios: - - TODO +Secrets used by fastlane are stored on hashicorp vault and are fetched by the CI/CD pipeline. See below. -These files are stored as secrets in the GitHub repository so that the CI pipeline can access them. \ No newline at end of file +## Secrets +These are mostly used by the CI/CD pipeline to deploy the application. The main usage for github actions is documented under [https://github.com/hashicorp/vault-action](https://github.com/hashicorp/vault-action). +**Global secrets** are used for both versions of the app (android and ios). +- `GOOGLE_MAPS_API_KEY` is used to authenticate with the Google Maps API + +**Platform-specific secrets** are used by the CI/CD pipeline to deploy to the respective app stores. +- `ANDROID_KEYSTORE` is used to sign the android apk +- `ANDROID_GOOGLE_KEY` is used to authenticate with the Google Play Store api +- `IOS_GOOGLE_...` +- `IOS_GOOGLE_...` +- `IOS_GOOGLE_...` +- `IOS_GOOGLE_...` \ No newline at end of file diff --git a/frontend/android/README.md b/frontend/android/README.md index 3acd427..8271562 100644 --- a/frontend/android/README.md +++ b/frontend/android/README.md @@ -63,11 +63,3 @@ Compared to the flutter template application, a few changes have to be made: } ``` - -### Using the credentials in CI -- Add the secret files to the repository secrets (e.g. `ANDROID_SECRETS_PROPERTIES`). - -- temporarily write them back to files during the CI execution: - ```bash - echo {{ secrets.ANDROID_SECRETS }} >> android/secrets.properties - ``` diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index ca7cbba..6d3d041 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -1,10 +1,7 @@ default_platform(:ios) platform :ios do - before_all do - load_asc_api_token - end - + desc "Load the App Store Connect API token" lane :load_asc_api_token do app_store_connect_api_key( @@ -16,17 +13,66 @@ platform :ios do ) end + desc "Installs signing certificate in the keychain and downloads provisioning profiles from App Store Connect" + lane :prepare_signing do |options| + team_id = CredentialsManager::AppfileConfig.try_fetch_value(:team_id) + api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] + + keychain_name = "signing" + keychain_password = "temp" + + delete_keychain( + name: keychain_name + ) if File.exist? File.expand_path("~/Library/Keychains/#{keychain_name}-db") + + create_keychain( + name: keychain_name, + password: keychain_password, + default_keychain: true, + unlock: true, + timeout: 3600 + ) + + import_certificate( + certificate_path: ENV["SIGNING_KEY_FILE_PATH"], + certificate_password: ENV["SIGNING_KEY_PASSWORD"], + keychain_name: keychain_name, + keychain_password: keychain_password + ) + + # fetches and installs provisioning profiles from ASC + sigh( + adhoc: options[:adhoc], + api_key: api_key, + readonly: true + ) + end + + desc "Deploy a new version to closed testing (testflight)" lane :deploy_testing do build_name = ENV["BUILD_NAME"] build_number = ENV["BUILD_NUMBER"] - api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] - sync_code_signing( - api_key: api_key, - type: "appstore", - readonly: true, + app_identifier = CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) + + load_asc_api_token + prepare_signing + + profile_name = "App Provisioning Profile" # replace with the name of the profile to use for the build + output_name = "example-iOS" # specify the name of the .ipa file to generate + export_method = "app-store" # specify the export method + + # turn off automatic signing during build so correct code signing identity is guaranteed to be used + update_code_signing_settings( + use_automatic_signing: false, + targets: ["main-target"], # specify which targets to update code signing settings for + code_sign_identity: "Apple Distribution", # replace with name of code signing identity if different + bundle_identifier: app_identifier, + profile_name: profile_name, + build_configurations: ["Release"] # only toggle code signing settings for Release configurations ) + sh( "flutter", @@ -40,7 +86,11 @@ platform :ios do # sign the app (whithout rebuilding it) build_app( skip_build_archive: true, - archive_path: "../build/ios/archive/Runner.xarchive" + archive_path: "../build/ios/archive/Runner.xcarchive" + provisioningProfiles: { + app_identifier => profile_name + } + ) upload_to_testflight diff --git a/frontend/ios/local.env.sample b/frontend/ios/local.env.sample new file mode 100644 index 0000000..0a5698e --- /dev/null +++ b/frontend/ios/local.env.sample @@ -0,0 +1,10 @@ +# SAMPLE env file that replicates the env in the CI/CD pipeline +# DO NOT EDIT THIS FILE +# Copy this file to local.env and edit the values to match your local environment +IOS_ASC_KEY_ID="sample" +IOS_ASC_ISSUER_ID="sample" +IOS_ASC_KEY_P8="sample" +SIGNING_KEY_FILE_PATH="sample" +SIGNING_KEY_PASSWORD="sample" +BUILD_NAME="sample" +BUILD_NUMBER="sample" \ No newline at end of file From 7acfb841224df15c0c77291c74a1233909b1743c Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 14 Dec 2024 18:41:11 +0100 Subject: [PATCH 4/7] keep using match --- frontend/.github/workflows/build_app_ios.yaml | 15 ++-- frontend/ios/Runner/AppDelegate.swift | 2 +- frontend/ios/fastlane/Fastfile | 71 +++---------------- frontend/ios/{ => fastlane}/local.env.sample | 2 +- 4 files changed, 24 insertions(+), 66 deletions(-) rename frontend/ios/{ => fastlane}/local.env.sample (93%) diff --git a/frontend/.github/workflows/build_app_ios.yaml b/frontend/.github/workflows/build_app_ios.yaml index d0ac83d..e753b5c 100644 --- a/frontend/.github/workflows/build_app_ios.yaml +++ b/frontend/.github/workflows/build_app_ios.yaml @@ -40,7 +40,13 @@ jobs: secret/release GOOGLE_MAPS_API_KEY | GOOGLE_MAPS_API_KEY ; secret/release IOS_ASC_KEY_ID | IOS_ASC_KEY_ID ; secret/release IOS_ASC_ISSUER_ID | IOS_ASC_ISSUER_ID ; - secret/release IOS_ASC_KEY_P8 | IOS_ASC_KEY_P8 ; + secret/release IOS_ASC_KEY | IOS_ASC_KEY ; + secret/release IOS_MATCH_REPO_SSH_KEY_BASE64 | IOS_MATCH_REPO_SSH_KEY_BASE64 ; + + - name: Setup SSH key for match git repo + run: echo "$MATCH_REPO_SSH_KEY" | base64 --decode > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + env: + MATCH_REPO_SSH_KEY: ${{ steps.load-secrets.outputs.IOS_MATCH_REPO_SSH_KEY_BASE64 }} - name: Install fastlane run: bundle install @@ -53,6 +59,7 @@ jobs: BUILD_NUMBER: ${{ github.run_number }} # BUILD_NAME is implicitly available GOOGLE_MAPS_API_KEY: ${{ steps.load-secrets.outputs.GOOGLE_MAPS_API_KEY }} - IOS_ASC_KEY_ID: ${{ GOOGLE_MAPS_API_KEY.IOS_ASC_KEY_ID }} - IOS_ASC_ISSUER_ID: ${{ GOOGLE_MAPS_API_KEY.IOS_ASC_ISSUER_ID }} - IOS_ASC_KEY_P8: ${{ GOOGLE_MAPS_API_KEY.IOS_ASC_KEY_P8 }} + IOS_ASC_KEY_ID: ${{ steps.load-secrets.outputs.IOS_ASC_KEY_ID }} + IOS_ASC_ISSUER_ID: ${{ steps.load-secrets.outputs.IOS_ASC_ISSUER_ID }} + IOS_ASC_KEY: ${{ steps.load-secrets.outputs.IOS_ASC_KEY }} + MATCH_PASSWORD: ${{ steps.load-secrets.outputs.IOS_MATCH_PASSWORD }} diff --git a/frontend/ios/Runner/AppDelegate.swift b/frontend/ios/Runner/AppDelegate.swift index 6896c5d..675b021 100644 --- a/frontend/ios/Runner/AppDelegate.swift +++ b/frontend/ios/Runner/AppDelegate.swift @@ -10,7 +10,7 @@ import GoogleMaps ) -> Bool { // load the key from env let key = ProcessInfo.processInfo.environment["GOOGLE_MAPS_API_KEY"]! - GMSServices.provideAPI(key) + GMSServices.provideAPIKey(key) GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index 6d3d041..f1c8b14 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -7,72 +7,27 @@ platform :ios do app_store_connect_api_key( key_id: ENV["IOS_ASC_KEY_ID"], issuer_id: ENV["IOS_ASC_ISSUER_ID"], - key_content: ENV["IOS_ASC_KEY_P8"], + key_content: ENV["IOS_ASC_KEY"], is_key_content_base64: true, in_house: false ) end - desc "Installs signing certificate in the keychain and downloads provisioning profiles from App Store Connect" - lane :prepare_signing do |options| - team_id = CredentialsManager::AppfileConfig.try_fetch_value(:team_id) - api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] - - keychain_name = "signing" - keychain_password = "temp" - - delete_keychain( - name: keychain_name - ) if File.exist? File.expand_path("~/Library/Keychains/#{keychain_name}-db") - - create_keychain( - name: keychain_name, - password: keychain_password, - default_keychain: true, - unlock: true, - timeout: 3600 - ) - - import_certificate( - certificate_path: ENV["SIGNING_KEY_FILE_PATH"], - certificate_password: ENV["SIGNING_KEY_PASSWORD"], - keychain_name: keychain_name, - keychain_password: keychain_password - ) - - # fetches and installs provisioning profiles from ASC - sigh( - adhoc: options[:adhoc], - api_key: api_key, - readonly: true - ) - end - desc "Deploy a new version to closed testing (testflight)" lane :deploy_testing do build_name = ENV["BUILD_NAME"] build_number = ENV["BUILD_NUMBER"] - - app_identifier = CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) load_asc_api_token - prepare_signing + api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] - profile_name = "App Provisioning Profile" # replace with the name of the profile to use for the build - output_name = "example-iOS" # specify the name of the .ipa file to generate - export_method = "app-store" # specify the export method - - # turn off automatic signing during build so correct code signing identity is guaranteed to be used - update_code_signing_settings( - use_automatic_signing: false, - targets: ["main-target"], # specify which targets to update code signing settings for - code_sign_identity: "Apple Distribution", # replace with name of code signing identity if different - bundle_identifier: app_identifier, - profile_name: profile_name, - build_configurations: ["Release"] # only toggle code signing settings for Release configurations + sync_code_signing( + api_key: api_key, + type: "appstore", + readonly: true, ) - + sh( "flutter", @@ -87,10 +42,6 @@ platform :ios do build_app( skip_build_archive: true, archive_path: "../build/ios/archive/Runner.xcarchive" - provisioningProfiles: { - app_identifier => profile_name - } - ) upload_to_testflight @@ -99,11 +50,12 @@ platform :ios do desc "Deploy a new version as a full release" lane :deploy_release do - build_name = ENV["BUILD_NAME"] build_number = ENV["BUILD_NUMBER"] - + + load_asc_api_token api_key = lane_context[SharedValues::APP_STORE_CONNECT_API_KEY] + sync_code_signing( api_key: api_key, type: "appstore", @@ -135,6 +87,5 @@ platform :ios do automatic_release: true, # automatically release the app after review ) + end end - - diff --git a/frontend/ios/local.env.sample b/frontend/ios/fastlane/local.env.sample similarity index 93% rename from frontend/ios/local.env.sample rename to frontend/ios/fastlane/local.env.sample index 0a5698e..4c7e9ba 100644 --- a/frontend/ios/local.env.sample +++ b/frontend/ios/fastlane/local.env.sample @@ -2,8 +2,8 @@ # DO NOT EDIT THIS FILE # Copy this file to local.env and edit the values to match your local environment IOS_ASC_KEY_ID="sample" +IOS_ASC_KEY="sample" IOS_ASC_ISSUER_ID="sample" -IOS_ASC_KEY_P8="sample" SIGNING_KEY_FILE_PATH="sample" SIGNING_KEY_PASSWORD="sample" BUILD_NAME="sample" From a4a70d56c63c3f8aab9c6331eb9e15ccadc99934 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 14 Dec 2024 19:48:08 +0100 Subject: [PATCH 5/7] fastlane fixes --- frontend/ios/Runner/Info.plist | 6 +++++- frontend/ios/fastlane/{local.env.sample => .env.sample} | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) rename frontend/ios/fastlane/{local.env.sample => .env.sample} (85%) diff --git a/frontend/ios/Runner/Info.plist b/frontend/ios/Runner/Info.plist index 3ac1912..36e4fd5 100644 --- a/frontend/ios/Runner/Info.plist +++ b/frontend/ios/Runner/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Fast Network Navigation + anyway CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -45,5 +45,9 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + NSLocationAlwaysAndWhenInUseUsageDescription + $(PRODUCT_NAME) optionally uses your location to plan trips directly from your current location. + NSLocationWhenInUseUsageDescription + $(PRODUCT_NAME) optionally uses your location to plan trips directly from your current location. diff --git a/frontend/ios/fastlane/local.env.sample b/frontend/ios/fastlane/.env.sample similarity index 85% rename from frontend/ios/fastlane/local.env.sample rename to frontend/ios/fastlane/.env.sample index 4c7e9ba..82595b4 100644 --- a/frontend/ios/fastlane/local.env.sample +++ b/frontend/ios/fastlane/.env.sample @@ -1,10 +1,13 @@ # SAMPLE env file that replicates the env in the CI/CD pipeline # DO NOT EDIT THIS FILE # Copy this file to local.env and edit the values to match your local environment +BUILD_NAME="sample" +BUILD_NUMBER="sample" + IOS_ASC_KEY_ID="sample" IOS_ASC_KEY="sample" IOS_ASC_ISSUER_ID="sample" SIGNING_KEY_FILE_PATH="sample" SIGNING_KEY_PASSWORD="sample" -BUILD_NAME="sample" -BUILD_NUMBER="sample" \ No newline at end of file + +GOOGLE_MAPS_API_KEY="sample" From 97cb5b16aa78ab3ce2660dc6dbd448806d41144f Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 14 Dec 2024 19:54:28 +0100 Subject: [PATCH 6/7] some more fastlane fixes --- frontend/ios/fastlane/Fastfile | 2 +- frontend/ios/fastlane/README.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index f1c8b14..43a1ba4 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -74,7 +74,7 @@ platform :ios do # sign the app (whithout rebuilding it) build_app( skip_build_archive: true, - archive_path: "../build/ios/archive/Runner.xarchive" + archive_path: "../build/ios/archive/Runner.xcarchive" ) upload_to_app_store( diff --git a/frontend/ios/fastlane/README.md b/frontend/ios/fastlane/README.md index 3c643db..a114bc7 100644 --- a/frontend/ios/fastlane/README.md +++ b/frontend/ios/fastlane/README.md @@ -23,21 +23,21 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do Load the App Store Connect API token -### ios beta - -```sh -[bundle exec] fastlane ios beta -``` - -Push a new beta build to TestFlight - ### ios deploy_testing ```sh [bundle exec] fastlane ios deploy_testing ``` +Deploy a new version to closed testing (testflight) +### ios deploy_release + +```sh +[bundle exec] fastlane ios deploy_release +``` + +Deploy a new version as a full release ---- From 9326cf8a7497b7b8f7e87f2ae4d4e302484bd8c6 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 14 Dec 2024 21:47:41 +0100 Subject: [PATCH 7/7] final fixes for an inital test --- frontend/ios/Podfile | 15 +++++++++++++++ frontend/ios/Runner/Info.plist | 29 +++++++++++++++++++++++++++++ frontend/ios/fastlane/Fastfile | 7 +++---- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/frontend/ios/Podfile b/frontend/ios/Podfile index d97f17e..0268c6e 100644 --- a/frontend/ios/Podfile +++ b/frontend/ios/Podfile @@ -40,5 +40,20 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + + target.build_configurations.each do |config| + # You can remove unused permissions here + # for more information: https://github.com/BaseflowIT/flutter-permission-handler/blob/master/permission_handler/ios/Classes/PermissionHandlerEnums.h + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ + '$(inherited)', + ## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If + ## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE` + ## macro. + ## + ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse] + 'PERMISSION_LOCATION=1', + 'PERMISSION_LOCATION_WHENINUSE=0', + ] + end end end diff --git a/frontend/ios/Runner/Info.plist b/frontend/ios/Runner/Info.plist index 36e4fd5..f16592b 100644 --- a/frontend/ios/Runner/Info.plist +++ b/frontend/ios/Runner/Info.plist @@ -49,5 +49,34 @@ $(PRODUCT_NAME) optionally uses your location to plan trips directly from your current location. NSLocationWhenInUseUsageDescription $(PRODUCT_NAME) optionally uses your location to plan trips directly from your current location. + LSApplicationQueriesSchemes + + + comgooglemaps + baidumap + iosamap + waze + yandexmaps + yandexnavi + citymapper + mapswithme + osmandmaps + dgis + qqmap + here-location + tomtomgo + copilot + com.sygic.aura + nmap + kakaomap + tmap + szn-mapy + mappls + + http + https + + ITSAppUsesNonExemptEncryption + diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index 43a1ba4..80fd68b 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -80,10 +80,9 @@ platform :ios do upload_to_app_store( skip_screenshots: true, skip_metadata: true, - skip_app_rating_config: true, - skip_app_review_information: true, - skip_submission: false, - # automatically submit the app for review + precheck_include_in_app_purchases: false, + + submit_for_review: true, automatic_release: true, # automatically release the app after review )