Skip to content

Commit 132f12a

Browse files
CSolanaMCSolanaM
authored
Merge pull request #35 from CSolanaM/release/1.0.7
[SU-RELEASE] 1.0.7
2 parents 1ccb7ea + 47ffe11 commit 132f12a

File tree

131 files changed

+52
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+52
-48
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: push
33
jobs:
44
build:
55
name: build
6-
runs-on: macOS-latest
6+
runs-on: macOS-11
77
steps:
88
- name: checkout
99
uses: actions/checkout@master

‎.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: push
33
jobs:
44
build:
55
name: test
6-
runs-on: macOS-latest
6+
runs-on: macOS-11
77
steps:
88
- name: checkout
99
uses: actions/checkout@master
@@ -12,7 +12,7 @@ jobs:
1212
# TODO: @CSolanaM macOS tests not passing because CI screen scale factor is 1, local is 2
1313
# xcodebuild test -destination platform="macOS" -scheme "SkeletonUISnapshotTests"
1414
xcodebuild test -destination name="Apple TV" -scheme "SkeletonUISnapshotTests"
15-
xcodebuild test -destination name="Apple TV 4K" -scheme "SkeletonUISnapshotTests"
15+
xcodebuild test -destination name="Apple TV 4K (2nd generation)" -scheme "SkeletonUISnapshotTests"
1616
xcodebuild test -destination name="iPhone 8" -scheme "SkeletonUISnapshotTests"
17-
xcodebuild test -destination name="iPhone 11 Pro Max" -scheme "SkeletonUISnapshotTests"
18-
xcodebuild test -destination name="iPad Pro (12.9-inch) (4th generation)" -scheme "SkeletonUISnapshotTests"
17+
xcodebuild test -destination name="iPhone 13 Pro Max" -scheme "SkeletonUISnapshotTests"
18+
xcodebuild test -destination name="iPad Pro (12.9-inch) (5th generation)" -scheme "SkeletonUISnapshotTests"

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions

‎Examples/SkeletonUI-watchOS/SkeletonUI-watchOS.xcodeproj/xcshareddata/xcschemes/SkeletonUI-watchOS.xcscheme

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,46 +54,33 @@
5454
debugDocumentVersioning = "YES"
5555
debugServiceExtension = "internal"
5656
allowLocationSimulation = "YES">
57-
<RemoteRunnable
58-
runnableDebuggingMode = "2"
59-
BundleIdentifier = "com.apple.Carousel"
60-
RemotePath = "/SkeletonUI-watchOS WatchKit App">
57+
<BuildableProductRunnable
58+
runnableDebuggingMode = "0">
6159
<BuildableReference
6260
BuildableIdentifier = "primary"
6361
BlueprintIdentifier = "87A5D90D230803F50096BD32"
6462
BuildableName = "SkeletonUI-watchOS WatchKit App.app"
6563
BlueprintName = "SkeletonUI-watchOS WatchKit App"
6664
ReferencedContainer = "container:SkeletonUI-watchOS.xcodeproj">
6765
</BuildableReference>
68-
</RemoteRunnable>
66+
</BuildableProductRunnable>
6967
</LaunchAction>
7068
<ProfileAction
7169
buildConfiguration = "Release"
7270
shouldUseLaunchSchemeArgsEnv = "YES"
7371
savedToolIdentifier = ""
7472
useCustomWorkingDirectory = "NO"
7573
debugDocumentVersioning = "YES">
76-
<RemoteRunnable
77-
runnableDebuggingMode = "2"
78-
BundleIdentifier = "com.apple.Carousel"
79-
RemotePath = "/SkeletonUI-watchOS WatchKit App">
74+
<BuildableProductRunnable
75+
runnableDebuggingMode = "0">
8076
<BuildableReference
8177
BuildableIdentifier = "primary"
8278
BlueprintIdentifier = "87A5D90D230803F50096BD32"
8379
BuildableName = "SkeletonUI-watchOS WatchKit App.app"
8480
BlueprintName = "SkeletonUI-watchOS WatchKit App"
8581
ReferencedContainer = "container:SkeletonUI-watchOS.xcodeproj">
8682
</BuildableReference>
87-
</RemoteRunnable>
88-
<MacroExpansion>
89-
<BuildableReference
90-
BuildableIdentifier = "primary"
91-
BlueprintIdentifier = "87A5D90D230803F50096BD32"
92-
BuildableName = "SkeletonUI-watchOS WatchKit App.app"
93-
BlueprintName = "SkeletonUI-watchOS WatchKit App"
94-
ReferencedContainer = "container:SkeletonUI-watchOS.xcodeproj">
95-
</BuildableReference>
96-
</MacroExpansion>
83+
</BuildableProductRunnable>
9784
</ProfileAction>
9885
<AnalyzeAction
9986
buildConfiguration = "Debug">

‎Examples/SkeletonUI.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let package = Package(
1717
)
1818
],
1919
dependencies: [
20-
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.8.2")
20+
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.9.0")
2121
],
2222
targets: [
2323
.target(

‎Scripts/run-snapshot-tests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ readonly root_directory=`"${scripts_path}/repository-root-path"`
1111
cd "${root_directory}"
1212

1313
xcodebuild test -destination name="Apple TV" -scheme "SkeletonUISnapshotTests"
14-
xcodebuild test -destination name="Apple TV 4K" -scheme "SkeletonUISnapshotTests"
14+
xcodebuild test -destination name="Apple TV 4K (2nd generation)" -scheme "SkeletonUISnapshotTests"
1515
xcodebuild test -destination name="iPhone 8" -scheme "SkeletonUISnapshotTests"
16-
xcodebuild test -destination name="iPhone 11 Pro Max" -scheme "SkeletonUISnapshotTests"
17-
xcodebuild test -destination name="iPad Pro (12.9-inch) (3rd generation)" -scheme "SkeletonUISnapshotTests"
16+
xcodebuild test -destination name="iPhone 13 Pro Max" -scheme "SkeletonUISnapshotTests"
17+
xcodebuild test -destination name="iPad Pro (12.9-inch) (5th generation)" -scheme "SkeletonUISnapshotTests"

‎SkeletonUI.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'SkeletonUI'
3-
s.version = '1.0.6'
3+
s.version = '1.0.7'
44
s.summary = 'Elegant skeleton loading animation in SwiftUI and Combine'
55
s.description = <<-DESC
66
SkeletonUI aims to bring an elegant, declarative syntax to skeleton loading animations. Get rid of loading screens or spinners and start using skeletons to represent final content shapes

‎Sources/SkeletonUI/Extensions/View+SkeletonModifier.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import SwiftUI
22

33
@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
44
public extension View {
5-
func skeleton(with loading: Bool, transition: AnyTransition? = nil, animated: Animation? = nil) -> ModifiedContent<Self, SkeletonModifier> {
6-
modifier(SkeletonModifier(skeleton: SkeletonInteractor(loading, transition: transition, animated: animated)))
5+
func skeleton(with loading: Bool, size: CGSize? = .none, transition: AnyTransition? = nil, animated: Animation? = nil) -> ModifiedContent<Self, SkeletonModifier> {
6+
modifier(SkeletonModifier(skeleton: SkeletonInteractor(loading, size: size, transition: transition, animated: animated)))
77
}
88
}

‎Sources/SkeletonUI/Modifiers/SkeletonModifier.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public struct SkeletonModifier: ViewModifier {
3131
}
3232
}
3333
}
34+
.frame(width: skeleton.presenter.size?.width, height: skeleton.presenter.size?.height)
3435
.transition(skeleton.presenter.transition)
3536
} else {
3637
content

0 commit comments

Comments
 (0)