diff --git a/.metadata b/.metadata index 4dbbfa65..bf837a00 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2" + revision: "ef1af02aead6fe2414f3aafa5a61087b610e1332" channel: "stable" project_type: app @@ -13,11 +13,23 @@ project_type: app migration: platforms: - platform: root - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + base_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + - platform: android + create_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + base_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + - platform: ios + create_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + base_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + - platform: linux + create_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + base_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 - platform: macos - create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + create_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + base_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + - platform: windows + create_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 + base_revision: ef1af02aead6fe2414f3aafa5a61087b610e1332 # User provided section diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 49f45a86..0d140800 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - App - CFBundleIdentifier - ios.flutter.hiddify - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 15.0 + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 15.0 diff --git a/ios/Flutter/GeneratedPluginRegistrant.h b/ios/Flutter/GeneratedPluginRegistrant.h deleted file mode 100644 index 7a890927..00000000 --- a/ios/Flutter/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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 deleted file mode 100644 index 22922cf4..00000000 --- a/ios/Flutter/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// 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 fdd227f1..c461cbd0 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -35,42 +35,13 @@ target 'Runner' do target 'RunnerTests' do inherit! :search_paths end - # target 'SingBoxPacketTunnel' do - # pod 'Libcore', :path => './Frameworks/Libcore.xcframework' - # end - end -# post_install do |installer| -# installer.pods_project.targets.each do |target| -# flutter_additional_ios_build_settings(target) -# target.build_configurations.each do |config| -# config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.1' -# end - -# end -# end - - - -$iOSVersion = '12.1' # or newer version - post_install do |installer| - # add these lines: - installer.pods_project.build_configurations.each do |config| - config.build_settings["EXCLUDED_ARCHS[sdk=*]"] = "armv7" - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion - end - installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) - - # add these lines: target.build_configurations.each do |config| - if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']) - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion - end + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0' end - end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d8cdad9c..53982629 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -164,7 +164,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: cupertino_http: 5f8b1161107fe6c8d94a0c618735a033d93fa7db device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e @@ -191,6 +191,6 @@ SPEC CHECKSUMS: sqlite3_flutter_libs: eb769059df0356dc52ddda040f09cacc9391a7cf url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b -PODFILE CHECKSUM: cd697eec09ee2160e86276804e14441912c6eafa +PODFILE CHECKSUM: be4663332fca77601dd6736e3676fe47177084e1 COCOAPODS: 1.14.3