diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 87fb00565..31c6cf87b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,7 +1,11 @@ --- layout: page title: Swift Contributors -permalink: /CONTRIBUTORS + +# Weirdly, CONTRIBUTORS.md is getting rendered as CONTROBUTORS.html. +# That permalink setting, though, is getting rendered in it's rel=canonical, +# and we don't want it to be broken. +permalink: /CONTRIBUTORS.html --- {% include_relative CONTRIBUTORS.txt %} diff --git a/Gemfile b/Gemfile index 8c1ceb7e7..419277678 100644 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,8 @@ source 'https://rubygems.org' gem 'jekyll', '~> 4.2.1' gem 'jekyll-redirect-from' +# html-proofer checks for broken links. +# used in docker-compose.yml test job +gem 'html-proofer' + gem "webrick", "~> 1.7" diff --git a/Gemfile.lock b/Gemfile.lock index 2964a3c93..499672dac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,44 @@ GEM remote: https://rubygems.org/ specs: + Ascii85 (1.1.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + afm (0.2.2) + async (2.6.4) + console (~> 1.10) + fiber-annotation + io-event (~> 1.1) + timers (~> 4.1) colorator (1.1.0) concurrent-ruby (1.1.10) + console (1.23.2) + fiber-annotation + fiber-local em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) ffi (1.15.5) + fiber-annotation (0.2.0) + fiber-local (1.0.0) forwardable-extended (2.6.0) + hashery (2.1.2) + html-proofer (5.0.8) + addressable (~> 2.3) + async (~> 2.1) + nokogiri (~> 1.13) + pdf-reader (~> 2.11) + rainbow (~> 3.0) + typhoeus (~> 1.3) + yell (~> 2.0) + zeitwerk (~> 2.5) http_parser.rb (0.8.0) i18n (1.10.0) concurrent-ruby (~> 1.0) + io-event (1.3.2) jekyll (4.2.2) addressable (~> 2.4) colorator (~> 1.0) @@ -44,26 +69,44 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) + pdf-reader (2.11.0) + Ascii85 (~> 1.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk public_suffix (4.0.7) + racc (1.7.1) + rainbow (3.1.1) rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) rouge (3.28.0) + ruby-rc4 (0.1.5) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) + timers (4.3.5) + ttfunk (1.7.0) + typhoeus (1.4.0) + ethon (>= 0.9.0) unicode-display_width (1.8.0) webrick (1.7.0) + yell (2.2.2) + zeitwerk (2.6.11) PLATFORMS ruby DEPENDENCIES + html-proofer jekyll (~> 4.2.1) jekyll-redirect-from webrick (~> 1.7) diff --git a/_data/go_further.yml b/_data/go_further.yml index b63373873..589b699a0 100644 --- a/_data/go_further.yml +++ b/_data/go_further.yml @@ -3,6 +3,7 @@ content_type: article content_url: /documentation/articles/value-and-reference-types.html thumbnail_url: #TBD + thumbnail_alt: release_date: 2023-04-29 external: false - title: "Generics" @@ -10,6 +11,7 @@ content_type: video content_url: https://developer.apple.com/videos/play/wwdc2022/110352/ thumbnail_url: /assets/images/getting-started/swift-generics-thumbnail.jpg + thumbnail_alt: "A block thumbnail image with three emoji icons: a femail farmer, a cow, and a carrot." release_date: 2021-06-09 external: true - title: "Concurrency" @@ -17,6 +19,8 @@ content_type: video content_url: https://developer.apple.com/videos/play/wwdc2021/10132/ thumbnail_url: /assets/images/getting-started/meet-async-await-thumbnail.jpg + thumbnail_alt: | + A thumbnail image describing a concurrent sequence diagram with five blocks: green into yellow into purple into another yello into another green. release_date: 2021-06-08 external: true - title: "Regular Expressions" @@ -24,6 +28,7 @@ content_type: video content_url: https://developer.apple.com/videos/play/wwdc2022/110357/ thumbnail_url: /assets/images/getting-started/regular-expression-thumbnail.jpg + thumbnail_alt: "An image describing a block of code about Regular Expression syntax." release_date: 2022-06-07 external: true \ No newline at end of file diff --git a/_data/navigation.yml b/_data/navigation.yml index 5dab231bb..137841426 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -199,7 +199,7 @@ - title: Blog Post Contributions name: website-and-blog-post-contributions - title: Swift Evolution - name: evolution-process + name: swift-evolution - title: Good First Issues name: good-first-issues - title: Contributing Code diff --git a/_includes/footer.html b/_includes/footer.html index 48b9c2549..287580085 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,8 +4,8 @@

Copyright © {{ site.time | date: '%Y' }} Apple Inc. All rights reserved.

Swift and the Swift logo are trademarks of Apple Inc.

- Privacy Policy - Cookies + Privacy Policy + Cookies

diff --git a/_posts/2015-12-03-swift-3-api-design.md b/_posts/2015-12-03-swift-3-api-design.md index 04bc7ebc1..73a5a7b76 100644 --- a/_posts/2015-12-03-swift-3-api-design.md +++ b/_posts/2015-12-03-swift-3-api-design.md @@ -73,5 +73,5 @@ list](/community/#swift-evolution). [clang-importer-proposal]: https://github.com/apple/swift-evolution/blob/master/proposals/0005-objective-c-name-translation.md "Better Translation of Objective-C APIs into Swift proposal" [swift-3-api-guidelines-repo]: https://github.com/apple/swift-3-api-guidelines-review "Swift 3 API Design Guidelines review repository" [objc-cocoa-guidelines]: https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CodingGuidelines/CodingGuidelines.html "Objective-C Coding Guidelines for Cocoa" -[swift-evolution]: /contributing/#evolution-process "Swift evolution process" +[swift-evolution]: /contributing/#swift-evolution "Swift evolution process" [core-libraries]: /core-libraries "Swift core libraries" diff --git a/_posts/2015-12-03-welcome.md b/_posts/2015-12-03-welcome.md index 4c154ea70..d627ed2cf 100644 --- a/_posts/2015-12-03-welcome.md +++ b/_posts/2015-12-03-welcome.md @@ -40,7 +40,7 @@ This website is the home of the Swift project with links to the resources you wi * The [Swift mailing lists](/community/#mailing-lists) are how we interact * The [Getting Started](/getting-started/) pages will help you setup a Swift development environment * The [Download](/download/) page includes pre-built binaries for the supported platforms -* The [Swift Evolution Process](/contributing/#evolution-process) describes how new features are proposed +* The [Swift Evolution Process](/contributing/#swift-evolution) describes how new features are proposed Welcome to the open source Swift community. diff --git a/_posts/2016-03-21-swift-2.2-released.md b/_posts/2016-03-21-swift-2.2-released.md index 06d3a84ac..228bc195e 100644 --- a/_posts/2016-03-21-swift-2.2-released.md +++ b/_posts/2016-03-21-swift-2.2-released.md @@ -38,7 +38,7 @@ Official binaries for Ubuntu 14.04 and Ubuntu 15.10 are [available for download] #### Apple (Xcode) -For development on Apple's platforms, Swift 2.2 ships as part of [Xcode 7.3](https://developer.apple.com/xcode/download/). +For development on Apple's platforms, Swift 2.2 ships as part of [Xcode 7.3](https://developer.apple.com/download/all/?q=xcode). ### Sources diff --git a/_posts/2021-02-22-black-history-month.md b/_posts/2021-02-22-black-history-month.md index 5959bcffe..764226cc7 100644 --- a/_posts/2021-02-22-black-history-month.md +++ b/_posts/2021-02-22-black-history-month.md @@ -13,7 +13,7 @@ There are many Black developers in the Swift community creating educational reso ## Pushing Swift in new directions -[Marc Aupont](https://twitter.com/digimarktech) is pushing the boundaries of the Swift ecosystem by using Swift in embedded systems. Learn about how Marc built a robot car using a Raspberry Pi running Swift in his talk from try! Swift NYC 2019: [Swift Without Screens - Powering Connected Devices](https://www.youtube.com/watch?v=VILUaec-sCs). Marc goes into greater detail on writing Swift code for Raspberry Pi in the iPhreaks podcast episode: [iPS 296: Swift on Raspberry PI](https://devchat.tv/iphreaks/ips-296-swift-on-raspberry-pi-with-marc-aupont/). +[Marc Aupont](https://twitter.com/digimarktech) is pushing the boundaries of the Swift ecosystem by using Swift in embedded systems. Learn about how Marc built a robot car using a Raspberry Pi running Swift in his talk from try! Swift NYC 2019: [Swift Without Screens - Powering Connected Devices](https://www.youtube.com/watch?v=VILUaec-sCs). Marc goes into greater detail on writing Swift code for Raspberry Pi in the iPhreaks podcast episode: [iPS 296: Swift on Raspberry PI](https://podcasts.apple.com/pl/podcast/ips-296-swift-on-raspberry-pi-with-marc-aupont/id634022060?i=1000480314894). [Ish ShaBazz](https://twitter.com/ishabazz) is presenting the Swift community with a different perspective by emphasizing the human side of programming. In his powerful talk from SwiftFest Boston 2019, [Programming with a Purpose](https://www.youtube.com/watch?v=M-7DQJbMapI&feature=youtu.be), Ish tells his inspirational story of how he discovered his purpose, and the valuable lessons he learned along the way, including conquering imposter syndrome with curiosity, and overcoming fear in programming, public speaking, and life. @@ -25,4 +25,4 @@ To help young readers discover books written by and featuring people of color, [ ## Join in on the celebration! -We are grateful for the perspectives, resources, and innovation that the Black community has brought to Swift. Please join in on the Black History Month celebration over on the [Community Showcase forum](https://forums.swift.org/c/community-showcase/) and share how the Black community has made a positive impact on your journey with Swift. If you are a member of the Black Swift community, we highly encourage you to [join Black in Swift](/diversity/#community-groups) to connect with others in the community! \ No newline at end of file +We are grateful for the perspectives, resources, and innovation that the Black community has brought to Swift. Please join in on the Black History Month celebration over on the [Community Showcase forum](https://forums.swift.org/c/community-showcase/) and share how the Black community has made a positive impact on your journey with Swift. If you are a member of the Black Swift community, we highly encourage you to [join Black in Swift](/diversity/#community-groups) to connect with others in the community! diff --git a/_posts/2023-03-30-swift-5.8-released.md b/_posts/2023-03-30-swift-5.8-released.md index bff22bb7f..bfb36786b 100644 --- a/_posts/2023-03-30-swift-5.8-released.md +++ b/_posts/2023-03-30-swift-5.8-released.md @@ -6,7 +6,7 @@ title: Swift 5.8 Released! author: [alexandersandberg] --- -Swift 5.8 is now officially released! 🎉 This release includes major additions to the [language and standard library](#language-and-standard-library), including `hasFeature` to support piecemeal adoption of upcoming features, an improved [developer experience](#developer-experience), improvements to tools in the Swift ecosystem including [Swift-DocC](#swift-docc), [Swift Package Manager](#swift-package-manager), and [SwiftSyntax](#swiftsyntax), refined [Windows support](#windows-platform), and more. +Swift 5.8 is now officially released! 🎉 This release includes major additions to the [language and standard library]({% link _posts/2023-03-30-swift-5.8-released.md%}#language-and-standard-library), including `hasFeature` to support piecemeal adoption of upcoming features, an improved [developer experience](#developer-experience), improvements to tools in the Swift ecosystem including [Swift-DocC](#swift-docc), [Swift Package Manager](#swift-package-manager), and [SwiftSyntax](#swiftsyntax), refined [Windows support](#windows-platform), and more. Thank you to everyone in the Swift community who made this release possible. Your Swift Forums discussions, bug reports, pull requests, educational content, and other contributions are always appreciated! diff --git a/community/index.md b/community/index.md index 192e33590..ea6725f3c 100644 --- a/community/index.md +++ b/community/index.md @@ -59,7 +59,7 @@ The current Core Team members are: [Contact via Forums](https://forums.swift.org/new-message?groupname=language-workgroup) -The Language Steering Group comprises experts that the Swift Project Lead and the Core Team have identified as possessing a balance of perspectives and expertise to review, guide, and strategically align changes to the language mindfully. The Language Steering Group reviews and helps iterate [language evolution proposals](/contributing/#evolution-process) from the community, acting as the approver of these proposals. Workgroup members help drive the Swift language forward coherently to create the best possible general-purpose programming language. The Language Steering Group membership is expected to change over time. +The Language Steering Group comprises experts that the Swift Project Lead and the Core Team have identified as possessing a balance of perspectives and expertise to review, guide, and strategically align changes to the language mindfully. The Language Steering Group reviews and helps iterate [language evolution proposals](/contributing/#swift-evolution) from the community, acting as the approver of these proposals. Workgroup members help drive the Swift language forward coherently to create the best possible general-purpose programming language. The Language Steering Group membership is expected to change over time. The current Language Steering Group members are: diff --git a/contributing/_swift-evolution-process.md b/contributing/_swift-evolution-process.md index bd1684f1b..31f11bb74 100644 --- a/contributing/_swift-evolution-process.md +++ b/contributing/_swift-evolution-process.md @@ -1,5 +1,3 @@ - - ## Swift Evolution Shaping the future of Swift is a community effort that anyone can participate in via the [Evolution section of the Swift forums][swift-evolution-forums]. diff --git a/docker-compose.yaml b/docker-compose.yaml index be16897f9..5d8d995bf 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -45,6 +45,14 @@ services: && bundle exec jekyll doctor --source /srv/jekyll --destination /output && bundle exec jekyll build --source /srv/jekyll --destination /output" + check-links: + <<: *common + command: /bin/bash -cl "/code/scripts/check_links.sh" + volumes: + - .:/srv/jekyll:cached + - ./.output:/output:z + - .:/code:z + website: <<: *common command: /bin/bash -cl "bundle check && bundle exec jekyll serve --source /srv/jekyll --destination /output --host 0.0.0.0 --watch" diff --git a/download/_older-previews.md b/download/_older-previews.md index 45f4fd473..07d21d729 100644 --- a/download/_older-previews.md +++ b/download/_older-previews.md @@ -14,7 +14,7 @@ - Xcode 8.0 beta* + Xcode 8.0 beta* @@ -40,7 +40,7 @@ - Xcode 8.0 beta 2* + Xcode 8.0 beta 2* @@ -67,7 +67,7 @@ - Xcode 8.0 beta 3* + Xcode 8.0 beta 3* Toolchain Debugging Symbols @@ -96,7 +96,7 @@ - Xcode 8.0 beta 4* + Xcode 8.0 beta 4* Toolchain Debugging Symbols @@ -125,7 +125,7 @@ - Xcode 8.0 beta 5* + Xcode 8.0 beta 5* Toolchain Debugging Symbols @@ -154,7 +154,7 @@ - Xcode 8.0 beta 6* + Xcode 8.0 beta 6* Toolchain Debugging Symbols @@ -183,7 +183,7 @@ - Xcode 8.0 GM Seed* + Xcode 8.0 GM Seed* Toolchain Debugging Symbols @@ -215,7 +215,7 @@ - Xcode 8.1 beta* + Xcode 8.1 beta* Toolchain Debugging Symbols @@ -245,7 +245,7 @@ - Xcode 8.1 beta 2* + Xcode 8.1 beta 2* Toolchain Debugging Symbols @@ -275,7 +275,7 @@ - Xcode 8.1 beta 3* + Xcode 8.1 beta 3* Toolchain Debugging Symbols @@ -305,7 +305,7 @@ - Xcode 8.1 GM Seed* + Xcode 8.1 GM Seed* Toolchain Debugging Symbols @@ -338,7 +338,7 @@ - Xcode 8.2 beta 2* + Xcode 8.2 beta 2* Toolchain Debugging Symbols @@ -352,4 +352,4 @@ *Swift 3.0.2 Preview 1 is available as part of Xcode 8.2 beta 2. - \ No newline at end of file + diff --git a/download/_older-releases.md b/download/_older-releases.md index 2434e5322..577ea3022 100644 --- a/download/_older-releases.md +++ b/download/_older-releases.md @@ -1981,7 +1981,7 @@ Tag: s - Xcode 7.3.1 1 + Xcode 7.3.1 1 @@ -2006,7 +2006,7 @@ Tag: s - Xcode 7.3 1 + Xcode 7.3 1 diff --git a/getting-started/_go-further.md b/getting-started/_go-further.md index 687076491..57bdc4cac 100644 --- a/getting-started/_go-further.md +++ b/getting-started/_go-further.md @@ -6,9 +6,9 @@ Ready to dive deeper? Here are some hand-picked resources covering various Swift {% for resource in site.data.go_further %}
  • {% if resource.thumbnail_url %} - + {{ resource.thumbnail_alt }} {% elsif resource.content_type == "article" %} - + An article icon {% endif %}

    {{ resource.title }}

    diff --git a/index.md b/index.md index 2a21d7cf7..f2f989047 100644 --- a/index.md +++ b/index.md @@ -30,14 +30,14 @@ atom: true
  • - + An icon image with a sign post and two signs pointing in opposite directions. Get started
  • - + An icon image with an open book. Read the docs
    • diff --git a/migration-guide-swift3/se-0107-migrate.md b/migration-guide-swift3/se-0107-migrate.md index edc25fecc..06bd1b68e 100644 --- a/migration-guide-swift3/se-0107-migrate.md +++ b/migration-guide-swift3/se-0107-migrate.md @@ -345,7 +345,7 @@ extension String { The above techniques all copy the string representation. If the goal is interoperability between the two types of C strings without copying the String, then it is necessary to bind memory to the correct type -each time the String is accessed, as described in [UnsafeRawPointer.bindMemory(to:capacity:)](unsafeRawPointer.bindMemory(to:capacity:)). +each time the String is accessed, as described in [UnsafeRawPointer.bindMemory(to:capacity:)](#unsaferawpointerbindmemorytocapacity). ### Untyped Buffers ("raw" vs. UInt8) diff --git a/scripts/check_links.sh b/scripts/check_links.sh new file mode 100755 index 000000000..a90fc6b13 --- /dev/null +++ b/scripts/check_links.sh @@ -0,0 +1,16 @@ +set -eu +here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd "$here/.." + +bundle check +bundle exec jekyll build --source /srv/jekyll --destination /output + +# This line runs broken link checks: https://github.com/gjtorikian/html-proofer +bundle exec htmlproofer \ + --ignore-status-codes "429" \ + --allow-missing-href \ + --only-4xx \ + --no-enforce-https \ + --no-check-external-hash \ + --ignore-urls "/twitter.com/,/github.com/,/swift.org/404.html/" \ + /output