Skip to content

Commit f2f70f0

Browse files
tisohjungtisohjung
authored
Support swift-tool-version: 5.5 (#2)
* 🙈 undo Package.resolved * 📦 downgrade swift-tools-version: 5.5 * 🐛 fix main thread warning * 🔥 unused wrpExampleClient
1 parent ccaa933 commit f2f70f0

File tree

5 files changed

+243
-13
lines changed

5 files changed

+243
-13
lines changed

‎.gitignore

Lines changed: 95 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,98 @@
1+
# Created by https://www.toptal.com/developers/gitignore/api/swift,swiftpm
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=swift,swiftpm
3+
4+
### Swift ###
5+
# Xcode
6+
#
7+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
8+
9+
## User settings
10+
xcuserdata/
11+
12+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
13+
*.xcscmblueprint
14+
*.xccheckout
15+
16+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
17+
build/
18+
DerivedData/
19+
*.moved-aside
20+
*.pbxuser
21+
!default.pbxuser
22+
*.mode1v3
23+
!default.mode1v3
24+
*.mode2v3
25+
!default.mode2v3
26+
*.perspectivev3
27+
!default.perspectivev3
28+
29+
## Obj-C/Swift specific
30+
*.hmap
31+
32+
## App packaging
33+
*.ipa
34+
*.dSYM.zip
35+
*.dSYM
36+
37+
## Playgrounds
38+
timeline.xctimeline
39+
playground.xcworkspace
40+
41+
# Swift Package Manager
42+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
43+
# Packages/
44+
# Package.pins
45+
# Package.resolved
46+
# *.xcodeproj
47+
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
48+
# hence it is not needed unless you have added a package configuration file to your project
49+
# .swiftpm
50+
51+
.build/
52+
53+
# CocoaPods
54+
# We recommend against adding the Pods directory to your .gitignore. However
55+
# you should judge for yourself, the pros and cons are mentioned at:
56+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
57+
# Pods/
58+
# Add this line if you want to avoid checking in source code from the Xcode workspace
59+
# *.xcworkspace
60+
61+
# Carthage
62+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
63+
# Carthage/Checkouts
64+
65+
Carthage/Build/
66+
67+
# Accio dependency management
68+
Dependencies/
69+
.accio/
70+
71+
# fastlane
72+
# It is recommended to not store the screenshots in the git repo.
73+
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
74+
# For more information about the recommended setup visit:
75+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
76+
77+
fastlane/report.xml
78+
fastlane/Preview.html
79+
fastlane/screenshots/**/*.png
80+
fastlane/test_output
81+
82+
# Code Injection
83+
# After new code Injection tools there's a generated folder /iOSInjectionProject
84+
# https://github.com/johnno1962/injectionforxcode
85+
86+
iOSInjectionProject/
87+
88+
### SwiftPM ###
189
Packages
2-
.build
90+
xcuserdata
91+
*.xcodeproj
92+
93+
94+
# End of https://www.toptal.com/developers/gitignore/api/swift,swiftpm
95+
396
.DS_Store
4-
/*.xcodeproj
5-
DerivedData/
6-
Package.resolved
7-
.swiftpm
897
Tests/LinuxMain.swift
9-
.vscode
10-
xcuserdata/
98+
.vscode

‎Example/Wrp/WrpSample/WrpSampleReducer.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ extension WrpSampleReducer {
8888
.toPublisher()
8989
.map { Double($0.value) }
9090
.replaceError(with: 0.0)
91+
.receive(on: DispatchQueue.main)
9192
.catchToEffect()
9293
.map(WrpSampleAction.getSliderValueResult)
9394

‎Example/Wrp/WrpSample/WrpSampleTCAView.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ struct WrpSampleView: View {
1818
private let store: WrpSampleStore
1919

2020
let url: String = "https://pbkit.dev/wrp-example"
21-
@State var wrpExampleClient: Pbkit_Wrp_Example_WrpExampleServiceWrpClient!
2221

2322
init(store: WrpSampleStore) {
2423
self.viewStore = ViewStore(store)

‎Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
// swift-tools-version: 5.6
1+
// swift-tools-version: 5.5
22

33
import PackageDescription
44

55
let package = Package(
66
name: "wrp-swift",
77
platforms: [
88
.macOS(.v10_15),
9-
.iOS(.v13),
9+
.iOS(.v13)
1010
],
1111
products: [
12-
.library(name: "Wrp", targets: ["Wrp"]),
12+
.library(name: "Wrp", targets: ["Wrp"])
1313
],
1414
dependencies: [
1515
// GRPC library for protobuf serializer/deserializer
1616
.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.7.3"),
1717
// Protobuf library for en/decoding Wrp messages
1818
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.19.0"),
1919
// Swift logging API
20-
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
20+
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0")
2121
],
2222
targets: [
2323
.target(
@@ -32,6 +32,6 @@ let package = Package(
3232
.testTarget(
3333
name: "WrpTests",
3434
dependencies: ["Wrp"]
35-
),
35+
)
3636
]
3737
)

‎WrpSwift.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
{
2+
"object": {
3+
"pins": [
4+
{
5+
"package": "combine-schedulers",
6+
"repositoryURL": "https://github.com/pointfreeco/combine-schedulers",
7+
"state": {
8+
"branch": null,
9+
"revision": "0ba3a562716efabb585ccb169450c5389107286b",
10+
"version": "0.6.0"
11+
}
12+
},
13+
{
14+
"package": "grpc-swift",
15+
"repositoryURL": "https://github.com/grpc/grpc-swift",
16+
"state": {
17+
"branch": null,
18+
"revision": "593fe0fe931f7e838969243cd137be48e8055b1d",
19+
"version": "1.7.3"
20+
}
21+
},
22+
{
23+
"package": "swift-case-paths",
24+
"repositoryURL": "https://github.com/pointfreeco/swift-case-paths",
25+
"state": {
26+
"branch": null,
27+
"revision": "b4a872984463070c71e2e97e5c02c73a07d0fe36",
28+
"version": "0.9.0"
29+
}
30+
},
31+
{
32+
"package": "swift-collections",
33+
"repositoryURL": "https://github.com/apple/swift-collections",
34+
"state": {
35+
"branch": null,
36+
"revision": "48254824bb4248676bf7ce56014ff57b142b77eb",
37+
"version": "1.0.2"
38+
}
39+
},
40+
{
41+
"package": "swift-composable-architecture",
42+
"repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture",
43+
"state": {
44+
"branch": null,
45+
"revision": "c307541328a636b9e8e25ac868d89be54a8f8dbf",
46+
"version": "0.35.0"
47+
}
48+
},
49+
{
50+
"package": "swift-custom-dump",
51+
"repositoryURL": "https://github.com/pointfreeco/swift-custom-dump",
52+
"state": {
53+
"branch": null,
54+
"revision": "21ec1d717c07cea5a026979cb0471dd95c7087e7",
55+
"version": "0.5.0"
56+
}
57+
},
58+
{
59+
"package": "swift-identified-collections",
60+
"repositoryURL": "https://github.com/pointfreeco/swift-identified-collections",
61+
"state": {
62+
"branch": null,
63+
"revision": "2d6b7ffcc67afd9077fac5e5a29bcd6d39b71076",
64+
"version": "0.4.0"
65+
}
66+
},
67+
{
68+
"package": "swift-log",
69+
"repositoryURL": "https://github.com/apple/swift-log.git",
70+
"state": {
71+
"branch": null,
72+
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
73+
"version": "1.4.2"
74+
}
75+
},
76+
{
77+
"package": "swift-nio",
78+
"repositoryURL": "https://github.com/apple/swift-nio.git",
79+
"state": {
80+
"branch": null,
81+
"revision": "124119f0bb12384cef35aa041d7c3a686108722d",
82+
"version": "2.40.0"
83+
}
84+
},
85+
{
86+
"package": "swift-nio-extras",
87+
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
88+
"state": {
89+
"branch": null,
90+
"revision": "a75e92bde3683241c15df3dd905b7a6dcac4d551",
91+
"version": "1.12.1"
92+
}
93+
},
94+
{
95+
"package": "swift-nio-http2",
96+
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
97+
"state": {
98+
"branch": null,
99+
"revision": "108ac15087ea9b79abb6f6742699cf31de0e8772",
100+
"version": "1.22.0"
101+
}
102+
},
103+
{
104+
"package": "swift-nio-ssl",
105+
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
106+
"state": {
107+
"branch": null,
108+
"revision": "fd5f38b0039148e76c2e863a2fc868cc39bb451b",
109+
"version": "2.20.1"
110+
}
111+
},
112+
{
113+
"package": "swift-nio-transport-services",
114+
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
115+
"state": {
116+
"branch": null,
117+
"revision": "2cb54f91ddafc90832c5fa247faf5798d0a7c204",
118+
"version": "1.13.0"
119+
}
120+
},
121+
{
122+
"package": "SwiftProtobuf",
123+
"repositoryURL": "https://github.com/apple/swift-protobuf.git",
124+
"state": {
125+
"branch": null,
126+
"revision": "e1499bc69b9040b29184f7f2996f7bab467c1639",
127+
"version": "1.19.0"
128+
}
129+
},
130+
{
131+
"package": "xctest-dynamic-overlay",
132+
"repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
133+
"state": {
134+
"branch": null,
135+
"revision": "046aba2944a7e197e5dc070836f8fe2d47d0e471",
136+
"version": "0.3.2"
137+
}
138+
}
139+
]
140+
},
141+
"version": 1
142+
}

0 commit comments

Comments
 (0)