Skip to content

Commit

Permalink
Add support for visionOS
Browse files Browse the repository at this point in the history
Fix the missing conditionals,
add a Package.swift w/ the necessary
visionOS declaration.
  • Loading branch information
helje5 committed Mar 19, 2024
1 parent 628094f commit 7cbcd22
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ Carthage

# Swift Package Manager
.build/
.swiftpm

123 changes: 123 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
// swift-tools-version:5.10

import PackageDescription

let package = Package(
name: "Highlightr",
platforms: [
.macOS(.v10_15), .iOS(.v13), .visionOS(.v1), .watchOS(.v7), .tvOS(.v12)
],
products: [
.library(
name: "Highlightr",
targets: ["Highlightr"]
),
],
dependencies: [],
targets: [
.target(
name: "Highlightr",
dependencies: [],
path: "Pod",
exclude: [
"Assets/Highlighter/LICENSE",
],
sources: [
"Classes",
],
resources: [
.copy("Assets/Highlighter/highlight.min.js"),
.copy("Assets/styles/a11y-dark.min.css"),
.copy("Assets/styles/a11y-light.min.css"),
.copy("Assets/styles/agate.min.css"),
.copy("Assets/styles/an-old-hope.min.css"),
.copy("Assets/styles/androidstudio.min.css"),
.copy("Assets/styles/arduino-light.min.css"),
.copy("Assets/styles/arta.min.css"),
.copy("Assets/styles/ascetic.min.css"),
.copy("Assets/styles/atelier-cave-dark.min.css"),
.copy("Assets/styles/atelier-cave-light.min.css"),
.copy("Assets/styles/atelier-dune-dark.min.css"),
.copy("Assets/styles/atelier-dune-light.min.css"),
.copy("Assets/styles/atelier-estuary-dark.min.css"),
.copy("Assets/styles/atelier-estuary-light.min.css"),
.copy("Assets/styles/atelier-forest-dark.min.css"),
.copy("Assets/styles/atelier-forest-light.min.css"),
.copy("Assets/styles/atelier-heath-dark.min.css"),
.copy("Assets/styles/atelier-heath-light.min.css"),
.copy("Assets/styles/atelier-lakeside-dark.min.css"),
.copy("Assets/styles/atelier-lakeside-light.min.css"),
.copy("Assets/styles/atelier-plateau-dark.min.css"),
.copy("Assets/styles/atelier-plateau-light.min.css"),
.copy("Assets/styles/atelier-savanna-dark.min.css"),
.copy("Assets/styles/atelier-savanna-light.min.css"),
.copy("Assets/styles/atelier-seaside-dark.min.css"),
.copy("Assets/styles/atelier-seaside-light.min.css"),
.copy("Assets/styles/atelier-sulphurpool-dark.min.css"),
.copy("Assets/styles/atelier-sulphurpool-light.min.css"),
.copy("Assets/styles/atom-one-dark-reasonable.min.css"),
.copy("Assets/styles/atom-one-dark.min.css"),
.copy("Assets/styles/atom-one-light.min.css"),
.copy("Assets/styles/brown-paper.min.css"),
.copy("Assets/styles/codepen-embed.min.css"),
.copy("Assets/styles/color-brewer.min.css"),
.copy("Assets/styles/darcula.min.css"),
.copy("Assets/styles/dark.min.css"),
.copy("Assets/styles/darkula.min.css"),
.copy("Assets/styles/default.min.css"),
.copy("Assets/styles/docco.min.css"),
.copy("Assets/styles/dracula.min.css"),
.copy("Assets/styles/far.min.css"),
.copy("Assets/styles/foundation.min.css"),
.copy("Assets/styles/github-gist.min.css"),
.copy("Assets/styles/github.min.css"),
.copy("Assets/styles/gml.min.css"),
.copy("Assets/styles/googlecode.min.css"),
.copy("Assets/styles/grayscale.min.css"),
.copy("Assets/styles/gruvbox-dark.min.css"),
.copy("Assets/styles/gruvbox-light.min.css"),
.copy("Assets/styles/hopscotch.min.css"),
.copy("Assets/styles/hybrid.min.css"),
.copy("Assets/styles/idea.min.css"),
.copy("Assets/styles/ir-black.min.css"),
.copy("Assets/styles/isbl-editor-dark.min.css"),
.copy("Assets/styles/isbl-editor-light.min.css"),
.copy("Assets/styles/kimbie.dark.min.css"),
.copy("Assets/styles/kimbie.light.min.css"),
.copy("Assets/styles/lightfair.min.css"),
.copy("Assets/styles/magula.min.css"),
.copy("Assets/styles/mono-blue.min.css"),
.copy("Assets/styles/monokai-sublime.min.css"),
.copy("Assets/styles/monokai.min.css"),
.copy("Assets/styles/nord.min.css"),
.copy("Assets/styles/obsidian.min.css"),
.copy("Assets/styles/ocean.min.css"),
.copy("Assets/styles/paraiso-dark.min.css"),
.copy("Assets/styles/paraiso-light.min.css"),
.copy("Assets/styles/pojoaque.min.css"),
.copy("Assets/styles/purebasic.min.css"),
.copy("Assets/styles/qtcreator_dark.min.css"),
.copy("Assets/styles/qtcreator_light.min.css"),
.copy("Assets/styles/railscasts.min.css"),
.copy("Assets/styles/rainbow.min.css"),
.copy("Assets/styles/routeros.min.css"),
.copy("Assets/styles/school-book.min.css"),
.copy("Assets/styles/shades-of-purple.min.css"),
.copy("Assets/styles/solarized-dark.min.css"),
.copy("Assets/styles/solarized-light.min.css"),
.copy("Assets/styles/sunburst.min.css"),
.copy("Assets/styles/tomorrow-night-blue.min.css"),
.copy("Assets/styles/tomorrow-night-bright.min.css"),
.copy("Assets/styles/tomorrow-night-eighties.min.css"),
.copy("Assets/styles/tomorrow-night.min.css"),
.copy("Assets/styles/tomorrow.min.css"),
.copy("Assets/styles/vs.min.css"),
.copy("Assets/styles/vs2015.min.css"),
.copy("Assets/styles/xcode.min.css"),
.copy("Assets/styles/xcode-dark.min.css"),
.copy("Assets/styles/xt256.min.css"),
.copy("Assets/styles/zenburn.min.css"),
]
),
]
)
2 changes: 1 addition & 1 deletion Pod/Classes/CodeAttributedString.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation

#if os(OSX)
import AppKit
#elseif os(iOS)
#elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
import UIKit
#endif

Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/Shims.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation

#if os(OSX)
import AppKit
#elseif os(iOS)
#elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
import UIKit
#endif

Expand All @@ -20,7 +20,7 @@ import Foundation
public typealias AttributedStringKey = NSAttributedStringKey
#endif

#if swift(>=4.2) && os(iOS)
#if swift(>=4.2) && (os(iOS) || os(tvOS) || os(watchOS) || os(visionOS))
public typealias TextStorageEditActions = NSTextStorage.EditActions
#else
public typealias TextStorageEditActions = NSTextStorageEditActions
Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/Theme.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import Foundation

#if os(iOS) || os(tvOS)
#if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
import UIKit
/// Typealias for UIColor
public typealias RPColor = UIColor
Expand Down Expand Up @@ -90,7 +90,7 @@ open class Theme {
{
codeFont = font

#if os(iOS) || os(tvOS)
#if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
let boldDescriptor = UIFontDescriptor(fontAttributes: [UIFontDescriptor.AttributeName.family:font.familyName,
UIFontDescriptor.AttributeName.face:"Bold"])
let italicDescriptor = UIFontDescriptor(fontAttributes: [UIFontDescriptor.AttributeName.family:font.familyName,
Expand Down

0 comments on commit 7cbcd22

Please sign in to comment.