Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge develop into master #208

Merged
merged 4 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/example-app.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build Example App

on: [push, pull_request]
on:
push:
branches: [master, develop]
pull_request:
branches: [master, develop]

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,7 @@
* allow authentication of sector 0 (#157)
* fix data type check in `writeBlock` (#161)

## 3.6.0-rc.6

This is a release candidate for 3.6.0. Please test it and report any issues.
## 3.6.0

* Requires Dart 3.6+ and Flutter 3.24+
* Remove annoying dependency on `js` library, replace with `dart:js_interop`
Expand Down
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Contributing

Thanks for your interest in contributing to `flutter_nfc_kit`!

## GitHub Workflow

We have two main branches:

* `develop` branch (default) is for actively development and RC releases.
* `master` branch is for stable releases.

Both branches are protected. Pull requests are needed for any changes.

Please always make your changes on `develop` branch, and submit your PR against it.
If there are any merge conflicts, please resolve them by rebasing your commits.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Note that due to API limitations, not all operations are supported on all platfo

This library uses [ndef](https://pub.dev/packages/ndef) for NDEF record encoding & decoding.

## Contributing

Please refer to [CONTRIBUTING.md](CONTRIBUTING.md) for more information.

## Setup

### Android
Expand All @@ -48,7 +52,7 @@ This plugin now supports Swift package manager, and requires iOS 13+.
* Open Runner.xcworkspace with Xcode and navigate to project settings then the tab _Signing & Capabilities._
* Select the Runner in targets in left sidebar then press the "+ Capability" in the left upper corner and choose _Near Field Communication Tag Reading._

## Web
### Web

The web version of this plugin **does not actually support NFC** in browsers, but uses a specific [WebUSB protocol](https://github.com/nfcim/flutter_nfc_kit/blob/master/WebUSB.md), so that Flutter programs can communicate with dual-interface (NFC / USB) devices in a platform-independent way.

Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ packages:
path: ".."
relative: true
source: path
version: "3.6.0-rc.6"
version: "3.6.0"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: flutter_nfc_kit
description: Provide NFC functionality on Android, iOS & Web, including reading metadata, read & write NDEF records, and transceive layer 3 & 4 data with NFC tags / cards
version: 3.6.0-rc.6
version: 3.6.0
homepage: "https://github.com/nfcim/flutter_nfc_kit"

environment:
Expand Down
Loading