diff --git a/.gitignore b/.gitignore index 73b48f62..713a0f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ .history .svn/ migrate_working_dir/ - +.github/ # IntelliJ related *.iml *.ipr diff --git a/Makefile b/Makefile index 6371a1aa..9725433c 100644 --- a/Makefile +++ b/Makefile @@ -33,21 +33,18 @@ translate: dart run slang prepare: get-geo-assets get gen translate - @echo "Select a platform:" - @echo "1. Android" - @echo "2. Windows" - @echo "3. Linux" - @echo "4. macOS" - @echo "5. iOS" - @read -p "Enter your choice (1 to 5): " choice; \ - case $$choice in \ - 1) make android-libs ;; \ - 2) make windows-libs ;; \ - 3) make linux-libs ;; \ - 4) make macos-libs ;; \ - 5) make ios-libs ;; \ - *) echo "Invalid choice. Please select 1 to 5." ;; \ - esac + @echo "Available platforms:" + @echo "android" + @echo "windows" + @echo "linux" + @echo "macos" + @echo "ios" + if [ -z "$$platform" ]; then \ + read -p "run make prepare platform=ios or Enter platform name: " choice; \ + else \ + choice=$$platform; \ + fi; \ + make $$choice-libs sync_translate: cd .github && bash sync_translate.sh @@ -96,6 +93,7 @@ macos-libs: ios-libs: #not tested mkdir -p $(DESKTOP_OUT)/ &&\ + rm -rf $(IOS_OUT)/libcore.xcframework curl -L $(CORE_URL)/$(CORE_NAME)-ios.xcframework.tar.gz | tar xz -C "$(IOS_OUT)" && \ mv $(IOS_OUT)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/libcore.xcframework @@ -141,3 +139,64 @@ release: # Create a new tag for release. git tag v$${TAG} && \ git push -u origin HEAD --tags && \ echo "Github Actions will detect the new tag and release the new version."' + + + +ios-temp-preapre: + flutter upgrade + flutter pub upgrade + make prepare platform=ios + flutter build ios-framework + cd ios + pod install + cd .. + flutter run + #Link the built App and Flutter and url_launcher_ios frameworks (or all created frameworks? i dunno, but i tried) from Release folder to Xcode project in Runner target’s Build Phases as Linked + + #change ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES to $(inherited) + + #also add $(inherited) as 1st option to OTHER_LDFLAGS (Other Linker Flags) + + + #add $(PROJECT_DIR)/Flutter/$(CONFIGURATION) to framework search path as 2nd + + #in Runner target go to Build Phases in Copy Bundle Resources section remove Runner.app + + # right click on Runner.xcodeproj click on Show Package Content open project.pbxproj replace + #Flutter/Release/App.xcframework + #Flutter/Release/Flutter.xcframework + # Flutter/Release/url_launcher_ios.xcframework + # with + # "Flutter/$(CONFIGURATION)/App.xcframework" + # "Flutter/$(CONFIGURATION)/Flutter.xcframework" + # "Flutter/$(CONFIGURATION)/url_launcher_ios.xcframework" + # (if you added all frameworks, you should do this pattern for all of them too, you need this step to be able to run on simulators) + + # done remove # GeneratedPluginRegistrant.h # GeneratedPluginRegistrant.m # from Runner folder and add newly generated ones from build/ios/framework folder to Xcode and also check the copy box + + # done in pod file # remove comment from line 2 and change it to # platform :ios, '12.1' # and add + + # target.build_configurations.each do |config| + # config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.1' + # end + + # before 1st ‘end’ in post_install function + + # add + # -fcxx-modules + # to + # OTHER_CPLUSPLUSFLAGS + # in Build Settings + # as 1st option + + # flutter upgrade + # flutter pub upgrade + # cd ios + # pod install + + # (note: i removed group and network extensions from targets to be able to build with free account) + + # now build + # it will build (even on simulator) + # but for some not known reason, it will not run for me on my device and will refuse to install on simulator, maybe because the removed extensions? i dunno + # even now it can be an arsehole and return failed with exit code 1 so don’t panic \ No newline at end of file diff --git a/ios/Flutter/GeneratedPluginRegistrant.h b/ios/Flutter/GeneratedPluginRegistrant.h new file mode 100644 index 00000000..7a890927 --- /dev/null +++ b/ios/Flutter/GeneratedPluginRegistrant.h @@ -0,0 +1,19 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GeneratedPluginRegistrant_h +#define GeneratedPluginRegistrant_h + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface GeneratedPluginRegistrant : NSObject ++ (void)registerWithRegistry:(NSObject*)registry; +@end + +NS_ASSUME_NONNULL_END +#endif /* GeneratedPluginRegistrant_h */ diff --git a/ios/Flutter/GeneratedPluginRegistrant.m b/ios/Flutter/GeneratedPluginRegistrant.m new file mode 100644 index 00000000..22922cf4 --- /dev/null +++ b/ios/Flutter/GeneratedPluginRegistrant.m @@ -0,0 +1,91 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#import "GeneratedPluginRegistrant.h" + +#if __has_include() +#import +#else +@import device_info_plus; +#endif + +#if __has_include() +#import +#else +@import flutter_native_splash; +#endif + +#if __has_include() +#import +#else +@import mobile_scanner; +#endif + +#if __has_include() +#import +#else +@import package_info_plus; +#endif + +#if __has_include() +#import +#else +@import path_provider_foundation; +#endif + +#if __has_include() +#import +#else +@import protocol_handler; +#endif + +#if __has_include() +#import +#else +@import sentry_flutter; +#endif + +#if __has_include() +#import +#else +@import share_plus; +#endif + +#if __has_include() +#import +#else +@import shared_preferences_foundation; +#endif + +#if __has_include() +#import +#else +@import sqlite3_flutter_libs; +#endif + +#if __has_include() +#import +#else +@import url_launcher_ios; +#endif + +@implementation GeneratedPluginRegistrant + ++ (void)registerWithRegistry:(NSObject*)registry { + [FPPDeviceInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FPPDeviceInfoPlusPlugin"]]; + [FlutterNativeSplashPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterNativeSplashPlugin"]]; + [MobileScannerPlugin registerWithRegistrar:[registry registrarForPlugin:@"MobileScannerPlugin"]]; + [FPPPackageInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FPPPackageInfoPlusPlugin"]]; + [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]]; + [ProtocolHandlerPlugin registerWithRegistrar:[registry registrarForPlugin:@"ProtocolHandlerPlugin"]]; + [SentryFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"SentryFlutterPlugin"]]; + [FPPSharePlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FPPSharePlusPlugin"]]; + [SharedPreferencesPlugin registerWithRegistrar:[registry registrarForPlugin:@"SharedPreferencesPlugin"]]; + [Sqlite3FlutterLibsPlugin registerWithRegistrar:[registry registrarForPlugin:@"Sqlite3FlutterLibsPlugin"]]; + [URLLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"URLLauncherPlugin"]]; +} + +@end diff --git a/ios/Podfile b/ios/Podfile index 5077d452..4101b32e 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -43,5 +43,6 @@ post_install do |installer| target.build_configurations.each do |config| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.1' end + end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6656ca7c..10a8f9c8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -191,6 +191,6 @@ SPEC CHECKSUMS: sqlite3_flutter_libs: eb769059df0356dc52ddda040f09cacc9391a7cf url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b -PODFILE CHECKSUM: ad11258062fcee2e36d764a219a6e2ba2e313895 +PODFILE CHECKSUM: 0a796698f92b6e2c1ad01bb762b3f256a9f7a366 COCOAPODS: 1.14.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a31d1cf4..2fa16f4e 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ 07A63ACE2B1E94BB00CAFA4D /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A872B1E72C800CAFA4D /* Flutter.xcframework */; }; 07A63ACF2B1E94C100CAFA4D /* App.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A842B1E72AE00CAFA4D /* App.xcframework */; }; 07A63AD52B1E961E00CAFA4D /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A63AD42B1E961E00CAFA4D /* GeneratedPluginRegistrant.m */; }; + 07CF3A582B1F43FE009AEF3F /* url_launcher_ios.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A902B1E72FB00CAFA4D /* url_launcher_ios.xcframework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 54EA599BF9C050F2827533D5 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA50BDF2E5E5DDA3995F24D /* Pods_RunnerTests.framework */; }; @@ -147,33 +148,33 @@ 03E392D12ADDF1F4000ADF15 /* ExtensionPlatformInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionPlatformInterface.swift; sourceTree = ""; }; 03E392D32ADDF262000ADF15 /* Extension+RunBlocking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Extension+RunBlocking.swift"; sourceTree = ""; }; 075637B22B0157CB005AFB8E /* libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcore.xcframework; path = ../libcore/bin/libcore.xcframework; sourceTree = ""; }; - 07A63A832B1E728C00CAFA4D /* Release */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Release; path = ../Flutter/Release; sourceTree = ""; }; - 07A63A842B1E72AE00CAFA4D /* App.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = App.xcframework; path = ../Flutter/Release/App.xcframework; sourceTree = ""; }; - 07A63A872B1E72C800CAFA4D /* Flutter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Flutter.xcframework; path = ../Flutter/Release/Flutter.xcframework; sourceTree = ""; }; - 07A63A8C2B1E72FA00CAFA4D /* GTMSessionFetcher.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GTMSessionFetcher.xcframework; path = ../Flutter/Release/GTMSessionFetcher.xcframework; sourceTree = ""; }; - 07A63A8D2B1E72FB00CAFA4D /* package_info_plus.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = package_info_plus.xcframework; path = ../Flutter/Release/package_info_plus.xcframework; sourceTree = ""; }; - 07A63A8E2B1E72FB00CAFA4D /* SentryPrivate.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SentryPrivate.xcframework; path = ../Flutter/Release/SentryPrivate.xcframework; sourceTree = ""; }; - 07A63A8F2B1E72FB00CAFA4D /* share_plus.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = share_plus.xcframework; path = ../Flutter/Release/share_plus.xcframework; sourceTree = ""; }; - 07A63A902B1E72FB00CAFA4D /* url_launcher_ios.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = url_launcher_ios.xcframework; path = ../Flutter/Release/url_launcher_ios.xcframework; sourceTree = ""; }; - 07A63A912B1E72FB00CAFA4D /* mobile_scanner.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mobile_scanner.xcframework; path = ../Flutter/Release/mobile_scanner.xcframework; sourceTree = ""; }; - 07A63A922B1E72FB00CAFA4D /* sqlite3_flutter_libs.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = sqlite3_flutter_libs.xcframework; path = ../Flutter/Release/sqlite3_flutter_libs.xcframework; sourceTree = ""; }; - 07A63A932B1E72FB00CAFA4D /* cupertino_http.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = cupertino_http.xcframework; path = ../Flutter/Release/cupertino_http.xcframework; sourceTree = ""; }; - 07A63A942B1E72FB00CAFA4D /* flutter_native_splash.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = flutter_native_splash.xcframework; path = ../Flutter/Release/flutter_native_splash.xcframework; sourceTree = ""; }; - 07A63A952B1E72FB00CAFA4D /* FBLPromises.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBLPromises.xcframework; path = ../Flutter/Release/FBLPromises.xcframework; sourceTree = ""; }; - 07A63A962B1E72FB00CAFA4D /* GoogleUtilities.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleUtilities.xcframework; path = ../Flutter/Release/GoogleUtilities.xcframework; sourceTree = ""; }; - 07A63A972B1E72FB00CAFA4D /* device_info_plus.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = device_info_plus.xcframework; path = ../Flutter/Release/device_info_plus.xcframework; sourceTree = ""; }; - 07A63A982B1E72FB00CAFA4D /* GoogleDataTransport.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleDataTransport.xcframework; path = ../Flutter/Release/GoogleDataTransport.xcframework; sourceTree = ""; }; - 07A63A992B1E72FB00CAFA4D /* sentry_flutter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = sentry_flutter.xcframework; path = ../Flutter/Release/sentry_flutter.xcframework; sourceTree = ""; }; - 07A63A9A2B1E72FB00CAFA4D /* protocol_handler.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = protocol_handler.xcframework; path = ../Flutter/Release/protocol_handler.xcframework; sourceTree = ""; }; - 07A63A9B2B1E72FC00CAFA4D /* sqlite3.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = sqlite3.xcframework; path = ../Flutter/Release/sqlite3.xcframework; sourceTree = ""; }; - 07A63A9C2B1E72FC00CAFA4D /* GoogleToolboxForMac.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleToolboxForMac.xcframework; path = ../Flutter/Release/GoogleToolboxForMac.xcframework; sourceTree = ""; }; - 07A63A9D2B1E72FC00CAFA4D /* GoogleUtilitiesComponents.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleUtilitiesComponents.xcframework; path = ../Flutter/Release/GoogleUtilitiesComponents.xcframework; sourceTree = ""; }; - 07A63A9E2B1E72FC00CAFA4D /* nanopb.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = nanopb.xcframework; path = ../Flutter/Release/nanopb.xcframework; sourceTree = ""; }; - 07A63A9F2B1E72FC00CAFA4D /* path_provider_foundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = path_provider_foundation.xcframework; path = ../Flutter/Release/path_provider_foundation.xcframework; sourceTree = ""; }; - 07A63AA02B1E72FC00CAFA4D /* shared_preferences_foundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = shared_preferences_foundation.xcframework; path = ../Flutter/Release/shared_preferences_foundation.xcframework; sourceTree = ""; }; - 07A63AA12B1E72FC00CAFA4D /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../Flutter/Release/Sentry.xcframework; sourceTree = ""; }; - 07A63AD32B1E961E00CAFA4D /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeneratedPluginRegistrant.h; path = ../../Flutter/GeneratedPluginRegistrant.h; sourceTree = ""; }; - 07A63AD42B1E961E00CAFA4D /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GeneratedPluginRegistrant.m; path = ../../Flutter/GeneratedPluginRegistrant.m; sourceTree = ""; }; + 07A63A832B1E728C00CAFA4D /* Release */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Release; path = ../build/ios/framework/release; sourceTree = ""; }; + 07A63A842B1E72AE00CAFA4D /* App.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = App.xcframework; path = ../build/ios/framework/release/App.xcframework; sourceTree = ""; }; + 07A63A872B1E72C800CAFA4D /* Flutter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Flutter.xcframework; path = ../build/ios/framework/release/Flutter.xcframework; sourceTree = ""; }; + 07A63A8C2B1E72FA00CAFA4D /* GTMSessionFetcher.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GTMSessionFetcher.xcframework; path = ../build/ios/framework/release/GTMSessionFetcher.xcframework; sourceTree = ""; }; + 07A63A8D2B1E72FB00CAFA4D /* package_info_plus.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = package_info_plus.xcframework; path = ../build/ios/framework/release/package_info_plus.xcframework; sourceTree = ""; }; + 07A63A8E2B1E72FB00CAFA4D /* SentryPrivate.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SentryPrivate.xcframework; path = ../build/ios/framework/release/SentryPrivate.xcframework; sourceTree = ""; }; + 07A63A8F2B1E72FB00CAFA4D /* share_plus.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = share_plus.xcframework; path = ../build/ios/framework/release/share_plus.xcframework; sourceTree = ""; }; + 07A63A902B1E72FB00CAFA4D /* url_launcher_ios.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = url_launcher_ios.xcframework; path = ../build/ios/framework/release/url_launcher_ios.xcframework; sourceTree = ""; }; + 07A63A912B1E72FB00CAFA4D /* mobile_scanner.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mobile_scanner.xcframework; path = ../build/ios/framework/release/mobile_scanner.xcframework; sourceTree = ""; }; + 07A63A922B1E72FB00CAFA4D /* sqlite3_flutter_libs.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = sqlite3_flutter_libs.xcframework; path = ../build/ios/framework/release/sqlite3_flutter_libs.xcframework; sourceTree = ""; }; + 07A63A932B1E72FB00CAFA4D /* cupertino_http.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = cupertino_http.xcframework; path = ../build/ios/framework/release/cupertino_http.xcframework; sourceTree = ""; }; + 07A63A942B1E72FB00CAFA4D /* flutter_native_splash.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = flutter_native_splash.xcframework; path = ../build/ios/framework/release/flutter_native_splash.xcframework; sourceTree = ""; }; + 07A63A952B1E72FB00CAFA4D /* FBLPromises.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBLPromises.xcframework; path = ../build/ios/framework/release/FBLPromises.xcframework; sourceTree = ""; }; + 07A63A962B1E72FB00CAFA4D /* GoogleUtilities.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleUtilities.xcframework; path = ../build/ios/framework/release/GoogleUtilities.xcframework; sourceTree = ""; }; + 07A63A972B1E72FB00CAFA4D /* device_info_plus.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = device_info_plus.xcframework; path = ../build/ios/framework/release/device_info_plus.xcframework; sourceTree = ""; }; + 07A63A982B1E72FB00CAFA4D /* GoogleDataTransport.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleDataTransport.xcframework; path = ../build/ios/framework/release/GoogleDataTransport.xcframework; sourceTree = ""; }; + 07A63A992B1E72FB00CAFA4D /* sentry_flutter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = sentry_flutter.xcframework; path = ../build/ios/framework/release/sentry_flutter.xcframework; sourceTree = ""; }; + 07A63A9A2B1E72FB00CAFA4D /* protocol_handler.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = protocol_handler.xcframework; path = ../build/ios/framework/release/protocol_handler.xcframework; sourceTree = ""; }; + 07A63A9B2B1E72FC00CAFA4D /* sqlite3.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = sqlite3.xcframework; path = ../build/ios/framework/release/sqlite3.xcframework; sourceTree = ""; }; + 07A63A9C2B1E72FC00CAFA4D /* GoogleToolboxForMac.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleToolboxForMac.xcframework; path = ../build/ios/framework/release/GoogleToolboxForMac.xcframework; sourceTree = ""; }; + 07A63A9D2B1E72FC00CAFA4D /* GoogleUtilitiesComponents.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleUtilitiesComponents.xcframework; path = ../build/ios/framework/release/GoogleUtilitiesComponents.xcframework; sourceTree = ""; }; + 07A63A9E2B1E72FC00CAFA4D /* nanopb.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = nanopb.xcframework; path = ../build/ios/framework/release/nanopb.xcframework; sourceTree = ""; }; + 07A63A9F2B1E72FC00CAFA4D /* path_provider_foundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = path_provider_foundation.xcframework; path = ../build/ios/framework/release/path_provider_foundation.xcframework; sourceTree = ""; }; + 07A63AA02B1E72FC00CAFA4D /* shared_preferences_foundation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = shared_preferences_foundation.xcframework; path = ../build/ios/framework/release/shared_preferences_foundation.xcframework; sourceTree = ""; }; + 07A63AA12B1E72FC00CAFA4D /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../build/ios/framework/release/Sentry.xcframework; sourceTree = ""; }; + 07A63AD32B1E961E00CAFA4D /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeneratedPluginRegistrant.h; path = ../../build/ios/framework/GeneratedPluginRegistrant.h; sourceTree = ""; }; + 07A63AD42B1E961E00CAFA4D /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GeneratedPluginRegistrant.m; path = ../../build/ios/framework/GeneratedPluginRegistrant.m; sourceTree = ""; }; 0F7E04B7207513677AF77112 /* 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 = ""; }; 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; }; @@ -222,6 +223,7 @@ files = ( 07A63ACF2B1E94C100CAFA4D /* App.xcframework in Frameworks */, 07A63ACE2B1E94BB00CAFA4D /* Flutter.xcframework in Frameworks */, + 07CF3A582B1F43FE009AEF3F /* url_launcher_ios.xcframework in Frameworks */, 075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */, 075637B82B015836005AFB8E /* libcore.xcframework in Frameworks */, ); @@ -920,16 +922,25 @@ ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/build/ios/framework/$(CONFIGURATION)", + "$(PROJECT_DIR)/../build/ios/framework/$(CONFIGURATION)", "$(SDKROOT)/usr/lib/swift", "$(TOOLCHAIN_DIR)/usr/lib/swift-5.5/$(PLATFORM_NAME)", - "$(inherited)", "@executable_path/Frameworks", "@executable_path/../libcore/", "@executable_path/libcore", - "$(PROJECT_DIR)/Flutter/Release/", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_CPLUSPLUSFLAGS = ( + "-fcxx-modules", + "$(OTHER_CFLAGS)", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-lresolv", + ); PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = hiddify; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -1108,16 +1119,25 @@ ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/build/ios/framework/$(CONFIGURATION)", + "$(PROJECT_DIR)/../build/ios/framework/$(CONFIGURATION)", "$(SDKROOT)/usr/lib/swift", "$(TOOLCHAIN_DIR)/usr/lib/swift-5.5/$(PLATFORM_NAME)", - "$(inherited)", "@executable_path/Frameworks", "@executable_path/../libcore/", "@executable_path/libcore", - "$(PROJECT_DIR)/Flutter/Release/", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_CPLUSPLUSFLAGS = ( + "-fcxx-modules", + "$(OTHER_CFLAGS)", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-lresolv", + ); PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = hiddify; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1140,16 +1160,25 @@ ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/build/ios/framework/$(CONFIGURATION)", + "$(PROJECT_DIR)/../build/ios/framework/$(CONFIGURATION)", "$(SDKROOT)/usr/lib/swift", "$(TOOLCHAIN_DIR)/usr/lib/swift-5.5/$(PLATFORM_NAME)", - "$(inherited)", "@executable_path/Frameworks", "@executable_path/../libcore/", "@executable_path/libcore", - "$(PROJECT_DIR)/Flutter/Release/", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_CPLUSPLUSFLAGS = ( + "-fcxx-modules", + "$(OTHER_CFLAGS)", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-lresolv", + ); PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = hiddify; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 719cfd28..1854596d 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -4,6 +4,8 @@ BASE_BUNDLE_IDENTIFIER $(BASE_BUNDLE_IDENTIFIER) + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -24,12 +26,21 @@ ???? CFBundleVersion $(FLUTTER_BUILD_NUMBER) + EXAppExtensionAttributes + + EXExtensionPointIdentifier + com.apple.appintents-extension + LSRequiresIPhoneOS + UIApplicationSupportsIndirectInputEvents + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile Main + UIStatusBarHidden + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -45,16 +56,5 @@ UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - UIStatusBarHidden - - EXAppExtensionAttributes - - EXExtensionPointIdentifier - com.apple.appintents-extension -