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

Added support for MacOS with AppKit #30

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+90 −20
Open

Added support for MacOS with AppKit #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8ce0a3
Added support for MacOS with AppKit
mattiascibien Oct 28, 2024
924dc73
Correct Macos Deployment Target in podspec and project
mattiascibien Oct 29, 2024
67ad6e4
Fix Package supported platforms
mattiascibien Oct 29, 2024
0e78cf4
Fix iPhone Package
mattiascibien Oct 29, 2024
c8e7bb8
Fix APIs not available on iOS 15
mattiascibien Oct 29, 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
1 change: 1 addition & 0 deletions MTGSDKSwift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
s.source = { :git => 'https://github.com/MagicTheGathering/mtg-sdk-swift.git', :tag => s.version.to_s }

s.ios.deployment_target = '10.2'
s.osx.deployment_target = '12.4'
s.source_files = 'MTGSDKSwift/**/*.swift'
s.swift_version = '4.1'
end
38 changes: 36 additions & 2 deletions MTGSDKSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
073F02172CCFC58D00AF05D1 /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
5B6092D5215EA5F400CDD46A /* Recovered References */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -146,6 +153,7 @@
5B87D68520596D6B0098553C /* TestApplication */,
5BD04DAA1E64943C00E5ED27 /* Products */,
5B6092D5215EA5F400CDD46A /* Recovered References */,
073F02172CCFC58D00AF05D1 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -577,13 +585,22 @@
INFOPLIST_FILE = MTGSDKSwift/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.rpcarson.MTGSDKSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = NO;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTS_MACCATALYST = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -599,13 +616,22 @@
INFOPLIST_FILE = MTGSDKSwift/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.rpcarson.MTGSDKSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = NO;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTS_MACCATALYST = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand All @@ -619,8 +645,12 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.rpcarson.MTGSDKSwiftTests;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = NO;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTS_MACCATALYST = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -634,8 +664,12 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.rpcarson.MTGSDKSwiftTests;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = NO;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTS_MACCATALYST = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
22 changes: 9 additions & 13 deletions MTGSDKSwift.xcodeproj/xcshareddata/xcschemes/MTGSDKSwift.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BD04DA81E64943C00E5ED27"
BuildableName = "MTGSDKSwift.framework"
BlueprintName = "MTGSDKSwift"
ReferencedContainer = "container:MTGSDKSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BD04DA81E64943C00E5ED27"
BuildableName = "MTGSDKSwift.framework"
BlueprintName = "MTGSDKSwift"
ReferencedContainer = "container:MTGSDKSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:MTGSDKSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
2 changes: 2 additions & 0 deletions MTGSDKSwift/MTGAPIService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ final class MTGAPIService {
}
}

@available(iOS 15.0, *)
func mtgAPIQuery<T: ResponseObject>(url: URL, responseObject: T.Type) async throws -> T {
let networkOperation = NetworkOperation(url: url)

Expand Down Expand Up @@ -110,6 +111,7 @@ final private class NetworkOperation {
}.resume()
}

@available(iOS 15.0, *)
func performOperation() async throws -> Data {
let (data, response) = try await URLSession.shared.data(for: URLRequest(url: url))

Expand Down
2 changes: 1 addition & 1 deletion MTGSDKSwift/MTGSDKSwift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2017 Reed Carson. All rights reserved.
//

#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed as UIKit is not cross platform and FOUNDATION_EXPORT is defined here


//! Project version number for MTGSDKSwift.
FOUNDATION_EXPORT double MTGSDKSwiftVersionNumber;
Expand Down
42 changes: 39 additions & 3 deletions MTGSDKSwift/MagicalCardManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
// Created by Reed Carson on 3/1/17.
// Copyright © 2017 Reed Carson. All rights reserved.
//

#if canImport(AppKit)
import AppKit
#elseif canImport(UIKit)
import UIKit
#endif

final public class Magic {
public typealias CardImageCompletion = (Result<UIImage>) -> Void
public typealias CardCompletion = (Result<[Card]>) -> Void
public typealias SetCompletion = (Result<[CardSet]>) -> Void

Expand Down Expand Up @@ -54,6 +56,7 @@ final public class Magic {
/// - Parameters:
/// - parameters: The Card Search Parameters that you'd like to search with.
/// - configuration: The Search Configuration (defaults to `.defaultConfiguration`).
@available(iOS 15.0, *)
public func fetchCards(_ parameters: [CardSearchParameter],
configuration: MTGSearchConfiguration = .defaultConfiguration) async throws -> [Card] {
guard let url = URLBuilder.buildURLWithParameters(parameters, andConfig: configuration) else {
Expand Down Expand Up @@ -116,6 +119,9 @@ final public class Magic {
}
}

#if canImport(UIKit)
public typealias CardImageCompletion = (Result<UIImage>) -> Void

/// Retreives a UIImage based on the imageURL of the Card passed in
///
/// - Parameters:
Expand All @@ -140,7 +146,37 @@ final public class Magic {
completion(Result.error(NetworkError.fetchCardImageError("data from contents of url failed")))
}
}

#endif

#if canImport(AppKit)
public typealias CardImageCompletion = (Result<NSImage>) -> Void

/// Retreives a NSImage based on the imageURL of the Card passed in
///
/// - Parameters:
/// - card: The card you wish to get the image for.
/// - completion: The completion handler (for success / failure response).
public func fetchImageForCard(_ card: Card, completion: @escaping CardImageCompletion) {
guard let imgurl = card.imageUrl else {
return completion(Result.error(NetworkError.fetchCardImageError("fetchImageForCard card imageURL was nil")))
}

guard let url = URL(string: imgurl) else {
return completion(Result.error(NetworkError.fetchCardImageError("fetchImageForCard url build failed")))
}

do {
let data = try Data(contentsOf: url)
guard let img = NSImage(data: data) else {
return completion(Result.error(NetworkError.fetchCardImageError("could not create uiimage from data")))
}
completion(Result.success(img))
} catch {
completion(Result.error(NetworkError.fetchCardImageError("data from contents of url failed")))
}
}
#endif

/// This function simulates opening a booster pack for the given set, producing an array of [Card]
///
/// - Parameters:
Expand Down
3 changes: 2 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import PackageDescription
let package = Package(
name: "MTGSDKSwift",
platforms: [
.iOS(.v9)
.iOS(.v15),
.macOS(.v12)
],
products: [
.library(
Expand Down