Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WireGuardKit support for XCode 16.1 #47

Merged
merged 3 commits into from
Nov 21, 2024
Merged

WireGuardKit support for XCode 16.1 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12a763f
Start using FVM
Waldz Nov 20, 2024
a3f7941
Bump WireGuardKit to 0.5
Waldz Nov 20, 2024
77f7ad5
Build with XCode 16.1
Waldz Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .fvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.24.1"
}
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ doc/api/
*.js.map

.DS_Store

# FVM Version Cache
.fvm/
9 changes: 6 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"dart.lineLength": 150,
"[dart]": {
"editor.rulers": [150]
"editor.rulers": [
150
]
},
"files.insertFinalNewline": true,
"files.associations": {
Expand Down Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion darwin/wireguard_dart.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__))

Expand Down
17 changes: 8 additions & 9 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1420;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
3E62C86D29D186DE003AD06E = {
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import Flutter

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions example/macos/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ 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:
:path: Flutter/ephemeral
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
2 changes: 1 addition & 1 deletion example/macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1410;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Cocoa
import FlutterMacOS

@NSApplicationMain
@main
class AppDelegate: FlutterAppDelegate {
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
Expand Down
Loading