Skip to content

chore: sync main into develop/v3.0 - #945

Merged
utkrishtsahu merged 18 commits into
develop/v3.0from
sync/main-to-develop-v3.0
Sep 9, 2026
Merged

chore: sync main into develop/v3.0#945
utkrishtsahu merged 18 commits into
develop/v3.0from
sync/main-to-develop-v3.0

Conversation

@NandanPrabhu

Copy link
Copy Markdown
Contributor

Summary

Conflict resolutions

File(s) Resolution
pubspec.yaml, version.dart, podspecs, Package.swift (versions) Kept develop/v3.0 — v3.0 branch owns its own version numbers
*.podspec / Package.swift dependencies (Auth0.swift, JWTDecode) Kept develop/v3.0 — v3 major upgrades are intentional
ExtensionsTests.swift (expiresInexpiresAt) Kept develop/v3.0 — breaking API change for v3
CredentialsManagerSpies.swift (throws-based API) Kept develop/v3.0 — new CredentialsStorage protocol
CHANGELOG.md / CHANGELOG.md (platform interface) Merged both — prepended 2.6.1 entries from main
EXAMPLES.md Kept develop/v3.0 — new minTtl documentation
authentication_api_test.dart Kept main — retains default-value test for multifactorChallenge

Test plan

  • CI passes on this branch
  • Review conflict resolutions, especially the CredentialsStorage throws-based API changes

NandanPrabhu and others added 16 commits July 27, 2026 16:05
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Utkrisht Sahu <utkrishtsahu@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…test (#903)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Utkrisht Sahu <utkrishtsahu@gmail.com>
…ons/setup-android (#915)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Utkrisht Sahu <utkrishtsahu@gmail.com>
#916)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Utkrisht Sahu <utkrishtsahu@gmail.com>
Co-authored-by: utkrishtS <utkrisht.sahu@okta.com>
@coderabbitai

coderabbitai Bot commented Sep 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (3)
  • main
  • beta-release/.*
  • release/.*

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 38c4f1d0-9f42-4ebc-938c-e46fd2d98f58

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@NandanPrabhu
NandanPrabhu force-pushed the sync/main-to-develop-v3.0 branch from c15ab2c to 8dbeda5 Compare September 8, 2026 12:14
@NandanPrabhu NandanPrabhu changed the title chore: sync main into develop/v3.0 af: sync main into develop/v3.0 Sep 8, 2026
@NandanPrabhu NandanPrabhu changed the title af: sync main into develop/v3.0 chore: sync main into develop/v3.0 Sep 8, 2026
@utkrishtsahu
utkrishtsahu merged commit 7b4fa73 into develop/v3.0 Sep 9, 2026
14 checks passed
@utkrishtsahu
utkrishtsahu deleted the sync/main-to-develop-v3.0 branch September 9, 2026 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants