From 12a763f2545c96805f0882afa4255d068568b284 Mon Sep 17 00:00:00 2001 From: Valdas Petrulis Date: Wed, 20 Nov 2024 17:43:52 +0200 Subject: [PATCH 1/3] Start using FVM --- .fvmrc | 3 +++ .gitignore | 3 +++ .vscode/settings.json | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .fvmrc diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..e150426 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.24.1" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4f47785..4972d7f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ doc/api/ *.js.map .DS_Store + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index fbc10d6..847b7ee 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,9 @@ { "dart.lineLength": 150, "[dart]": { - "editor.rulers": [150] + "editor.rulers": [ + 150 + ] }, "files.insertFinalNewline": true, "files.associations": { @@ -81,5 +83,6 @@ "*.rh": "cpp" }, "C_Cpp.clang_format_fallbackStyle": "Google", - "C_Cpp.clang_format_path": "" -} + "C_Cpp.clang_format_path": "", + "dart.flutterSdkPath": ".fvm/versions/3.24.1" +} \ No newline at end of file From a3f79410498a9a8d78a3832199e3c9f5df40bdd9 Mon Sep 17 00:00:00 2001 From: Valdas Petrulis Date: Wed, 20 Nov 2024 17:53:09 +0200 Subject: [PATCH 2/3] Bump WireGuardKit to 0.5 --- darwin/wireguard_dart.podspec | 2 +- example/ios/Podfile | 2 +- example/ios/Podfile.lock | 17 ++++++++--------- example/macos/Podfile | 2 +- example/macos/Podfile.lock | 14 +++++++------- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/darwin/wireguard_dart.podspec b/darwin/wireguard_dart.podspec index ba76476..325fd19 100644 --- a/darwin/wireguard_dart.podspec +++ b/darwin/wireguard_dart.podspec @@ -26,6 +26,6 @@ Wireguard Dart SDK for iOS/macOS s.ios.deployment_target = "15.0" s.osx.deployment_target = "12.0" - s.dependency "WireGuardKit", "0.4" + s.dependency "WireGuardKit", "0.5" end diff --git a/example/ios/Podfile b/example/ios/Podfile index 08409af..aac6b3f 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -31,7 +31,7 @@ target "Runner" do use_frameworks! use_modular_headers! - pod 'WireGuardKit', :podspec => "https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.4/WireGuardKit.podspec" + pod 'WireGuardKit', :podspec => "https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.5/WireGuardKit.podspec" flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f7f39fd..dbaa2b4 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -3,28 +3,27 @@ PODS: - wireguard_dart (0.0.1): - Flutter - FlutterMacOS - - WireGuardKit (= 0.3) - - WireGuardKit (0.3) + - WireGuardKit (= 0.5) + - WireGuardKit (0.5) DEPENDENCIES: - Flutter (from `Flutter`) - wireguard_dart (from `.symlinks/plugins/wireguard_dart/darwin`) - -SPEC REPOS: - trunk: - - WireGuardKit + - WireGuardKit (from `https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.5/WireGuardKit.podspec`) EXTERNAL SOURCES: Flutter: :path: Flutter wireguard_dart: :path: ".symlinks/plugins/wireguard_dart/darwin" + WireGuardKit: + :podspec: https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.5/WireGuardKit.podspec SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - wireguard_dart: e9f4586e6433f14a16864e80abbdb63239e1aa12 - WireGuardKit: 8b9e7f28441b67aafe60d59c15b8c70bed5ab092 + wireguard_dart: c6c27bbc1469f9aa1f7984b64ce3aaf04136417b + WireGuardKit: 44063ed405613ca3d234e489e24b015d434e2a64 -PODFILE CHECKSUM: ade4dc95c753c461e86203a02270c4756b4c2b1a +PODFILE CHECKSUM: 39ed9aba611a165fd92b53f222039fec886c475b COCOAPODS: 1.15.2 diff --git a/example/macos/Podfile b/example/macos/Podfile index fd342c2..d658641 100644 --- a/example/macos/Podfile +++ b/example/macos/Podfile @@ -30,7 +30,7 @@ target "Runner" do use_frameworks! use_modular_headers! - pod 'WireGuardKit', :podspec => "https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.4/WireGuardKit.podspec" + pod 'WireGuardKit', :podspec => "https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.5/WireGuardKit.podspec" flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) end diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 6c4fd2c..47d8d14 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -3,13 +3,13 @@ PODS: - wireguard_dart (0.0.1): - Flutter - FlutterMacOS - - WireGuardKit (= 0.4) - - WireGuardKit (0.4) + - WireGuardKit (= 0.5) + - WireGuardKit (0.5) DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) - wireguard_dart (from `Flutter/ephemeral/.symlinks/plugins/wireguard_dart/darwin`) - - WireGuardKit (from `https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.4/WireGuardKit.podspec`) + - WireGuardKit (from `https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.5/WireGuardKit.podspec`) EXTERNAL SOURCES: FlutterMacOS: @@ -17,13 +17,13 @@ EXTERNAL SOURCES: wireguard_dart: :path: Flutter/ephemeral/.symlinks/plugins/wireguard_dart/darwin WireGuardKit: - :podspec: https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.4/WireGuardKit.podspec + :podspec: https://raw.githubusercontent.com/mysteriumnetwork/wireguard-apple/0.5/WireGuardKit.podspec SPEC CHECKSUMS: FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - wireguard_dart: 243daf647faad658d89ececebd2fae120c53f9e6 - WireGuardKit: 4279043137fb39ac85bd2821f613ecd94b826a68 + wireguard_dart: c6c27bbc1469f9aa1f7984b64ce3aaf04136417b + WireGuardKit: 44063ed405613ca3d234e489e24b015d434e2a64 -PODFILE CHECKSUM: 43ff72062d07ffe680bc4a6bed2fdd1fbf7ba5a4 +PODFILE CHECKSUM: 2d181daa2a2a0e9d7480efba669a3f523076f5aa COCOAPODS: 1.15.2 From 77f7ad5408bbbdb9b964b1627ee88dc31189d117 Mon Sep 17 00:00:00 2001 From: Valdas Petrulis Date: Wed, 20 Nov 2024 18:01:43 +0200 Subject: [PATCH 3/3] Build with XCode 16.1 --- example/ios/Runner.xcodeproj/project.pbxproj | 2 +- .../ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/Runner/AppDelegate.swift | 2 +- example/macos/Runner.xcodeproj/project.pbxproj | 2 +- .../Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/macos/Runner/AppDelegate.swift | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 835ede7..0527545 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -233,7 +233,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1420; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 3E62C86D29D186DE003AD06E = { diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a6b826d..5e31d3d 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Bool { return true