From 7b22de81e7ff8816d0bf759de9fb114e51bc1a10 Mon Sep 17 00:00:00 2001 From: david-swift Date: Mon, 7 Oct 2024 17:05:31 +0200 Subject: [PATCH] Migrate to the Aparoksha Gitea instance --- {.github => .gitea}/workflows/ci.yml | 0 Package.swift | 15 ++++++++------- README.md | 8 ++++---- Sources/AdwaitaTemplate.swift | 2 +- Sources/ToolbarView.swift | 10 +++++----- io.github.AparokshaUI.AdwaitaTemplate.json | 8 ++++---- 6 files changed, 22 insertions(+), 21 deletions(-) rename {.github => .gitea}/workflows/ci.yml (100%) diff --git a/.github/workflows/ci.yml b/.gitea/workflows/ci.yml similarity index 100% rename from .github/workflows/ci.yml rename to .gitea/workflows/ci.yml diff --git a/Package.swift b/Package.swift index 5b0f9d9..4474e5a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.8 +// swift-tools-version: 6.0 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -9,23 +9,24 @@ let package = Package( .macOS(.v13) ], dependencies: [ - .package(url: "https://github.com/AparokshaUI/Adwaita", from: "0.2.0"), - .package(url: "https://github.com/AparokshaUI/Localized", from: "0.2.0") + .package(url: "https://git.aparoksha.dev/aparoksha/adwaita-swift", branch: "main"), + .package(url: "https://git.aparoksha.dev/aparoksha/localized", branch: "main") ], targets: [ .executableTarget( name: "AdwaitaTemplate", dependencies: [ - .product(name: "Adwaita", package: "Adwaita"), - .product(name: "Localized", package: "Localized") + .product(name: "Adwaita", package: "adwaita-swift"), + .product(name: "Localized", package: "localized") ], path: "Sources", resources: [ .process("Localized.yml") ], plugins: [ - .plugin(name: "GenerateLocalized", package: "Localized") + .plugin(name: "GenerateLocalized", package: "localized") ] ) - ] + ], + swiftLanguageModes: [.v5] ) diff --git a/README.md b/README.md index f11a333..680ac2b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Adwaita Template

-_Adwaita Template_ is a template application for the [Adwaita for Swift package](https://github.com/AparokshaUI/Adwaita/). +_Adwaita Template_ is a template application for the [Adwaita for Swift package](https://adwaita-swift.aparoksha.dev/documentation/adwaita/). ## Table of Contents @@ -41,7 +41,7 @@ For designing an app icon, [App Icon Preview](https://flathub.org/apps/org.gnome - `data/icons/io.github.AparokshaUI.AdwaitaTemplate.Source.svg` - `data/icons/io.github.AparokshaUI.AdwaitaTemplate.svg` - `data/icons/io.github.AparokshaUI.AdwaitaTemplate-symbolic.svg` -4. Edit the code. Help is available [here](https://david-swift.gitbook.io/adwaita/), ask questions in the [discussions](https://github.com/AparokshaUI/Adwaita/discussions/). +4. Edit the code. Help is available [here](https://adwaita-swift.aparoksha.dev/), ask questions in the [forums](https://forums.aparoksha.dev/). 5. You can edit the app's icons using the previously installed tools according to [this](https://blogs.gnome.org/tbernard/2019/12/30/designing-an-icon-for-your-app/) tutorial. 6. In GNOME Builder, click on the dropdown next to the hammer and then on `Export`. Wait until the file manager appears, open the `.flatpak` file and install the app on your device! 7. If you want to publish your app, replace `debug` in the following build commands by `release`: @@ -58,5 +58,5 @@ you can use [this tool](https://github.com/flatpak/flatpak-builder-tools/tree/ma ## Thanks ### Dependencies -- [Adwaita for Swift](https://github.com/AparokshaUI/Adwaita) licensed under the [MIT License](https://github.com/AparokshaUI/Adwaita/blob/main/LICENSE.md) -- [Localized](https://github.com/AparokshaUI/Localized) licensed under the [MIT License](https://github.com/AparokshaUI/Localized/blob/master/LICENSE.md) +- [Adwaita for Swift](https://git.aparoksha.dev/aparoksha/adwaita-swift) licensed under the [MIT License](https://git.aparoksha.dev/aparoksha/adwaita-swift/src/branch/main/LICENSE.md) +- [Localized](https://git.aparoksha.dev/aparoksha/localized) licensed under the [MIT License](https://git.aparoksha.dev/aparoksha/localized/src/branch/main/LICENSE.md) diff --git a/Sources/AdwaitaTemplate.swift b/Sources/AdwaitaTemplate.swift index 823eff7..9985228 100644 --- a/Sources/AdwaitaTemplate.swift +++ b/Sources/AdwaitaTemplate.swift @@ -7,7 +7,7 @@ import Adwaita struct AdwaitaTemplate: App { let id = "io.github.AparokshaUI.AdwaitaTemplate" - var app: GTUIApp! + var app: AdwaitaApp! var scene: Scene { Window(id: "main") { window in diff --git a/Sources/ToolbarView.swift b/Sources/ToolbarView.swift index ada10d9..1d234a2 100644 --- a/Sources/ToolbarView.swift +++ b/Sources/ToolbarView.swift @@ -3,12 +3,12 @@ import Adwaita struct ToolbarView: View { @State private var about = false - var app: GTUIApp - var window: GTUIApplicationWindow + var app: AdwaitaApp + var window: AdwaitaWindow var view: Body { HeaderBar.end { - Menu(icon: .default(icon: .openMenu), app: app, window: window) { + Menu(icon: .default(icon: .openMenu)) { MenuButton(Loc.newWindow, window: false) { app.addWindow("main") } @@ -31,8 +31,8 @@ struct ToolbarView: View { developer: "david-swift", version: "dev", icon: .custom(name: "io.github.AparokshaUI.AdwaitaTemplate"), - website: .init(string: "https://github.com/AparokshaUI/AdwaitaTemplate")!, - issues: .init(string: "https://github.com/AparokshaUI/AdwaitaTemplate/issues")! + website: .init(string: "https://git.aparoksha.dev/aparoksha/adwaita-template")!, + issues: .init(string: "https://git.aparoksha.dev/aparoksha/adwaita-template/issues")! ) } } diff --git a/io.github.AparokshaUI.AdwaitaTemplate.json b/io.github.AparokshaUI.AdwaitaTemplate.json index 83a2b13..3c68dc1 100644 --- a/io.github.AparokshaUI.AdwaitaTemplate.json +++ b/io.github.AparokshaUI.AdwaitaTemplate.json @@ -1,10 +1,10 @@ { "app-id": "io.github.AparokshaUI.AdwaitaTemplate", "runtime": "org.gnome.Platform", - "runtime-version": "46", + "runtime-version": "47", "sdk": "org.gnome.Sdk", "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.swift5" + "org.freedesktop.Sdk.Extension.swift6" ], "command": "AdwaitaTemplate", "finish-args": [ @@ -14,8 +14,8 @@ "--socket=wayland" ], "build-options": { - "append-path": "/usr/lib/sdk/swift5/bin", - "prepend-ld-library-path": "/usr/lib/sdk/swift5/lib" + "append-path": "/usr/lib/sdk/swift6/bin", + "prepend-ld-library-path": "/usr/lib/sdk/swift6/lib" }, "cleanup": [ "/include",