diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ba16726b..d62d0493a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -157,6 +157,7 @@ jobs: needs: [cache-submodule] runs-on: ubuntu-24.04 + if: ${{ false }} # XXX: Flutter 3.24 --windows steps: - uses: actions/checkout@v4 - run: env/setup.sh diff --git a/app-android/build.gradle b/app-android/build.gradle index 815af5140..dca865345 100644 --- a/app-android/build.gradle +++ b/app-android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.8.0' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -30,12 +30,12 @@ apply plugin: 'kotlin-android' def flutter = files(orcFlutter) android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId orcUnique minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode orcMonotonic.toInteger() - 946684800 versionName orcVersion manifestPlaceholders = [orcUnique: orcUnique, orcName: orcName] diff --git a/app-flutter.mk b/app-flutter.mk index b2e0b096a..1c4b30acc 100644 --- a/app-flutter.mk +++ b/app-flutter.mk @@ -27,13 +27,18 @@ $(call include,shared/target-all.mk) $(foreach fork,$(forks),$(shell ln -sf $(patsubst %/pubspec.yaml,%,$(fork)) >/dev/null)) +sed := $(shell which gsed sed | head -n1) + .PHONY: create create: $(pwd/flutter)/packages/flutter/pubspec.lock $(flutter) create -i objc -a java --no-pub --project-name orchid . $(flutter) pub get - sed -ie 's/flutter\.compileSdkVersion/33/g;s/flutter.minSdkVersion/21/g' android/app/build.gradle - sed -ie "/^platform :osx/{s/,.*/, '10.15'/g;}" macos/Podfile - sed -ie "/MACOSX_DEPLOYMENT_TARGET =/{s/=.*/= 10.15;/g;}" macos/Runner.xcodeproj/project.pbxproj + $(sed) -ie 's/flutter\.compileSdkVersion/34/g;s/flutter.minSdkVersion/21/g' android/app/build.gradle + $(sed) -ie '0,/subprojects {/s//\0 afterEvaluate { android { compileSdkVersion 34 } }/' android/build.gradle + $(sed) -ie '/org\.jetbrains\.kotlin\.android/s/\(version "\)[^"]*/\11.8.0/' android/settings.gradle + $(sed) -ie "/^# platform :ios/{s/^# //;}" ios/Podfile + $(sed) -ie "/^platform :osx/{s/,.*/, '10.15'/;}" macos/Podfile + $(sed) -ie "/MACOSX_DEPLOYMENT_TARGET =/{s/=.*/= 10.15;/g;}" macos/Runner.xcodeproj/project.pbxproj builds := builds += apk diff --git a/app-ios/makefile b/app-ios/makefile index 7bb13ba3a..7e13e662b 100644 --- a/app-ios/makefile +++ b/app-ios/makefile @@ -68,7 +68,11 @@ $(call include,shared/target-ios.mk) local := local += app.mm.o -local += $(subst %,.,$(word 1,$(generated))).o +temp := $(subst %,.,$(word 1,$(generated))) +local += $(temp).o + +$(call depend,$(temp).o,$(output)/XCBuildData/build.db) +cflags/$(temp) += -fmodules $(patsubst %,-fmodule-map-file=%,$(wildcard $(output)/Release-$(sdk)/*/*.modulemap)) -Wno-ignored-attributes include env/output.mk @@ -139,7 +143,7 @@ $(bundle)/Assets.car: $(wildcard Assets.xcassets/*/*) @mkdir -p $(output)/info # XXX: --launch-image LaunchImage actool --output-format human-readable-text --errors --warnings --notices \ - --target-device iphone --target-device ipad --minimum-deployment-target 11.0 \ + --target-device iphone --target-device ipad --minimum-deployment-target 12.0 \ --platform iphoneos \ --app-icon AppIcon \ --compress-pngs \ diff --git a/app-shared/ios/Podfile b/app-shared/ios/Podfile index a9bc11ace..760fd4c74 100644 --- a/app-shared/ios/Podfile +++ b/app-shared/ios/Podfile @@ -2,7 +2,7 @@ install! 'cocoapods', :integrate_targets => false # Uncomment this line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/app-shared/target-all.mk b/app-shared/target-all.mk index 5ddee4f60..57c853a53 100644 --- a/app-shared/target-all.mk +++ b/app-shared/target-all.mk @@ -26,13 +26,17 @@ flutter := $(CURDIR)/$(pwd/flutter)/bin/flutter --suppress-analytics --verbose - # -a is needed as flutter (incorrectly) only installs files for windows *target* on windows *host* # https://github.com/flutter/flutter/issues/58379 -precache := --android --ios --linux --macos --windows -a + +# XXX: ugh. now I had to disable all the windows support due to Failed to download https://storage.googleapis.com/flutter_infra_release/flutter/b8800d88be4866db1b15f8b954ab2573bba9960f/windows-arm64/artifacts.zip. Ensure you have network connectivity and then try again. Exception: 404 +# I actually think I can get them to fix this, as this breaks precache -a even without --windows and even without --enable-windows-desktop + +precache := --android --ios --linux --macos #--windows $(pwd/flutter)/packages/flutter/pubspec.lock: $(pwd/flutter)/packages/flutter/pubspec.yaml $(call head,$(pwd/flutter)) cd $(pwd/flutter) && git clean -fxd cd $(pwd/flutter) && bin/flutter config --enable-linux-desktop cd $(pwd/flutter) && bin/flutter config --enable-macos-desktop - cd $(pwd/flutter) && bin/flutter config --enable-windows-desktop + #cd $(pwd/flutter) && bin/flutter config --enable-windows-desktop cd $(pwd/flutter) && bin/flutter precache $(precache) cd $(pwd/flutter) && bin/flutter update-packages diff --git a/app-shared/target-and.mk b/app-shared/target-and.mk index e290e1383..d6fd50076 100644 --- a/app-shared/target-and.mk +++ b/app-shared/target-and.mk @@ -20,13 +20,13 @@ assemble := android platform := android +capped := Android generated := $(pwd/gui)/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant%java include $(pwd)/target-all.mk jni := armeabi-v7a arm64-v8a -#jnis := $(subst $(space),$(comma),$(foreach arch,$(jni),android-$(flutter/$(arch)))) assembled := $(output)/flutter/flutter_assets/AssetManifest%json $(if $(filter noaot,$(debug)),,$(foreach arch,$(jni),$(output)/flutter/$(arch)/app%so)) $(assembled): $(dart) @@ -35,6 +35,7 @@ $(assembled): $(dart) -dTargetPlatform="$(platform)" \ -dTargetFile="lib/main.dart" \ -dBuildMode="$(mode)" \ + -d$(capped)Archs="$(foreach arch,$(jni),$(flutter/$(arch)))" \ -dTreeShakeIcons="true" \ -dTrackWidgetCreation="true" \ --output="$(CURDIR)/$(output)/flutter" \ diff --git a/app-shared/target-apl.mk b/app-shared/target-apl.mk index 9b60cf153..ce236c0a0 100644 --- a/app-shared/target-apl.mk +++ b/app-shared/target-apl.mk @@ -37,13 +37,8 @@ endif codesign += && touch $(3) -ifeq ($(target),mac) -cflags += -F$(engine) -lflags += -F$(engine) -else cflags += -F$(engine)/$(framework).xcframework/$(xcframework) lflags += -F$(engine)/$(framework).xcframework/$(xcframework) -endif app := $(bundle)$(contents)/Frameworks/App.framework embed := $(bundle)$(contents)/Frameworks/$(framework).framework diff --git a/env/lnx-arch.sh b/env/lnx-arch.sh index dfcab72c4..9b62eb387 100755 --- a/env/lnx-arch.sh +++ b/env/lnx-arch.sh @@ -3,7 +3,7 @@ set -e pacman -Sy \ ubuntu-keyring \ - bc tcl vim \ + bc sed tcl vim \ curl git rsync wget \ fakeroot talloc \ cpio rpm-tools unzip zstd \ diff --git a/env/lnx-ubuntu.sh b/env/lnx-ubuntu.sh index f61e45ddd..2f8cc063b 100755 --- a/env/lnx-ubuntu.sh +++ b/env/lnx-ubuntu.sh @@ -6,7 +6,7 @@ apt-get update apt-get -y install \ ubuntu-keyring \ - bc tcl xxd \ + bc sed tcl xxd \ curl git-core rsync wget \ fakeroot libtalloc-dev \ cpio rpm unzip zstd \ diff --git a/env/setup-mac.sh b/env/setup-mac.sh index 9de388998..6ee678936 100755 --- a/env/setup-mac.sh +++ b/env/setup-mac.sh @@ -4,6 +4,7 @@ which brew &>/dev/null || /bin/bash -c "$(curl -fsSL https://raw.githubuserconte # XXX: duplicate linux setup as much as possible brew install \ + gnu-sed \ fakeroot \ rpm2cpio zstd \ binutils \ diff --git a/env/setup-ndk.sh b/env/setup-ndk.sh index 1fd7e9bee..0fd0f4eb7 100755 --- a/env/setup-ndk.sh +++ b/env/setup-ndk.sh @@ -1,4 +1,4 @@ #!/bin/bash set -e set -o pipefail -echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-33" >/dev/null +echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-34" >/dev/null diff --git a/env/target-apl.mk b/env/target-apl.mk index 835988d5f..e6429cffa 100644 --- a/env/target-apl.mk +++ b/env/target-apl.mk @@ -28,9 +28,6 @@ signature := /_CodeSignature/CodeResources isysroot := $(shell xcrun --sdk $(sdk) --show-sdk-path) more += -isysroot $(isysroot) -ifneq ($(sdk),macosx) -more += -idirafter $(shell xcrun --sdk macosx --show-sdk-path)/usr/include -endif define _ more/$(1) := -arch $(1) diff --git a/env/target-mac.mk b/env/target-mac.mk index 497a28212..3cb411664 100644 --- a/env/target-mac.mk +++ b/env/target-mac.mk @@ -39,6 +39,8 @@ runtime := osx more := -mmacosx-version-min=10.15 include $(pwd)/target-apl.mk +xcframework := macos-arm64_x86_64 + contents := /Contents resources := /Resources versions := /Versions/A diff --git a/gui-orchid/ios/Podfile.lock b/gui-orchid/ios/Podfile.lock index 28c4da638..f9404d698 100644 --- a/gui-orchid/ios/Podfile.lock +++ b/gui-orchid/ios/Podfile.lock @@ -2,74 +2,70 @@ PODS: - Flutter (1.0.0) - flutter_js (0.1.0): - Flutter - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) - - GoogleDataTransport (9.2.0): + - FMDB (2.7.12): + - FMDB/standard (= 2.7.12) + - FMDB/Core (2.7.12) + - FMDB/standard (2.7.12): + - FMDB/Core + - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleMLKit/BarcodeScanning (3.2.0): + - GoogleMLKit/BarcodeScanning (6.0.0): - GoogleMLKit/MLKitCore - - MLKitBarcodeScanning (~> 2.2.0) - - GoogleMLKit/MLKitCore (3.2.0): - - MLKitCommon (~> 8.0.0) - - GoogleToolboxForMac/DebugUtils (2.3.2): - - GoogleToolboxForMac/Defines (= 2.3.2) - - GoogleToolboxForMac/Defines (2.3.2) - - GoogleToolboxForMac/Logger (2.3.2): - - GoogleToolboxForMac/Defines (= 2.3.2) - - "GoogleToolboxForMac/NSData+zlib (2.3.2)": - - GoogleToolboxForMac/Defines (= 2.3.2) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)": - - GoogleToolboxForMac/DebugUtils (= 2.3.2) - - GoogleToolboxForMac/Defines (= 2.3.2) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)" - - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)" - - GoogleUtilities/Environment (7.10.0): + - MLKitBarcodeScanning (~> 5.0.0) + - GoogleMLKit/MLKitCore (6.0.0): + - MLKitCommon (~> 11.0.0) + - GoogleToolboxForMac/Defines (4.2.1) + - GoogleToolboxForMac/Logger (4.2.1): + - GoogleToolboxForMac/Defines (= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (4.2.1)": + - GoogleToolboxForMac/Defines (= 4.2.1) + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.10.0): + - GoogleUtilities/Logger (7.13.3): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (7.10.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/UserDefaults (7.13.3): - GoogleUtilities/Logger + - GoogleUtilities/Privacy - GoogleUtilitiesComponents (1.1.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.7.2) + - GTMSessionFetcher/Core (3.5.0) - in_app_purchase_storekit (0.0.1): - Flutter - FlutterMacOS - - MLImage (1.0.0-beta3) - - MLKitBarcodeScanning (2.2.0): - - MLKitCommon (~> 8.0) - - MLKitVision (~> 4.2) - - MLKitCommon (8.0.0): - - GoogleDataTransport (~> 9.0) - - GoogleToolboxForMac/Logger (~> 2.1) - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - - GoogleUtilities/UserDefaults (~> 7.0) + - MLImage (1.0.0-beta5) + - MLKitBarcodeScanning (5.0.0): + - MLKitCommon (~> 11.0) + - MLKitVision (~> 7.0) + - MLKitCommon (11.0.0): + - GoogleDataTransport (< 10.0, >= 9.4.1) + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0) - GoogleUtilitiesComponents (~> 1.0) - - GTMSessionFetcher/Core (~> 1.1) - - Protobuf (~> 3.12) - - MLKitVision (4.2.0): - - GoogleToolboxForMac/Logger (~> 2.1) - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - GTMSessionFetcher/Core (~> 1.1) - - MLImage (= 1.0.0-beta3) - - MLKitCommon (~> 8.0) - - Protobuf (~> 3.12) - - mobile_scanner (3.0.0): + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLKitVision (7.0.0): + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLImage (= 1.0.0-beta5) + - MLKitCommon (~> 11.0) + - mobile_scanner (5.2.1): - Flutter - - GoogleMLKit/BarcodeScanning (~> 3.2.0) - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) - - PromisesObjC (2.1.1) - - Protobuf (3.21.12) - - shared_preferences_ios (0.0.1): + - GoogleMLKit/BarcodeScanning (~> 6.0.0) + - nanopb (2.30910.0): + - nanopb/decode (= 2.30910.0) + - nanopb/encode (= 2.30910.0) + - nanopb/decode (2.30910.0) + - nanopb/encode (2.30910.0) + - PromisesObjC (2.4.0) + - shared_preferences_foundation (0.0.1): - Flutter + - FlutterMacOS - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) @@ -81,7 +77,7 @@ DEPENDENCIES: - flutter_js (from `.symlinks/plugins/flutter_js/ios`) - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`) - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) @@ -100,7 +96,6 @@ SPEC REPOS: - MLKitVision - nanopb - PromisesObjC - - Protobuf EXTERNAL SOURCES: Flutter: @@ -111,36 +106,35 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/in_app_purchase_storekit/darwin" mobile_scanner: :path: ".symlinks/plugins/mobile_scanner/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_js: 95929d4e146e8ceb1c8e1889d8c2065c5d840076 - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleMLKit: 0017a6a8372e1a182139b9def4d89be5d87ca5a7 - GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 - GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 + FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6 + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065 + GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe - GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 in_app_purchase_storekit: 6b297e2b5eab9fa3251a492d57301722e4132a71 - MLImage: 489dfec109f21da8621b28d476401aaf7a0d4ff4 - MLKitBarcodeScanning: d92fe1911001ec36870162c5a0eb206f612b7169 - MLKitCommon: f6da6c5659618c070b50a80db01248ebe2964175 - MLKitVision: 96c96571190b7f63eddf4a12068ce8a8689e0d2c - mobile_scanner: 004f7ad2fe4e2b5a3e6ed0bc4b83ca9c5b5dd975 - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - Protobuf: 120350fc38646e2dedc26f49ecba778184ea1de2 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + MLImage: 1824212150da33ef225fbd3dc49f184cf611046c + MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b + MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1 + MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1 + mobile_scanner: 131a34df36b024cc53457809fb991700f16f72d7 + nanopb: 438bc412db1928dac798aa6fd75726007be04262 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef -PODFILE CHECKSUM: 21e78760fee629465f00ee6e1b0ca78764f69ff7 +PODFILE CHECKSUM: 7f1e4acaf8036ffd17b53cc1bccdd9d11d323dbd COCOAPODS: 1.15.2 diff --git a/gui-orchid/macos/Podfile.lock b/gui-orchid/macos/Podfile.lock index 14f277bb7..846b7ca9b 100644 --- a/gui-orchid/macos/Podfile.lock +++ b/gui-orchid/macos/Podfile.lock @@ -2,15 +2,18 @@ PODS: - flutter_js (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) + - FMDB (2.7.12): + - FMDB/standard (= 2.7.12) + - FMDB/Core (2.7.12) + - FMDB/standard (2.7.12): + - FMDB/Core - in_app_purchase_storekit (0.0.1): - Flutter - FlutterMacOS - - mobile_scanner (3.0.0): + - mobile_scanner (5.2.1): - FlutterMacOS - - shared_preferences_macos (0.0.1): + - shared_preferences_foundation (0.0.1): + - Flutter - FlutterMacOS - sqflite (0.0.2): - FlutterMacOS @@ -25,7 +28,7 @@ DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) - in_app_purchase_storekit (from `Flutter/ephemeral/.symlinks/plugins/in_app_purchase_storekit/darwin`) - mobile_scanner (from `Flutter/ephemeral/.symlinks/plugins/mobile_scanner/macos`) - - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - window_size (from `Flutter/ephemeral/.symlinks/plugins/window_size/macos`) @@ -43,8 +46,8 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/in_app_purchase_storekit/darwin mobile_scanner: :path: Flutter/ephemeral/.symlinks/plugins/mobile_scanner/macos - shared_preferences_macos: - :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin sqflite: :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos url_launcher_macos: @@ -55,10 +58,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: flutter_js: c664361655af1d8fc24e278c7d086e9cbe0d68bc FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a + FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6 in_app_purchase_storekit: 6b297e2b5eab9fa3251a492d57301722e4132a71 - mobile_scanner: 9c643c89604da4c76917f7bd37266fcdd48bda75 - shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 + mobile_scanner: 4d1f08373cb0321594c81c7709aa460c17b8b84f + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4 window_size: 339dafa0b27a95a62a843042038fa6c3c48de195 diff --git a/gui-orchid/pubspec.lock b/gui-orchid/pubspec.lock index ceef1d2fb..9b1fff511 100644 --- a/gui-orchid/pubspec.lock +++ b/gui-orchid/pubspec.lock @@ -69,18 +69,18 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.5" csslib: dependency: transitive description: name: csslib - sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" url: "https://pub.dev" source: hosted - version: "0.17.2" + version: "0.17.3" cupertino_icons: dependency: "direct main" description: @@ -141,18 +141,18 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" fixnum: dependency: "direct main" description: @@ -241,18 +241,18 @@ packages: dependency: "direct main" description: name: in_app_purchase_android - sha256: a43295532f8d9fba4dfa46c110073a6ac43413903426bddeeb81580c021df154 + sha256: "25eb8694819caca282a527c26d5a1775164965c554ee99b9c10f3a0e44675c75" url: "https://pub.dev" source: hosted - version: "0.2.3+7" + version: "0.3.6+8" in_app_purchase_platform_interface: dependency: transitive description: name: in_app_purchase_platform_interface - sha256: d20d37a3cb513a647a570bfcae7ca0ec2038dab6258f58926ddc926a859a03d0 + sha256: "1d353d38251da5b9fea6635c0ebfc6bb17a2d28d0e86ea5e083bf64244f1fb4c" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" in_app_purchase_storekit: dependency: "direct main" description: @@ -281,18 +281,18 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: transitive description: name: json_annotation - sha256: "3520fa844009431b5d4491a5a778603520cdc399ab3406332dcc50f93547258c" + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.9.0" json_rpc_2: dependency: transitive description: @@ -401,26 +401,26 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.3.0" pedantic: dependency: "direct dev" description: @@ -441,18 +441,18 @@ packages: dependency: transitive description: name: petitparser - sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -469,14 +469,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.7.3" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" - source: hosted - version: "4.2.4" provider: dependency: "direct main" description: @@ -537,10 +529,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974 + sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" shared_preferences_foundation: dependency: transitive description: @@ -606,10 +598,10 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "0c21a187d645aa65da5be6997c0c713eed61e049158870ae2de157e6897067ab" + sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e" url: "https://pub.dev" source: hosted - version: "2.4.0+2" + version: "2.5.4+2" stack_trace: dependency: transitive description: @@ -662,10 +654,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "7b530acd9cb7c71b0019a1e7fa22c4105e675557a4400b6a401c71c5e0ade1ac" + sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255 url: "https://pub.dev" source: hosted - version: "3.0.0+3" + version: "3.2.0" term_glyph: dependency: transitive description: @@ -686,10 +678,10 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" url_launcher: dependency: "direct main" description: @@ -718,18 +710,18 @@ packages: dependency: transitive description: name: url_launcher_platform_interface - sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "5669882643b96bb6d5786637cac727c6e918a790053b09245fd4513b8a07df2a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.3.3" url_launcher_windows: dependency: transitive description: @@ -766,10 +758,10 @@ packages: dependency: transitive description: name: wallet - sha256: "569c91c2af13a9e1119c001f9c09218eccf3f383eb8d15ba13a5b558010c1bc0" + sha256: "687fd89a16557649b26189e597792962f405797fc64113e8758eabc2c2605c32" url: "https://pub.dev" source: hosted - version: "0.0.12+1" + version: "0.0.13" web: dependency: transitive description: @@ -786,14 +778,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.7.1" - win32: - dependency: transitive - description: - name: win32 - sha256: ca121dbbadb3e43b449053feab0cdf3f2bff93b107cacf0290e3d29f717374b6 - url: "https://pub.dev" - source: hosted - version: "3.1.2" window_size: dependency: "direct main" description: @@ -805,10 +789,10 @@ packages: dependency: transitive description: name: xdg_directories - sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "0.2.0+2" + version: "1.0.4" xml: dependency: transitive description: @@ -821,10 +805,10 @@ packages: dependency: transitive description: name: xmlstream - sha256: "2d10c69a9d5fc46f71798b80ee6db15bc0d5bf560fdbdd264776cbeee0c83631" + sha256: cfc14e3f256997897df9481ae630d94c2d85ada5187ebeb868bb1aabc2c977b4 url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/vpn-apple/source/tunnel.cpp b/vpn-apple/source/tunnel.cpp index 0bc10d470..2a20b04c6 100644 --- a/vpn-apple/source/tunnel.cpp +++ b/vpn-apple/source/tunnel.cpp @@ -20,6 +20,7 @@ /* }}} */ +// the order of these headers matters :/ #include #include #include diff --git a/vpn-apple/source/tunnel.mm b/vpn-apple/source/tunnel.mm index 3ee7cd31d..81f1a73ae 100644 --- a/vpn-apple/source/tunnel.mm +++ b/vpn-apple/source/tunnel.mm @@ -20,10 +20,8 @@ /* }}} */ -// the order of these headers matters :/ -#include -#include -#include +#define SYSPROTO_CONTROL 2 +#define UTUN_OPT_IFNAME 2 #include diff --git a/vpn-apple/target.mk b/vpn-apple/target.mk index d8d8237ec..0899139d0 100644 --- a/vpn-apple/target.mk +++ b/vpn-apple/target.mk @@ -23,7 +23,13 @@ lflags += -framework SystemConfiguration cflags += -I$(pwd)/source -source += $(wildcard $(pwd)/source/*.cpp) +ifneq ($(target),ios) +# XXX: this works on iOS, but requires MacOSX.sdk and is useless +source += $(pwd)/source/tunnel.cpp +endif + +source += $(pwd)/source/protect.cpp + source += $(wildcard $(pwd)/source/*.mm) # XXX: this will be fixed with the Capture refactor