Skip to content

Commit 65d0084

Browse files
Fix broken documentation (#2278)
~When looking at the documentation at SPI for this package, I noticed that the latest published `1.X` release is `1.24.2`, https://swiftpackageindex.com/grpc/grpc-swift/1.24.2/documentation/grpc. I'm not sure if this is because stops tracking previous major versions, once a newer major has been released (notice that `1.24.2` was the last `1.X` release before `2.0.0`), or if there's some issue with the newer `1.X` releases? For example, `GRPCCore` is listed in `spi.yml`, but that target doesn't exist on `1.X`. See #2279 The documentation for this package contains a few broken links, both internal and external. I updated all broken links, except for https://github.com/grpc/grpc-swift/blob/release/1.x/docs/faqs.md?plain=1#L157 which points to a file that doesn't exist. I also removed non-existing target `GRPCCore` from `.spi.yml`, and added a link to SPI in the README. Last, I removed some unused markdown links. Co-authored-by: George Barnett <gbarnett@apple.com>
1 parent dc98750 commit 65d0084

8 files changed

Lines changed: 19 additions & 26 deletions

File tree

.spi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
version: 1
22
builder:
33
configs:
4-
- documentation_targets: [GRPC, GRPCReflectionService, protoc-gen-grpc-swift, GRPCCore]
4+
- documentation_targets: [GRPC, GRPCReflectionService, protoc-gen-grpc-swift]

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
This repository contains a gRPC code generator and runtime libraries for Swift.
44
You can read more about gRPC on the [gRPC project's website][grpcio].
5+
Documentation is available on the [Swift Package Index][spi-grpc-swift].
56

67
> [!IMPORTANT]
78
>
@@ -39,4 +40,4 @@ Please get involved! See our [guidelines for contributing](CONTRIBUTING.md).
3940

4041
[gh-grpc]: https://github.com/grpc/grpc
4142
[grpcio]: https://grpc.io
42-
[spi-grpc-swift-main]: https://swiftpackageindex.com/grpc/grpc-swift/main/documentation/grpccore
43+
[spi-grpc-swift]: https://swiftpackageindex.com/grpc/grpc-swift/release-1.x/documentation

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ with the [details usually included with bug reports][issue-template].
3939
and the [SSWG][sswg] will announce the vulnerability on the [Swift
4040
forums][swift-forums-sec].
4141

42-
[issue-template]: https://github.com/grpc/grpc-swift/blob/main/.github/ISSUE_TEMPLATE/BUG_REPORT.md
42+
[issue-template]: https://github.com/grpc/grpc-swift/blob/release/1.x/.github/ISSUE_TEMPLATE/BUG_REPORT.md
4343
[sswg]: https://github.com/swift-server/sswg
4444
[sswg-security]: https://github.com/swift-server/sswg/blob/main/process/incubation.md#security-best-practices
4545
[swift-forums-sec]: https://forums.swift.org/c/server/security-updates/

Sources/GRPC/Docs.docc/index.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,14 @@ Some of the examples are accompanied by tutorials, including:
110110
- Support for Apple Platforms and NIO Transport Services in
111111
[`docs/apple-platforms.md`][docs-apple]
112112

113-
[docs-apple]: https://github.com/grpc/grpc-swift/tree/main/docs/apple-platforms.md
114-
[docs-plugin]: https://github.com/grpc/grpc-swift/tree/main/docs/plugin.md
115-
[docs-quickstart]: https://github.com/grpc/grpc-swift/tree/main/docs/quick-start.md
116-
[docs-tls]: https://github.com/grpc/grpc-swift/tree/main/docs/tls.md
117-
[docs-keepalive]: https://github.com/grpc/grpc-swift/tree/main/docs/keepalive.md
118-
[docs-tutorial]: https://github.com/grpc/grpc-swift/tree/main/docs/basic-tutorial.md
119-
[docs-interceptors-tutorial]: https://github.com/grpc/grpc-swift/tree/main/docs/interceptors-tutorial.md
120-
[grpc]: https://github.com/grpc/grpc
113+
[docs-apple]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/apple-platforms.md
114+
[docs-plugin]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/plugin.md
115+
[docs-quickstart]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/quick-start.md
116+
[docs-tls]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/tls.md
117+
[docs-keepalive]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/keepalive.md
118+
[docs-tutorial]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/basic-tutorial.md
119+
[docs-interceptors-tutorial]: https://github.com/grpc/grpc-swift/tree/release/1.x/docs/interceptors-tutorial.md
121120
[protobuf-releases]: https://github.com/protocolbuffers/protobuf/releases
122121
[swift-nio-platforms]: https://github.com/apple/swift-nio#supported-platforms
123-
[swift-nio]: https://github.com/apple/swift-nio
124122
[swift-protobuf]: https://github.com/apple/swift-protobuf
125-
[xcode-spm]: https://help.apple.com/xcode/mac/current/#/devb83d64851
126-
[branch-new]: https://github.com/grpc/grpc-swift/tree/main
127-
[branch-old]: https://github.com/grpc/grpc-swift/tree/cgrpc
128-
[examples]: https://github.com/grpc/grpc-swift/tree/main/Examples/v1
123+
[examples]: https://github.com/grpc/grpc-swift/tree/release/1.x/Examples/v1

Sources/GRPCReflectionService/Documentation.docc/ReflectionServiceTutorial.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,10 @@ Note that when specifying a service, a method or a symbol, we have to use the fu
217217
[grpcurl-setup]: https://github.com/fullstorydev/grpcurl#grpcurl
218218
[grpcurl]: https://github.com/fullstorydev/grpcurl
219219
[grpc-cli]: https://github.com/grpc/grpc/blob/master/doc/command_line_tool.md
220-
[v1]: ../v1/reflection-v1.proto
221-
[v1alpha]: ../v1Alpha/reflection-v1alpha.proto
222-
[reflection-server]: ../../Examples/v1/ReflectionService/ReflectionServer.swift
220+
[v1]: ../../../Protos/upstream/grpc/reflection/v1/reflection.proto
221+
[v1alpha]: ../../../Protos/upstream/grpc/reflection/v1alpha/reflection.proto
222+
[reflection-server]: ../../../Examples/v1/ReflectionService/ReflectionServer.swift
223223
[helloworld-proto]: ../../Examples/v1/HelloWorld/Model/helloworld.proto
224-
[echo-proto]: ../../Examples/v1/Echo/Model/echo.proto
225224
[grpcurl-v188]: https://github.com/fullstorydev/grpcurl/releases/tag/v1.8.8
226-
[swiftpm-resources]: https://github.com/apple/swift-package-manager/blob/main/Documentation/PackageDescription.md#resource
225+
[swiftpm-resources]: https://github.com/swiftlang/swift-package-manager/blob/main/Sources/Runtimes/PackageDescription/PackageDescription.docc/PackageDescription.md
227226
[spm-plugin]: ../../protoc-gen-grpc-swift/Docs.docc/spm-plugin.md

docs/basic-tutorial.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,5 +610,4 @@ Follow the instructions in the Route Guide example directory
610610
[routeguide-readme]: ../Examples/v1/RouteGuide/README.md
611611
[routeguide-source]: ../Examples/v1/RouteGuide
612612
[run-protoc]: ../Protos/generate.sh
613-
[swift-protobuf-guide]: https://github.com/apple/swift-protobuf/blob/main/Documentation/API.md
614613
[swift-protobuf]: https://github.com/apple/swift-protobuf

docs/plugin.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,5 @@ protoc <your proto> --grpc-swift_opt=Client=true,Server=false --grpc-swift_out=.
119119
```
120120

121121
[protocol-buffers]: https://developers.google.com/protocol-buffers/docs/overview
122-
[swift-protobuf-filenaming]: https://github.com/apple/swift-protobuf/blob/main/Documentation/PLUGIN.md#generation-option-filenaming---naming-of-generated-sources
123122
[swift-protobuf-module-mappings]: https://github.com/apple/swift-protobuf/blob/main/Documentation/PLUGIN.md#generation-option-protopathmodulemappings---swift-module-names-for-proto-paths
124123
[swift-protobuf-module-name]: https://github.com/apple/swift-protobuf/commit/9df381f72ff22062080d434e9c2f68e71ee44298#diff-1b08f0a80bd568509049d851b8d8af90d1f2db3cd8711eaba974b5380cd59bf3

docs/tls.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ a `String` using by using the UTF8 view on the string with the
9090
Refer to the [certificate][nio-ref-tlscert] or [private
9191
key][nio-ref-privatekey] documentation for more information.
9292

93-
[nio-ref-privatekey]: https://apple.github.io/swift-nio-ssl/docs/current/NIOSSL/Classes/NIOSSLPrivateKey.html
94-
[nio-ref-tlscert]: https://apple.github.io/swift-nio-ssl/docs/current/NIOSSL/Classes/NIOSSLCertificate.html
95-
[nio-ref-tlsconfig]: https://apple.github.io/swift-nio-ssl/docs/current/NIOSSL/Structs/TLSConfiguration.html
93+
[nio-ref-privatekey]: https://swiftpackageindex.com/apple/swift-nio-ssl/documentation/niossl/niosslprivatekey
94+
[nio-ref-tlscert]: https://swiftpackageindex.com/apple/swift-nio-ssl/documentation/niossl/niosslcertificate
95+
[nio-ref-tlsconfig]: https://swiftpackageindex.com/apple/swift-nio-ssl/documentation/niossl/tlsconfiguration

0 commit comments

Comments
 (0)