diff --git a/Makefile b/Makefile index fef8b9065..c53efdf46 100644 --- a/Makefile +++ b/Makefile @@ -451,11 +451,9 @@ set-version: #ios: macos build-framework ffigen ios-release:require-version set-version guard-SENTRY_AUTH_TOKEN guard-SENTRY_ORG guard-SENTRY_PROJECT_IOS - @echo "Flutter Clean" flutter clean - @echo "Flutter pub get" flutter pub get - @echo "Creating the Flutter iOS build..." + @echo "Creating the Flutter iOS build.set-version guard-SENTRY_AUTH_TOKEN guard-SENTRY_ORG guard-SENTRY_PROJECT_IOS.." flutter build ipa --flavor prod --release --export-options-plist ./ExportOptions.plist @echo "Uploading debug symbols to Sentry..." export SENTRY_LOG_LEVEL=info @@ -696,18 +694,19 @@ sourcedump: require-version ios: assert-go-version install-gomobile @echo "Nuking $(INTERNALSDK_FRAMEWORK_DIR) and $(MINISQL_FRAMEWORK_DIR)" - rm -Rf $(INTERNALSDK_FRAMEWORK_DIR) $(MINISQL_FRAMEWORK_DIR) - @echo "generating Ios.xcFramework" - go env -w 'GOPRIVATE=github.com/getlantern/*' && \ + @rm -Rf $(INTERNALSDK_FRAMEWORK_DIR) $(MINISQL_FRAMEWORK_DIR) + @echo "Generating Ios.xcFramework" + @go env -w 'GOPRIVATE=github.com/getlantern/*' && \ gomobile init && \ gomobile bind -target=ios,iossimulator \ -tags='headless lantern ios netgo' \ -ldflags="$(LDFLAGS)" \ $(GOMOBILE_EXTRA_BUILD_FLAGS) \ github.com/getlantern/lantern-client/internalsdk github.com/getlantern/pathdb/testsupport github.com/getlantern/pathdb/minisql github.com/getlantern/lantern-client/internalsdk/ios - @echo "moving framework" - mkdir -p $(INTERNALSDK_FRAMEWORK_DIR) - mv ./$(INTERNALSDK_FRAMEWORK_NAME) $(INTERNALSDK_FRAMEWORK_DIR)/$(INTERNALSDK_FRAMEWORK_NAME) + @echo "Moving framework" + @mkdir -p $(INTERNALSDK_FRAMEWORK_DIR) + @mv ./$(INTERNALSDK_FRAMEWORK_NAME) $(INTERNALSDK_FRAMEWORK_DIR)/$(INTERNALSDK_FRAMEWORK_NAME) + @echo "Framework generated" build-release-framework: assert-go-version install-gomobile @echo "Nuking $(INTERNALSDK_FRAMEWORK_DIR) and $(MINISQL_FRAMEWORK_DIR)" diff --git a/ios/Podfile b/ios/Podfile index 0f4447593..8c5fbdc33 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -34,8 +34,6 @@ target 'Runner' do use_frameworks! :linkage => :static use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) -# pod 'SQLite.swift', '~> 0.12.2' - pod 'Toast-Swift', '~> 5.0.1' end # target 'LanternTests' do diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6f8e66480..f51915c6b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -130,7 +130,6 @@ PODS: - FlutterMacOS - SwiftyGif (5.4.5) - Toast (4.1.1) - - Toast-Swift (5.0.1) - url_launcher_ios (0.0.1): - Flutter - video_player_avfoundation (0.0.1): @@ -169,7 +168,6 @@ DEPENDENCIES: - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - - Toast-Swift (~> 5.0.1) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`) @@ -191,7 +189,6 @@ SPEC REPOS: - Sentry - SwiftyGif - Toast - - Toast-Swift EXTERNAL SOURCES: app_links: @@ -293,12 +290,11 @@ SPEC CHECKSUMS: sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e - Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711 url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1 webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4 -PODFILE CHECKSUM: edbeaea3b499feb7b2b276309b09c237de1a6cff +PODFILE CHECKSUM: 6238d8bf7027250fc945a92754c7db627d57de25 COCOAPODS: 1.16.2 diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 90027e713..727705d2b 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,7 +1,6 @@ import Flutter import Internalsdk import SQLite -import Toast_Swift import UIKit //know Issue