Skip to content

Commit 70519d3

Browse files
committed
Update to Swift 6.1/6.2 and current library versions
1 parent 6b1ca8a commit 70519d3

2 files changed

Lines changed: 14 additions & 37 deletions

File tree

.github/workflows/docc.yml

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
1515
cancel-in-progress: true
1616

17-
permissions:
18-
contents: read
19-
pages: write
20-
id-token: write
21-
2217
jobs:
2318
build-docc:
2419
name: Generate Documentation
@@ -53,28 +48,10 @@ jobs:
5348
--transform-for-static-hosting \
5449
--hosting-base-path ${{ github.event.repository.name }}
5550
56-
- name: Setup Pages
57-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
58-
uses: actions/configure-pages@v5
59-
60-
- name: Upload artifact
61-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
62-
uses: actions/upload-pages-artifact@v3
63-
with:
64-
path: docs
65-
66-
deploy-docc:
67-
name: Deploy Documentation
68-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
69-
environment:
70-
name: github-pages
71-
url: ${{ steps.deployment.outputs.page_url }}
72-
runs-on: ubuntu-latest
73-
needs: build-docc
74-
permissions:
75-
pages: write
76-
id-token: write
77-
steps:
7851
- name: Deploy to GitHub Pages
79-
id: deployment
80-
uses: actions/deploy-pages@v4
52+
if: github.event_name == 'push' && github.ref == 'refs/heads/development'
53+
uses: peaceiris/actions-gh-pages@v3
54+
with:
55+
github_token: ${{ secrets.GITHUB_TOKEN }}
56+
publish_dir: ./docs
57+
force_orphan: true

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ For up to date (auto-generated) reference documentation, see https://rhx.github.
1010

1111
* SwiftGLib 2.73 introduces typed convenience wrappers for GLib collection types such as `GArray`, `GByteArray`, `GList`, `GSList`, and `GSequence`.
1212

13-
* Version 15 of gir2swift provides a Package Manager Plugin. This requires Swift 5.6 or higher
13+
* Version 15 of gir2swift provides a Package Manager Plugin. This requires Swift 5.10 or higher
1414
(older versions can be used via the [swift52](https://github.com/rhx/SwiftGLib/tree/swift52) branch).
1515

1616
## Prerequisites
1717

18-
### Swift 5.7 or higher
18+
### Swift 6.1 or higher
1919

2020
To build, download Swift from https://swift.org/download/ -- if you are using macOS, make sure you have the command line tools installed as well). Test that your compiler works using `swift --version`, which should give you something like
2121

2222
$ swift --version
23-
swift-driver version: 1.115.1 Apple Swift version 6.0.3 (swiftlang-6.0.3.1.10 clang-1600.0.30.1)
24-
Target: arm64-apple-macosx14.0
23+
swift-driver version: 1.127.15 Apple Swift version 6.2.4 (swiftlang-6.2.4.1.4 clang-1700.6.4.2)
24+
Target: arm64-apple-macosx26.0
2525

2626
on macOS, or on Linux you should get something like:
2727

2828
$ swift --version
29-
Swift version 6.0 (swift-6.0-RELEASE)
29+
Swift version 6.1 (swift-6.1-RELEASE)
3030
Target: x86_64-unknown-linux-gnu
3131

32-
### GLib 2.56 or higher
32+
### GLib 2.80 or higher
3333

34-
These Swift wrappers have been tested with glib-2.56, 2.58, 2.60, 2.62, 2.64, 2.66, 2.68, 2.70, 2.72, 2.73, 2.74, 2.76, 2.78, 2.80, 2.82, and 2.84. They should work with higher versions, but YMMV. Also make sure you have `gobject-introspection` and its `.gir` files installed.
34+
These Swift wrappers have been tested with glib-2.56, 2.58, 2.60, 2.62, 2.64, 2.66, 2.68, 2.70, 2.72, 2.73, 2.74, 2.76, 2.78, 2.80, 2.82, 2.84, and 2.86. They should work with higher versions, but YMMV. Also make sure you have `gobject-introspection` and its `.gir` files installed.
3535

3636
#### Linux
3737

@@ -61,7 +61,7 @@ On macOS, you can install glib using HomeBrew (for setup instructions, see http:
6161
Normally, you don't build this package directly (but for testing you can - see 'Building' below). Instead you need to embed SwiftGLib into your own project using the [Swift Package Manager](https://swift.org/package-manager/). After installing the prerequisites (see 'Prerequisites' below), add `SwiftGLib` as a dependency to your `Package.swift` file, e.g.:
6262

6363
```Swift
64-
// swift-tools-version:5.7
64+
// swift-tools-version:5.10
6565

6666
import PackageDescription
6767

0 commit comments

Comments
 (0)