From d81d1211f417c65bd741e3e5fac166a42c04e901 Mon Sep 17 00:00:00 2001 From: Vinzent Date: Mon, 6 May 2024 22:24:52 +0200 Subject: [PATCH 1/4] fix: keep compatible with app_links 6.0.0 and 5.0.0 --- packages/supabase_flutter/lib/src/supabase_auth.dart | 11 ++++++++++- packages/supabase_flutter/pubspec.yaml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/supabase_flutter/lib/src/supabase_auth.dart b/packages/supabase_flutter/lib/src/supabase_auth.dart index a72fb4ca..b0aaabf3 100644 --- a/packages/supabase_flutter/lib/src/supabase_auth.dart +++ b/packages/supabase_flutter/lib/src/supabase_auth.dart @@ -189,7 +189,16 @@ class SupabaseAuth with WidgetsBindingObserver { _initialDeeplinkIsHandled = true; try { - final uri = await _appLinks.getInitialAppLink(); + Uri? uri; + try { + // before app_links 6.0.0 + uri = await (_appLinks as dynamic).getInitialAppLink(); + } on NoSuchMethodError catch (_) { + // Needed to keep compatible with 5.0.0 and 6.0.0 + // https://pub.dev/packages/app_links/changelog + // after app_links 6.0.0 + uri = await (_appLinks as dynamic).getInitialLink(); + } if (uri != null) { await _handleDeeplink(uri); } diff --git a/packages/supabase_flutter/pubspec.yaml b/packages/supabase_flutter/pubspec.yaml index aa076719..a5a983fb 100644 --- a/packages/supabase_flutter/pubspec.yaml +++ b/packages/supabase_flutter/pubspec.yaml @@ -10,7 +10,7 @@ environment: flutter: '>=3.0.0' dependencies: - app_links: '>=3.5.0 <6.0.0' + app_links: '>=3.5.0 <7.0.0' async: ^2.11.0 crypto: ^3.0.2 flutter: From 853ffa9451efe29f6c05386ec76499e61b86fb4e Mon Sep 17 00:00:00 2001 From: Vinzent Date: Mon, 6 May 2024 22:28:42 +0200 Subject: [PATCH 2/4] ci: test supabase_flutter with downgraded packages --- .github/workflows/supabase_flutter.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/supabase_flutter.yml b/.github/workflows/supabase_flutter.yml index 41aeae46..aa68a025 100644 --- a/.github/workflows/supabase_flutter.yml +++ b/.github/workflows/supabase_flutter.yml @@ -71,3 +71,8 @@ jobs: - name: Run tests run: flutter test --concurrency=1 + + - name: Run tests with downgraded packages + run: | + flutter pub downgrade + flutter test --concurrency=1 From 6ff75e98d84a9a6a5a33c8cebc2405ebff37e2bc Mon Sep 17 00:00:00 2001 From: Vinzent Date: Mon, 6 May 2024 22:42:14 +0200 Subject: [PATCH 3/4] ci: downgrade only app_links --- .github/workflows/supabase_flutter.yml | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/supabase_flutter.yml b/.github/workflows/supabase_flutter.yml index aa68a025..2530d3a0 100644 --- a/.github/workflows/supabase_flutter.yml +++ b/.github/workflows/supabase_flutter.yml @@ -5,25 +5,25 @@ on: branches: - main paths: - - 'packages/supabase_flutter/**' - - '.github/workflows/supabase_flutter.yaml' - - 'packages/functions_client/**' - - 'packages/gotrue/**' - - 'packages/postgrest/**' - - 'packages/realtime_client/**' - - 'packages/storage_client/**' - - 'packages/supabase/**' + - "packages/supabase_flutter/**" + - ".github/workflows/supabase_flutter.yaml" + - "packages/functions_client/**" + - "packages/gotrue/**" + - "packages/postgrest/**" + - "packages/realtime_client/**" + - "packages/storage_client/**" + - "packages/supabase/**" pull_request: paths: - - 'packages/supabase_flutter/**' - - '.github/workflows/supabase_flutter.yaml' - - 'packages/functions_client/**' - - 'packages/gotrue/**' - - 'packages/postgrest/**' - - 'packages/realtime_client/**' - - 'packages/storage_client/**' - - 'packages/supabase/**' + - "packages/supabase_flutter/**" + - ".github/workflows/supabase_flutter.yaml" + - "packages/functions_client/**" + - "packages/gotrue/**" + - "packages/postgrest/**" + - "packages/realtime_client/**" + - "packages/storage_client/**" + - "packages/supabase/**" jobs: test: @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - flutter-version: ['3.10.x', '3.x'] + flutter-version: ["3.10.x", "3.x"] defaults: run: @@ -46,12 +46,12 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: '12.x' + java-version: "12.x" - uses: subosito/flutter-action@v2 with: flutter-version: ${{ matrix.flutter-version }} - channel: 'stable' + channel: "stable" - run: flutter --version @@ -74,5 +74,5 @@ jobs: - name: Run tests with downgraded packages run: | - flutter pub downgrade + flutter pub downgrade app_links flutter test --concurrency=1 From 260398ac50b17731517cb151ea33f48a89974be2 Mon Sep 17 00:00:00 2001 From: Vinzent Date: Mon, 6 May 2024 22:47:43 +0200 Subject: [PATCH 4/4] style: undo formatting --- .github/workflows/supabase_flutter.yml | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/supabase_flutter.yml b/.github/workflows/supabase_flutter.yml index 2530d3a0..7988c947 100644 --- a/.github/workflows/supabase_flutter.yml +++ b/.github/workflows/supabase_flutter.yml @@ -5,25 +5,25 @@ on: branches: - main paths: - - "packages/supabase_flutter/**" - - ".github/workflows/supabase_flutter.yaml" - - "packages/functions_client/**" - - "packages/gotrue/**" - - "packages/postgrest/**" - - "packages/realtime_client/**" - - "packages/storage_client/**" - - "packages/supabase/**" + - 'packages/supabase_flutter/**' + - '.github/workflows/supabase_flutter.yaml' + - 'packages/functions_client/**' + - 'packages/gotrue/**' + - 'packages/postgrest/**' + - 'packages/realtime_client/**' + - 'packages/storage_client/**' + - 'packages/supabase/**' pull_request: paths: - - "packages/supabase_flutter/**" - - ".github/workflows/supabase_flutter.yaml" - - "packages/functions_client/**" - - "packages/gotrue/**" - - "packages/postgrest/**" - - "packages/realtime_client/**" - - "packages/storage_client/**" - - "packages/supabase/**" + - 'packages/supabase_flutter/**' + - '.github/workflows/supabase_flutter.yaml' + - 'packages/functions_client/**' + - 'packages/gotrue/**' + - 'packages/postgrest/**' + - 'packages/realtime_client/**' + - 'packages/storage_client/**' + - 'packages/supabase/**' jobs: test: @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - flutter-version: ["3.10.x", "3.x"] + flutter-version: ['3.10.x', '3.x'] defaults: run: @@ -46,12 +46,12 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: '12.x' - uses: subosito/flutter-action@v2 with: flutter-version: ${{ matrix.flutter-version }} - channel: "stable" + channel: 'stable' - run: flutter --version @@ -72,7 +72,7 @@ jobs: - name: Run tests run: flutter test --concurrency=1 - - name: Run tests with downgraded packages + - name: Run tests with downgraded app_links run: | flutter pub downgrade app_links flutter test --concurrency=1