Skip to content
This repository was archived by the owner on Sep 25, 2021. It is now read-only.

Add Swift Package Manager support #177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
xcuserdata
xcshareddata

.build/
.swiftpm/
xcuserdata/
24 changes: 24 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// swift-tools-version:5.3

import PackageDescription

let package = Package(
name: "Turbolinks",
products: [
.library(name: "Turbolinks", targets: ["Turbolinks"]),
],
targets: [
.target(
name: "Turbolinks",
path: "Turbolinks",
exclude: ["Info.plist", "Tests"],
resources: [.copy("WebView.js")]
),
.testTarget(
name: "TurbolinksTests",
dependencies: ["Turbolinks"],
path: "Turbolinks/Tests",
exclude: ["Info.plist"]
),
]
)
11 changes: 11 additions & 0 deletions Turbolinks/Bundle.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Foundation

extension Bundle {
static var turbolinks: Bundle {
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: WebView.self)
#endif
}
}
1 change: 1 addition & 0 deletions Turbolinks/VisitableView.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import UIKit
import WebKit

open class VisitableView: UIView {
Expand Down
3 changes: 1 addition & 2 deletions Turbolinks/WebView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ class WebView: WKWebView {
init(configuration: WKWebViewConfiguration) {
super.init(frame: CGRect.zero, configuration: configuration)

let bundle = Bundle(for: type(of: self))
let source = try! String(contentsOf: bundle.url(forResource: "WebView", withExtension: "js")!, encoding: String.Encoding.utf8)
let source = try! String(contentsOf: Bundle.turbolinks.url(forResource: "WebView", withExtension: "js")!, encoding: String.Encoding.utf8)
let userScript = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
configuration.userContentController.addUserScript(userScript)
configuration.userContentController.add(self, name: "turbolinks")
Expand Down