Skip to content
This repository has been archived by the owner on Dec 22, 2023. It is now read-only.

Commit

Permalink
Fix master rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
zocario committed Dec 8, 2020
1 parent 7fd0eab commit fd29da2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PackageDescription

let package = Package(
name: "Family",
platforms: [.iOS(.v9), .tvOS(.v14), .macOS(.v10_11)],
platforms: [.iOS(.v10), .tvOS(.v14), .macOS(.v10_11)],
products: [
.library(
name: "Family-Mobile",
Expand Down
8 changes: 4 additions & 4 deletions Sources/Shared/OSSignpostController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ final public class OSSignpostController {
private let name: StaticString
public var signpostsEnabled: Bool = false

init(subsystem: String = "com.zenangst.Family",
public init(subsystem: String = "com.zenangst.Family",
category: String,
name: StaticString = #function,
signpostsEnabled: Bool) {
Expand All @@ -14,7 +14,7 @@ final public class OSSignpostController {
self.signpostsEnabled = signpostsEnabled
}

func signpost(_ type: SignpostType, _ message: @autoclosure () -> String) {
public func signpost(_ type: SignpostType, _ message: @autoclosure () -> String) {
guard signpostsEnabled else { return }
let suffix: String

Expand Down Expand Up @@ -45,11 +45,11 @@ final public class OSSignpostController {
}
}

enum SignpostType {
public enum SignpostType {
case begin, event, end

@available(OSX 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
var os: OSSignpostType {
public var os: OSSignpostType {
switch self {
case .begin: return .begin
case .event: return .event
Expand Down

0 comments on commit fd29da2

Please sign in to comment.