Skip to content

Commit acec79d

Browse files
committed
Bump minimum macOS version to 13.0
1 parent fc62fc9 commit acec79d

File tree

4 files changed

+55
-5
lines changed

4 files changed

+55
-5
lines changed

Package.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ import PackageDescription
55
let package = Package(
66
name: "LyricsKit",
77
platforms: [
8-
.macOS(.v10_15),
9-
.iOS(.v13),
10-
.tvOS(.v13),
11-
.watchOS(.v6),
8+
.macOS(.v13),
129
],
1310
products: [
1411
.library(
1512
name: "LyricsKit",
16-
targets: ["LyricsCore", "LyricsService", "LyricsServiceUI"]
13+
targets: ["LyricsKit"]
1714
),
1815
],
1916
dependencies: [
@@ -27,6 +24,14 @@ let package = Package(
2724
.package(url: "https://github.com/lachlanbell/SwiftOTP", from: "3.0.2"),
2825
],
2926
targets: [
27+
.target(
28+
name: "LyricsKit",
29+
dependencies: [
30+
"LyricsCore",
31+
"LyricsService",
32+
"LyricsServiceUI",
33+
]
34+
),
3035
.target(
3136
name: "LyricsCore",
3237
dependencies: [

Sources/LyricsKit/LyricsKit.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@_exported import LyricsCore
2+
@_exported import LyricsService
3+
@_exported import LyricsServiceUI
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import Foundation
2+
import RegexBuilder
3+
4+
enum RegexCollection {
5+
static let id3Tag = Regex {
6+
/^/
7+
NegativeLookahead {
8+
Regex {
9+
"["
10+
Optionally(CharacterClass.anyOf("+-"))
11+
OneOrMore(.digit)
12+
":"
13+
OneOrMore(.digit)
14+
Optionally {
15+
Regex {
16+
"."
17+
OneOrMore(.digit)
18+
}
19+
}
20+
"]"
21+
}
22+
}
23+
"["
24+
Capture {
25+
OneOrMore(.reluctant) {
26+
/./
27+
}
28+
}
29+
":"
30+
Capture {
31+
OneOrMore {
32+
/./
33+
}
34+
}
35+
"]"
36+
/$/
37+
}
38+
.anchorsMatchLineEndings()
39+
40+
}

Sources/LyricsService/Utilities/RegexPattern.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ let ttpodXtrcInlineTagRegex = Regex(#"<(\d+)>([^<\r\n]*)"#)
4343
let syairSearchResultRegex = Regex(#"<div class="title"><a href="([^"]+)">"#)
4444

4545
let syairLyricsContentRegex = Regex(#"<div class="entry">(.+?)<div"#, options: .dotMatchesLineSeparators)
46+
47+

0 commit comments

Comments
 (0)