Finish casing fix from Wireguard to WireGuard
This also removes from the project various duplicate file entries that differed only in casing. Note that, if working with a case-insensitive filesystem (as are generally used on macOS systems), it is recommended to destroy the affected files in the working tree and check them out again. Failure to do this will result in XCode recreating duplicate file entries in the project. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
4A4BACEB20B5F1BF00F12B28 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BACE920B5F1BF00F12B28 /* Main.storyboard */; };
|
4A4BACEB20B5F1BF00F12B28 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BACE920B5F1BF00F12B28 /* Main.storyboard */; };
|
||||||
4A4BACED20B5F1C100F12B28 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BACEC20B5F1C100F12B28 /* Assets.xcassets */; };
|
4A4BACED20B5F1C100F12B28 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BACEC20B5F1C100F12B28 /* Assets.xcassets */; };
|
||||||
4A4BACF020B5F1C100F12B28 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BACEE20B5F1C100F12B28 /* LaunchScreen.storyboard */; };
|
4A4BACF020B5F1C100F12B28 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BACEE20B5F1C100F12B28 /* LaunchScreen.storyboard */; };
|
||||||
4A4BACFB20B5F1C100F12B28 /* WireguardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BACFA20B5F1C100F12B28 /* WireguardTests.swift */; };
|
4A4BACFB20B5F1C100F12B28 /* WireGuardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BACFA20B5F1C100F12B28 /* WireGuardTests.swift */; };
|
||||||
4A4BAD0620B5F4B500F12B28 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BAD0520B5F4B500F12B28 /* Settings.bundle */; };
|
4A4BAD0620B5F4B500F12B28 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4A4BAD0520B5F4B500F12B28 /* Settings.bundle */; };
|
||||||
4A4BAD0C20B5F6AA00F12B28 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD0B20B5F6AA00F12B28 /* AppCoordinator.swift */; };
|
4A4BAD0C20B5F6AA00F12B28 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD0B20B5F6AA00F12B28 /* AppCoordinator.swift */; };
|
||||||
4A4BAD0E20B5F6C300F12B28 /* Coordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD0D20B5F6C300F12B28 /* Coordinator.swift */; };
|
4A4BAD0E20B5F6C300F12B28 /* Coordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD0D20B5F6C300F12B28 /* Coordinator.swift */; };
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
containerPortal = 4A4BACDA20B5F1BF00F12B28 /* Project object */;
|
containerPortal = 4A4BACDA20B5F1BF00F12B28 /* Project object */;
|
||||||
proxyType = 1;
|
proxyType = 1;
|
||||||
remoteGlobalIDString = 4A4BACE120B5F1BF00F12B28;
|
remoteGlobalIDString = 4A4BACE120B5F1BF00F12B28;
|
||||||
remoteInfo = Wireguard;
|
remoteInfo = WireGuard;
|
||||||
};
|
};
|
||||||
4A61D82C20D98CE2006C7A76 /* PBXContainerItemProxy */ = {
|
4A61D82C20D98CE2006C7A76 /* PBXContainerItemProxy */ = {
|
||||||
isa = PBXContainerItemProxy;
|
isa = PBXContainerItemProxy;
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
4A4BACEF20B5F1C100F12B28 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
4A4BACEF20B5F1C100F12B28 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||||
4A4BACF120B5F1C100F12B28 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
4A4BACF120B5F1C100F12B28 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
4A4BACF620B5F1C100F12B28 /* WireGuardTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WireGuardTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
4A4BACF620B5F1C100F12B28 /* WireGuardTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WireGuardTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
4A4BACFA20B5F1C100F12B28 /* WireguardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireguardTests.swift; sourceTree = "<group>"; };
|
4A4BACFA20B5F1C100F12B28 /* WireGuardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireGuardTests.swift; sourceTree = "<group>"; };
|
||||||
4A4BACFC20B5F1C100F12B28 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
4A4BACFC20B5F1C100F12B28 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
4A4BAD0520B5F4B500F12B28 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
|
4A4BAD0520B5F4B500F12B28 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
|
||||||
4A4BAD0B20B5F6AA00F12B28 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
|
4A4BAD0B20B5F6AA00F12B28 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
|
||||||
@@ -108,10 +108,7 @@
|
|||||||
4AD095C920DC42CD000E9CF5 /* WireGuardNetworkExtension-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WireGuardNetworkExtension-Bridging-Header.h"; sourceTree = "<group>"; };
|
4AD095C920DC42CD000E9CF5 /* WireGuardNetworkExtension-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WireGuardNetworkExtension-Bridging-Header.h"; sourceTree = "<group>"; };
|
||||||
4AD095CA20DC42CD000E9CF5 /* WireGuardGoWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WireGuardGoWrapper.h; sourceTree = "<group>"; };
|
4AD095CA20DC42CD000E9CF5 /* WireGuardGoWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WireGuardGoWrapper.h; sourceTree = "<group>"; };
|
||||||
4AD095CB20DC42CD000E9CF5 /* WireGuardGoWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WireGuardGoWrapper.m; sourceTree = "<group>"; };
|
4AD095CB20DC42CD000E9CF5 /* WireGuardGoWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WireGuardGoWrapper.m; sourceTree = "<group>"; };
|
||||||
82069F3AE97A82448F990CFB /* Pods-Wireguard.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Wireguard.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Wireguard/Pods-Wireguard.debug.xcconfig"; sourceTree = "<group>"; };
|
|
||||||
861983CAE8FDC13BC83E7E04 /* Pods_WireGuard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WireGuard.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
861983CAE8FDC13BC83E7E04 /* Pods_WireGuard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WireGuard.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
8BF50C7EC60CD91BBA05E51F /* Pods_Wireguard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Wireguard.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
||||||
FB0ABC1036F5A16B24286D3C /* Pods-Wireguard.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Wireguard.release.xcconfig"; path = "Pods/Target Support Files/Pods-Wireguard/Pods-Wireguard.release.xcconfig"; sourceTree = "<group>"; };
|
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFrameworksBuildPhase section */
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
@@ -148,7 +145,7 @@
|
|||||||
4AD08FFE20DC4171000E9CF5 /* wireguard-go-bridge */,
|
4AD08FFE20DC4171000E9CF5 /* wireguard-go-bridge */,
|
||||||
4A4BAD0720B5F4BC00F12B28 /* Resources */,
|
4A4BAD0720B5F4BC00F12B28 /* Resources */,
|
||||||
4A4BACE420B5F1BF00F12B28 /* WireGuard */,
|
4A4BACE420B5F1BF00F12B28 /* WireGuard */,
|
||||||
4A4BACF920B5F1C100F12B28 /* WireguardTests */,
|
4A4BACF920B5F1C100F12B28 /* WireGuardTests */,
|
||||||
4A61D82720D98CE2006C7A76 /* WireGuardNetworkExtension */,
|
4A61D82720D98CE2006C7A76 /* WireGuardNetworkExtension */,
|
||||||
4A4BACE320B5F1BF00F12B28 /* Products */,
|
4A4BACE320B5F1BF00F12B28 /* Products */,
|
||||||
87B9E27C2D1820573644527C /* Pods */,
|
87B9E27C2D1820573644527C /* Pods */,
|
||||||
@@ -182,13 +179,13 @@
|
|||||||
path = WireGuard;
|
path = WireGuard;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
4A4BACF920B5F1C100F12B28 /* WireguardTests */ = {
|
4A4BACF920B5F1C100F12B28 /* WireGuardTests */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
4A4BACFA20B5F1C100F12B28 /* WireguardTests.swift */,
|
4A4BACFA20B5F1C100F12B28 /* WireGuardTests.swift */,
|
||||||
4A4BACFC20B5F1C100F12B28 /* Info.plist */,
|
4A4BACFC20B5F1C100F12B28 /* Info.plist */,
|
||||||
);
|
);
|
||||||
path = WireguardTests;
|
path = WireGuardTests;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
4A4BAD0720B5F4BC00F12B28 /* Resources */ = {
|
4A4BAD0720B5F4BC00F12B28 /* Resources */ = {
|
||||||
@@ -261,8 +258,6 @@
|
|||||||
87B9E27C2D1820573644527C /* Pods */ = {
|
87B9E27C2D1820573644527C /* Pods */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
82069F3AE97A82448F990CFB /* Pods-Wireguard.debug.xcconfig */,
|
|
||||||
FB0ABC1036F5A16B24286D3C /* Pods-Wireguard.release.xcconfig */,
|
|
||||||
25E2BE31A33C8CCE6E79B6EF /* Pods-WireGuard.debug.xcconfig */,
|
25E2BE31A33C8CCE6E79B6EF /* Pods-WireGuard.debug.xcconfig */,
|
||||||
0CE52E030FAA93F3BF5747B2 /* Pods-WireGuard.release.xcconfig */,
|
0CE52E030FAA93F3BF5747B2 /* Pods-WireGuard.release.xcconfig */,
|
||||||
);
|
);
|
||||||
@@ -273,7 +268,6 @@
|
|||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
4A61D83420D98D25006C7A76 /* NetworkExtension.framework */,
|
4A61D83420D98D25006C7A76 /* NetworkExtension.framework */,
|
||||||
8BF50C7EC60CD91BBA05E51F /* Pods_Wireguard.framework */,
|
|
||||||
861983CAE8FDC13BC83E7E04 /* Pods_WireGuard.framework */,
|
861983CAE8FDC13BC83E7E04 /* Pods_WireGuard.framework */,
|
||||||
);
|
);
|
||||||
name = Frameworks;
|
name = Frameworks;
|
||||||
@@ -301,7 +295,7 @@
|
|||||||
4A61D82D20D98CE2006C7A76 /* PBXTargetDependency */,
|
4A61D82D20D98CE2006C7A76 /* PBXTargetDependency */,
|
||||||
);
|
);
|
||||||
name = WireGuard;
|
name = WireGuard;
|
||||||
productName = Wireguard;
|
productName = WireGuard;
|
||||||
productReference = 4A4BACE220B5F1BF00F12B28 /* WireGuard.app */;
|
productReference = 4A4BACE220B5F1BF00F12B28 /* WireGuard.app */;
|
||||||
productType = "com.apple.product-type.application";
|
productType = "com.apple.product-type.application";
|
||||||
};
|
};
|
||||||
@@ -319,7 +313,7 @@
|
|||||||
4A4BACF820B5F1C100F12B28 /* PBXTargetDependency */,
|
4A4BACF820B5F1C100F12B28 /* PBXTargetDependency */,
|
||||||
);
|
);
|
||||||
name = WireGuardTests;
|
name = WireGuardTests;
|
||||||
productName = WireguardTests;
|
productName = WireGuardTests;
|
||||||
productReference = 4A4BACF620B5F1C100F12B28 /* WireGuardTests.xctest */;
|
productReference = 4A4BACF620B5F1C100F12B28 /* WireGuardTests.xctest */;
|
||||||
productType = "com.apple.product-type.bundle.unit-test";
|
productType = "com.apple.product-type.bundle.unit-test";
|
||||||
};
|
};
|
||||||
@@ -348,7 +342,7 @@
|
|||||||
attributes = {
|
attributes = {
|
||||||
LastSwiftUpdateCheck = 0940;
|
LastSwiftUpdateCheck = 0940;
|
||||||
LastUpgradeCheck = 0930;
|
LastUpgradeCheck = 0930;
|
||||||
ORGANIZATIONNAME = Wireguard;
|
ORGANIZATIONNAME = WireGuard;
|
||||||
TargetAttributes = {
|
TargetAttributes = {
|
||||||
4A4BACE120B5F1BF00F12B28 = {
|
4A4BACE120B5F1BF00F12B28 = {
|
||||||
CreatedOnToolsVersion = 9.3.1;
|
CreatedOnToolsVersion = 9.3.1;
|
||||||
@@ -542,7 +536,7 @@
|
|||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
4A4BACFB20B5F1C100F12B28 /* WireguardTests.swift in Sources */,
|
4A4BACFB20B5F1C100F12B28 /* WireGuardTests.swift in Sources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
+1
-1
@@ -2,6 +2,6 @@
|
|||||||
<Workspace
|
<Workspace
|
||||||
version = "1.0">
|
version = "1.0">
|
||||||
<FileRef
|
<FileRef
|
||||||
location = "self:Wireguard.xcodeproj">
|
location = "self:WireGuard.xcodeproj">
|
||||||
</FileRef>
|
</FileRef>
|
||||||
</Workspace>
|
</Workspace>
|
||||||
Generated
@@ -3,7 +3,7 @@
|
|||||||
// WireGuardNetworkExtension
|
// WireGuardNetworkExtension
|
||||||
//
|
//
|
||||||
// Created by Jeroen Leenarts on 19-06-18.
|
// Created by Jeroen Leenarts on 19-06-18.
|
||||||
// Copyright © 2018 Wireguard. All rights reserved.
|
// Copyright © 2018 WireGuard. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
import NetworkExtension
|
import NetworkExtension
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// WireGuardNetworkExtension
|
// WireGuardNetworkExtension
|
||||||
//
|
//
|
||||||
// Created by Jeroen Leenarts on 21-06-18.
|
// Created by Jeroen Leenarts on 21-06-18.
|
||||||
// Copyright © 2018 Wireguard. All rights reserved.
|
// Copyright © 2018 WireGuard. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// WireGuardNetworkExtension
|
// WireGuardNetworkExtension
|
||||||
//
|
//
|
||||||
// Created by Jeroen Leenarts on 21-06-18.
|
// Created by Jeroen Leenarts on 21-06-18.
|
||||||
// Copyright © 2018 Wireguard. All rights reserved.
|
// Copyright © 2018 WireGuard. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
#import "WireGuardGoWrapper.h"
|
#import "WireGuardGoWrapper.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user