Skip to content
This repository has been archived by the owner on Nov 13, 2024. It is now read-only.

Commit

Permalink
Migrate to Latest XCode, latest iOS, and switch to iPhone 15 for tests (
Browse files Browse the repository at this point in the history
  • Loading branch information
scottasoutherland authored Nov 14, 2023
1 parent 1697647 commit 9e39f47
Show file tree
Hide file tree
Showing 590 changed files with 38 additions and 38 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ on: push
jobs:
test:
name: Run tests
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
# Adding additional destinations, schemes, etc. here will make GitHub run the steps
# on all combinations of them (e.g., if there are 2 destinations and 2 schemes, the
# test suite will get run 4 times).
destination: ["platform=iOS Simulator,OS=16.1,name=iPhone 8"]
destination: ["platform=iOS Simulator,OS=17.0.1,name=iPhone 15"]
scheme: ["Thumbprint"]
xcode: ["/Applications/Xcode_14.1.app"]
xcode: ["/Applications/Xcode_15.0.1.app"]
steps:
- name: 📥 Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:
jobs:
release:
name: Publish SPM
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
xcode: ["/Applications/Xcode_14.1.app"]
xcode: ["/Applications/Xcode_15.0.1.app"]
steps:
- name: 📥 Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
--self init-only
--enable redundantVoidReturnType
--enable semicolons
--enable sortedImports
--enable sortImports
--enable spaceAroundBraces
--enable spaceAroundBrackets
--enable spaceAroundComments
Expand Down
24 changes: 12 additions & 12 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
"state" : {
"revision" : "eee9ad754926c40a0f7e73f152357d37b119b7fa",
"version" : "1.7.1"
"revision" : "32f641cf24fc7abc1c591a2025e9f2f572648b0f",
"version" : "1.7.2"
}
},
{
Expand Down Expand Up @@ -50,35 +50,35 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
"state" : {
"revision" : "cef5b3f6f11781dd4591bdd1dd0a3d22bd609334",
"version" : "1.11.0"
"revision" : "bb0ea08db8e73324fe6c3727f755ca41a23ff2f4",
"version" : "1.14.2"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"state" : {
"revision" : "27cd6190ce0628847a3f8050794d6e627ad79c08",
"version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-05-02-a"
"revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
"version" : "509.0.0"
}
},
{
"identity" : "swiftformat",
"kind" : "remoteSourceControl",
"location" : "https://github.com/nicklockwood/SwiftFormat",
"state" : {
"revision" : "f9dc4ddc78ef09d58abb0f5aa8fb855282f4dfaa",
"version" : "0.51.10"
"revision" : "d37a477177d5d4ff2a3ae6328eaaab5bf793e702",
"version" : "0.52.9"
}
},
{
"identity" : "swiftlint",
"kind" : "remoteSourceControl",
"location" : "https://github.com/realm/SwiftLint.git",
"state" : {
"revision" : "34f5ffa7f706ed2dfe11bd300e5197e8878e3856",
"version" : "0.52.2"
"revision" : "6d2e58271ebc14c37bf76d7c9f4082cc15bad718",
"version" : "0.53.0"
}
},
{
Expand Down Expand Up @@ -122,8 +122,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams.git",
"state" : {
"revision" : "f47ba4838c30dbd59998a4e4c87ab620ff959e8a",
"version" : "5.0.5"
"revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
"version" : "5.0.6"
}
}
],
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/SnapKit/SnapKit.git", exact: "5.6.0"),
.package(url: "https://github.com/thumbtack/TTCalendarPicker.git", exact: "0.2.0"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", exact: "1.11.0"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", exact: "1.14.2"),
.package(url: "https://github.com/thumbtack/thumbprint-tokens.git", exact: "13.0.1"),
.package(url: "https://github.com/realm/SwiftLint.git", exact: "0.52.2"),
.package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.51.10"),
.package(url: "https://github.com/realm/SwiftLint.git", exact: "0.53.0"),
.package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.52.9"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
18 changes: 9 additions & 9 deletions Sources/Thumbprint/Components/Avatar.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ public final class Avatar: UIView {

// Internal

internal struct EmptyTheme {
struct EmptyTheme {
let textColor: UIColor
let backgroundColor: UIColor
}

internal static let styles = [
static let styles = [
EmptyTheme(textColor: Color.indigo600, backgroundColor: Color.indigo100),
EmptyTheme(textColor: Color.green600, backgroundColor: Color.green100),
EmptyTheme(textColor: Color.yellow600, backgroundColor: Color.yellow100),
Expand All @@ -91,27 +91,27 @@ public final class Avatar: UIView {
EmptyTheme(textColor: Color.blue600, backgroundColor: Color.blue100),
]

internal static func backgroundColor(initials: String?) -> EmptyTheme {
static func backgroundColor(initials: String?) -> EmptyTheme {
guard let initialCharacter = initials?.first,
let charValue = initialCharacter.asciiValue else {
return EmptyTheme(textColor: Color.black, backgroundColor: Color.gray200)
}
return Avatar.styles[Int(charValue) % styles.count]
}

internal var size: Avatar.Size {
var size: Avatar.Size {
didSet {
updateSize()
}
}

internal var emptyTheme: Avatar.EmptyTheme {
var emptyTheme: Avatar.EmptyTheme {
didSet {
updateStyle()
}
}

internal var image: UIImage? {
var image: UIImage? {
get {
imageView.image
}
Expand All @@ -121,7 +121,7 @@ public final class Avatar: UIView {
}
}

internal init(size: Size) {
init(size: Size) {
self.size = size
self.emptyTheme = Avatar.backgroundColor(initials: "")

Expand All @@ -137,7 +137,7 @@ public final class Avatar: UIView {
}

// Avatar - private
internal let label = UILabel()
let label = UILabel()
private let imageView = UIImageView()

private func setupViews() {
Expand Down Expand Up @@ -168,7 +168,7 @@ public final class Avatar: UIView {
}
}

internal class OnlineBadgeView: UIView {
class OnlineBadgeView: UIView {
let fillView = UIView()

override init(frame: CGRect) {
Expand Down
4 changes: 2 additions & 2 deletions Sources/Thumbprint/Components/Radio.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public final class Radio: Control, UIContentSizeCategoryAdjusting {
}

// MARK: - Internal Implementation
internal let radioImage = RadioImage()
let radioImage = RadioImage()

// MARK: - Private Implementation
private let containerView = UIView()
Expand Down Expand Up @@ -215,7 +215,7 @@ public final class Radio: Control, UIContentSizeCategoryAdjusting {
}

// MARK: - RadioImage
internal class RadioImage: UIView {
class RadioImage: UIView {
override var intrinsicContentSize: CGSize {
Self.backgroundFillImage?.size ?? super.intrinsicContentSize
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ open class PartialSheetPresentationController: UIPresentationController {

private var currentTransitionCoordinator: UIViewControllerTransitionCoordinator?

internal let backgroundTapGestureRecognizer = UITapGestureRecognizer()
internal let panGestureRecognizer = UIPanGestureRecognizer()
let backgroundTapGestureRecognizer = UITapGestureRecognizer()
let panGestureRecognizer = UIPanGestureRecognizer()

public var partialSheetDelegate: PartialSheetPresentationControllerDelegate? {
get {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9e39f47

Please sign in to comment.