Skip to content

[pull] main from intitni:main #31

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

Merged
pull merged 2 commits into from
Oct 3, 2023
Merged

[pull] main from intitni:main #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11ba954
Update Package.swift
intitni Oct 3, 2023
4626bd3
Merge branch 'hotfix/build-without-plus'
intitni Oct 3, 2023
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
47 changes: 26 additions & 21 deletions Core/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ let package = Package(

extension [Target.Dependency] {
func pro(_ targetNames: [String]) -> [Target.Dependency] {
if isProIncluded() {
if isProIncluded {
// include the pro package
return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
}
Expand All @@ -389,7 +389,7 @@ extension [Target.Dependency] {

extension [Package.Dependency] {
var pro: [Package.Dependency] {
if isProIncluded() {
if isProIncluded {
// include the pro package
return self + [.package(path: "../Pro")]
}
Expand All @@ -399,24 +399,29 @@ extension [Package.Dependency] {

import Foundation

func isProIncluded(file: StaticString = #file) -> Bool {
let filePath = "\(file)"
let fileURL = URL(fileURLWithPath: filePath)
let rootURL = fileURL
.deletingLastPathComponent()
.deletingLastPathComponent()
let confURL = rootURL.appendingPathComponent("PLUS")
if !FileManager.default.fileExists(atPath: confURL.path) {
return false
}
do {
let content = String(
data: try Data(contentsOf: confURL),
encoding: .utf8
)
return content?.hasPrefix("YES") ?? false
} catch {
return false
let isProIncluded: Bool = {
func isProIncluded(file: StaticString = #file) -> Bool {
let filePath = "\(file)"
let fileURL = URL(fileURLWithPath: filePath)
let rootURL = fileURL
.deletingLastPathComponent()
.deletingLastPathComponent()
let confURL = rootURL.appendingPathComponent("PLUS")
if !FileManager.default.fileExists(atPath: confURL.path) {
return false
}
do {
let content = String(
data: try Data(contentsOf: confURL),
encoding: .utf8
)
print("")
return content?.hasPrefix("YES") ?? false
} catch {
return false
}
}
}

return isProIncluded()
}()