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

Jump to bottom

Fix build errors #72

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Fix build errors #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
122 changes: 82 additions & 40 deletions OpenGraph.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
0A78BBD027972EB30049F53B /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A78BBCF27972EB30049F53B /* URLSession.swift */; };
4204E998275B260700AB31CC /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4204E997275B260700AB31CC /* Data.swift */; };
4204EA19275B76AE00AB31CC /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4204EA18275B76AE00AB31CC /* String.swift */; };
6A7310FF1E279D5D00CE1756 /* example3.com.html in Resources */ = {isa = PBXBuildFile; fileRef = 6A7310FB1E279C7E00CE1756 /* example3.com.html */; };
7B24FB191D3B2583005275B0 /* OpenGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B24FB181D3B2583005275B0 /* OpenGraph.h */; settings = {ATTRIBUTES = (Public, ); }; };
7B24FB201D3B2583005275B0 /* OpenGraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B24FB151D3B2583005275B0 /* OpenGraph.framework */; };
7B24FB3E1D3B26C4005275B0 /* OpenGraphTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B24FB3D1D3B26C4005275B0 /* OpenGraphTests.swift */; };
Expand All @@ -19,8 +18,11 @@
7B24FB481D3B27E5005275B0 /* OpenGraphParseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B24FB431D3B27E5005275B0 /* OpenGraphParseError.swift */; };
7B24FB491D3B27E5005275B0 /* OpenGraphParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B24FB441D3B27E5005275B0 /* OpenGraphParser.swift */; };
7B24FB4A1D3B27E5005275B0 /* OpenGraphResponseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B24FB451D3B27E5005275B0 /* OpenGraphResponseError.swift */; };
7B24FB531D3B2DD4005275B0 /* ogp.html in Resources */ = {isa = PBXBuildFile; fileRef = 7B24FB521D3B2DD4005275B0 /* ogp.html */; };
CBEA99A61E2B65F40066452C /* empty_ogp.html in Resources */ = {isa = PBXBuildFile; fileRef = CBEA99A41E2B63980066452C /* empty_ogp.html */; };
F75574302C2B0E0E002416DD /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = F755742F2C2B0E0E002416DD /* OHHTTPStubs */; };
F75574322C2B0E0E002416DD /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = F75574312C2B0E0E002416DD /* OHHTTPStubsSwift */; };
F75574372C2B0E8C002416DD /* empty_ogp.html in Resources */ = {isa = PBXBuildFile; fileRef = F75574332C2B0E8C002416DD /* empty_ogp.html */; };
F75574382C2B0E8C002416DD /* example3.com.html in Resources */ = {isa = PBXBuildFile; fileRef = F75574342C2B0E8C002416DD /* example3.com.html */; };
F75574392C2B0E8C002416DD /* ogp.html in Resources */ = {isa = PBXBuildFile; fileRef = F75574352C2B0E8C002416DD /* ogp.html */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -37,7 +39,6 @@
0A78BBCF27972EB30049F53B /* URLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSession.swift; sourceTree = "<group>"; };
4204E997275B260700AB31CC /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
4204EA18275B76AE00AB31CC /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
6A7310FB1E279C7E00CE1756 /* example3.com.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = example3.com.html; sourceTree = "<group>"; };
7B24FB151D3B2583005275B0 /* OpenGraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenGraph.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7B24FB181D3B2583005275B0 /* OpenGraph.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGraph.h; sourceTree = "<group>"; };
7B24FB1A1D3B2583005275B0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -49,8 +50,9 @@
7B24FB431D3B27E5005275B0 /* OpenGraphParseError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGraphParseError.swift; sourceTree = "<group>"; };
7B24FB441D3B27E5005275B0 /* OpenGraphParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGraphParser.swift; sourceTree = "<group>"; };
7B24FB451D3B27E5005275B0 /* OpenGraphResponseError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGraphResponseError.swift; sourceTree = "<group>"; };
7B24FB521D3B2DD4005275B0 /* ogp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ogp.html; sourceTree = "<group>"; };
CBEA99A41E2B63980066452C /* empty_ogp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = empty_ogp.html; sourceTree = "<group>"; };
F75574332C2B0E8C002416DD /* empty_ogp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = empty_ogp.html; sourceTree = "<group>"; };
F75574342C2B0E8C002416DD /* example3.com.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = example3.com.html; sourceTree = "<group>"; };
F75574352C2B0E8C002416DD /* ogp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ogp.html; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -66,6 +68,8 @@
buildActionMask = 2147483647;
files = (
7B24FB201D3B2583005275B0 /* OpenGraph.framework in Frameworks */,
F75574322C2B0E0E002416DD /* OHHTTPStubsSwift in Frameworks */,
F75574302C2B0E0E002416DD /* OHHTTPStubs in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -118,9 +122,7 @@
7B24FB231D3B2583005275B0 /* Tests */ = {
isa = PBXGroup;
children = (
7B24FB521D3B2DD4005275B0 /* ogp.html */,
6A7310FB1E279C7E00CE1756 /* example3.com.html */,
CBEA99A41E2B63980066452C /* empty_ogp.html */,
F75574362C2B0E8C002416DD /* Resources */,
7B24FB261D3B2583005275B0 /* Info.plist */,
7B24FB3D1D3B26C4005275B0 /* OpenGraphTests.swift */,
);
Expand All @@ -135,6 +137,16 @@
path = Sources;
sourceTree = "<group>";
};
F75574362C2B0E8C002416DD /* Resources */ = {
isa = PBXGroup;
children = (
F75574332C2B0E8C002416DD /* empty_ogp.html */,
F75574342C2B0E8C002416DD /* example3.com.html */,
F75574352C2B0E8C002416DD /* ogp.html */,
);
path = Resources;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -174,14 +186,17 @@
7B24FB1B1D3B2583005275B0 /* Sources */,
7B24FB1C1D3B2583005275B0 /* Frameworks */,
7B24FB1D1D3B2583005275B0 /* Resources */,
7B24FB511D3B2D2B005275B0 /* ShellScript */,
);
buildRules = (
);
dependencies = (
7B24FB221D3B2583005275B0 /* PBXTargetDependency */,
);
name = OpenGraphTests;
packageProductDependencies = (
F755742F2C2B0E0E002416DD /* OHHTTPStubs */,
F75574312C2B0E0E002416DD /* OHHTTPStubsSwift */,
);
productName = OpenGraphTests;
productReference = 7B24FB1F1D3B2583005275B0 /* OpenGraphTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
Expand Down Expand Up @@ -216,6 +231,9 @@
en,
);
mainGroup = 7B24FB0B1D3B2583005275B0;
packageReferences = (
F755742E2C2B0E0E002416DD /* XCRemoteSwiftPackageReference "OHHTTPStubs" */,
);
productRefGroup = 7B24FB161D3B2583005275B0 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand All @@ -238,31 +256,14 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CBEA99A61E2B65F40066452C /* empty_ogp.html in Resources */,
6A7310FF1E279D5D00CE1756 /* example3.com.html in Resources */,
7B24FB531D3B2DD4005275B0 /* ogp.html in Resources */,
F75574382C2B0E8C002416DD /* example3.com.html in Resources */,
F75574372C2B0E8C002416DD /* empty_ogp.html in Resources */,
F75574392C2B0E8C002416DD /* ogp.html in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
7B24FB511D3B2D2B005275B0 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/Mac/OHHTTPStubs.framework",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
7B24FB101D3B2583005275B0 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -345,7 +346,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -399,10 +400,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -429,8 +431,12 @@
INFOPLIST_FILE = Sources/OpenGraph/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = "net.cloud-dj.OpenGraph";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -460,8 +466,12 @@
INFOPLIST_FILE = Sources/OpenGraph/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = "net.cloud-dj.OpenGraph";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -483,7 +493,11 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "net.cloud-dj.OpenGraphTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -502,7 +516,11 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "net.cloud-dj.OpenGraphTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -540,6 +558,30 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
F755742E2C2B0E0E002416DD /* XCRemoteSwiftPackageReference "OHHTTPStubs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/AliSoftware/OHHTTPStubs.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 9.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
F755742F2C2B0E0E002416DD /* OHHTTPStubs */ = {
isa = XCSwiftPackageProductDependency;
package = F755742E2C2B0E0E002416DD /* XCRemoteSwiftPackageReference "OHHTTPStubs" */;
productName = OHHTTPStubs;
};
F75574312C2B0E0E002416DD /* OHHTTPStubsSwift */ = {
isa = XCSwiftPackageProductDependency;
package = F755742E2C2B0E0E002416DD /* XCRemoteSwiftPackageReference "OHHTTPStubs" */;
productName = OHHTTPStubsSwift;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 7B24FB0C1D3B2583005275B0 /* Project object */;
}
2 changes: 1 addition & 1 deletion OpenGraph.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ let package = Package(
targets: [
.target(
name: "OpenGraph",
dependencies: [
.product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs")
],
path: "Sources/OpenGraph",
exclude: ["Info.plist"]
),
.testTarget(
name: "OpenGraphTests",
dependencies: ["OpenGraph"],
dependencies: [
"OpenGraph",
.product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs")
],
path: "Tests",
resources: [.process("Resources")]
),
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraph/Extension/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import Foundation

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
extension Data {
@available(macOS 10.10, *)
var stringEncoding: String.Encoding? {
#if os(Linux)
return nil
Expand Down
1 change: 1 addition & 0 deletions Sources/OpenGraph/Extension/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import Foundation

extension String {
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
init?(data: Data, textEncodingName: String? = nil, `default`: String.Encoding = .utf8) {
let encoding: String.Encoding = {
if let textEncodingName = textEncodingName {
Expand Down
3 changes: 3 additions & 0 deletions Sources/OpenGraph/OpenGraph.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public struct OpenGraph {

public let source: [OpenGraphMetadata: String]

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@discardableResult
public static func fetch(url: URL, headers: [String: String]? = nil, configuration: URLSessionConfiguration = .default, completion: @escaping (Result<OpenGraph, Error>) -> Void) -> URLSessionDataTask {
var mutableURLRequest = URLRequest(url: url)
Expand Down Expand Up @@ -49,6 +50,7 @@ public struct OpenGraph {
}
#endif

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
private static func handleFetchResult(data: Data?, response: URLResponse?, completion: @escaping (Result<OpenGraph, Error>) -> Void) {
guard let data = data, let response = response as? HTTPURLResponse else {
return
Expand All @@ -65,6 +67,7 @@ public struct OpenGraph {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
private static func handleFetchResult(data: Data, response: URLResponse) throws -> OpenGraph {
if let response = response as? HTTPURLResponse,
!(200..<300).contains(response.statusCode) {
Expand Down