From bc266d67f1abb9bf0898fed2b63e20b83b77ab1c Mon Sep 17 00:00:00 2001 From: Michael Bui <25263378+MaikuB@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:02:32 +1100 Subject: [PATCH 1/5] fixed name of package file for Swift Package Manager support --- flutter_appauth/CHANGELOG.md | 4 ++++ .../ios/flutter_appauth/{Packages.swift => Package.swift} | 0 .../Sources/flutter_appauth/{Packages.swift => Package.swift} | 0 flutter_appauth/pubspec.yaml | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) rename flutter_appauth/ios/flutter_appauth/{Packages.swift => Package.swift} (100%) rename flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/{Packages.swift => Package.swift} (100%) diff --git a/flutter_appauth/CHANGELOG.md b/flutter_appauth/CHANGELOG.md index b61949e..bf3d108 100644 --- a/flutter_appauth/CHANGELOG.md +++ b/flutter_appauth/CHANGELOG.md @@ -1,3 +1,7 @@ +## [8.0.3] + +* [iOS][macOS] fixed an issue with setting up Swift Package Manager support + ## [8.0.2] * [iOS][macOS] bumped AppAuth iOS dependency to 1.7.6 diff --git a/flutter_appauth/ios/flutter_appauth/Packages.swift b/flutter_appauth/ios/flutter_appauth/Package.swift similarity index 100% rename from flutter_appauth/ios/flutter_appauth/Packages.swift rename to flutter_appauth/ios/flutter_appauth/Package.swift diff --git a/flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/Packages.swift b/flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/Package.swift similarity index 100% rename from flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/Packages.swift rename to flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/Package.swift diff --git a/flutter_appauth/pubspec.yaml b/flutter_appauth/pubspec.yaml index f9b160c..65e6819 100644 --- a/flutter_appauth/pubspec.yaml +++ b/flutter_appauth/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_appauth description: This plugin provides an abstraction around the Android and iOS AppAuth SDKs so it can be used to communicate with OAuth 2.0 and OpenID Connect providers -version: 8.0.2 +version: 8.0.3 homepage: https://github.com/MaikuB/flutter_appauth/tree/master/flutter_appauth environment: From 0c5165d1a0ad920ed69657f530ced6d8ddd7f8e7 Mon Sep 17 00:00:00 2001 From: Michael Bui <25263378+MaikuB@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:14:55 +1100 Subject: [PATCH 2/5] moved package file for macOS to correct location --- .../flutter_appauth/{Sources/flutter_appauth => }/Package.swift | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename flutter_appauth/macos/flutter_appauth/{Sources/flutter_appauth => }/Package.swift (100%) diff --git a/flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/Package.swift b/flutter_appauth/macos/flutter_appauth/Package.swift similarity index 100% rename from flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/Package.swift rename to flutter_appauth/macos/flutter_appauth/Package.swift From 0ccad833cbfb767c73994ee2fa0d782b55a55ff1 Mon Sep 17 00:00:00 2001 From: Michael Bui <25263378+MaikuB@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:17:51 +1100 Subject: [PATCH 3/5] updated changelog on 8.0.2 retraction --- flutter_appauth/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flutter_appauth/CHANGELOG.md b/flutter_appauth/CHANGELOG.md index bf3d108..bdde170 100644 --- a/flutter_appauth/CHANGELOG.md +++ b/flutter_appauth/CHANGELOG.md @@ -1,6 +1,7 @@ ## [8.0.3] -* [iOS][macOS] fixed an issue with setting up Swift Package Manager support +* [iOS][macOS] fixed an issue with setting up Swift Package Manager support. 8.0.2 has been retracted on pub.dev as result + ## [8.0.2] From 387dfcd10596f506f687c581b0e759e32429318e Mon Sep 17 00:00:00 2001 From: Michael Bui <25263378+MaikuB@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:25:43 +1100 Subject: [PATCH 4/5] updated validate workflow to build example app with and without SPM --- .github/workflows/validate.yml | 42 ++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index d149357..788233c 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -70,8 +70,8 @@ jobs: run: ./.github/workflows/scripts/install-tools.sh - name: Build run: melos run build:example_android - build_example_ios_stable: - name: Build iOS example app (stable channel) + build_example_ios_spm_disabled_stable: + name: Build iOS example app with Swift Package Manager disabled (stable channel) runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -82,8 +82,26 @@ jobs: cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' - name: Install Tools run: ./.github/workflows/scripts/install-tools.sh + - name: Disable Swift Package Manager + run: flutter config --no-enable-swift-package-manager - name: Build run: melos run build:example_ios + build_example_ios_spm_enabled_stable: + name: Build iOS example app with Swift Package Manager enabled (stable channel) + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: stable + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' + - name: Install Tools + run: ./.github/workflows/scripts/install-tools.sh + - name: Enable Swift Package Manager + run: flutter config --enable-swift-package-manager + - name: Build + run: melos run build:example_ios build_example_ios_3_13: name: Build iOS example app (3.13) runs-on: macos-latest @@ -99,8 +117,24 @@ jobs: run: ./.github/workflows/scripts/install-tools.sh - name: Build run: melos run build:example_ios - build_example_macos_stable: - name: Build macOS example app (stable channel) + build_example_macos_spm_disabled_stable: + name: Build macOS example app with Swift Package Manager disabled (stable channel) + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: stable + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' + - name: Install Tools + run: ./.github/workflows/scripts/install-tools.sh + - name: Disable Swift Package Manager + run: flutter config --no-enable-swift-package-manager + - name: Build + run: melos run build:example_macos + build_example_macos_spm_enabled_stable: + name: Build macOS example app with Swift Package Manager enabled (stable channel) runs-on: macos-latest steps: - uses: actions/checkout@v4 From 84033354e584de4cbd305fbfe2c2f114069a83e8 Mon Sep 17 00:00:00 2001 From: Michael Bui <25263378+MaikuB@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:29:52 +1100 Subject: [PATCH 5/5] fixed reference to AppAuth iOS SDK URL --- flutter_appauth/ios/flutter_appauth/Package.swift | 2 +- flutter_appauth/macos/flutter_appauth/Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flutter_appauth/ios/flutter_appauth/Package.swift b/flutter_appauth/ios/flutter_appauth/Package.swift index 09a4139..edb45dc 100644 --- a/flutter_appauth/ios/flutter_appauth/Package.swift +++ b/flutter_appauth/ios/flutter_appauth/Package.swift @@ -11,7 +11,7 @@ let package = Package( products: [ .library(name: "flutter-appauth", targets: ["flutter_appauth"]) ], - dependencies: [.package(url: "https://github.com/openid/AppAuth-iOS", exact: "1.7.6")], + dependencies: [.package(url: "https://github.com/openid/AppAuth-iOS.git", exact: "1.7.6")], targets: [ .target( name: "flutter_appauth", diff --git a/flutter_appauth/macos/flutter_appauth/Package.swift b/flutter_appauth/macos/flutter_appauth/Package.swift index 68df0b0..6f2c517 100644 --- a/flutter_appauth/macos/flutter_appauth/Package.swift +++ b/flutter_appauth/macos/flutter_appauth/Package.swift @@ -11,7 +11,7 @@ let package = Package( products: [ .library(name: "flutter-appauth", targets: ["flutter_appauth"]) ], - dependencies: [.package(url: "https://github.com/openid/AppAuth-iOS", exact: "1.7.6")] + dependencies: [.package(url: "https://github.com/openid/AppAuth-iOS.git", exact: "1.7.6")] targets: [ .target( name: "flutter_appauth",