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

Fixes #538

Merged
merged 4 commits into from
Dec 12, 2024
Merged

Fixes #538

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
15 changes: 15 additions & 0 deletions .github/workflows/build-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,18 @@ jobs:
- name: Install tools
run: brew install automake libtool create-dmg
- run: flutter build macos --release

build-ios:
needs: check
runs-on: macos-13
defaults:
run:
working-directory: ./chameleonultragui
steps:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
- name: Install tools
run: brew install automake libtool create-dmg
- run: flutter build ios --release 2>&1 | tee /dev/tty | grep -q "Xcode build done" && exit 0 || exit 1
8 changes: 4 additions & 4 deletions .github/workflows/publish-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
run: fastlane production
working-directory: "./chameleonultragui/"
build-macos:
runs-on: macos-13
runs-on: macos-latest
env:
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
APP_STORE_CONNECT_KEY_IDENTIFIER: ${{ secrets.APP_STORE_CONNECT_KEY_IDENTIFIER }}
Expand All @@ -85,7 +85,7 @@ jobs:
- name: Install tools
run: brew install automake libtool create-dmg
- name: Install Codemagic
run: pip3 install codemagic-cli-tools
run: pip3 install codemagic-cli-tools --break-system-packages
- name: Export private key
uses: mobiledevops/secret-to-file-action@v1
with:
Expand All @@ -103,7 +103,7 @@ jobs:
run: |
export APP_STORE_CONNECT_PRIVATE_KEY=`cat AuthKey.p8`
app-store-connect fetch-signing-files run.chameleon.gui --platform MAC_OS --type MAC_APP_STORE --certificate-key=@file:cert_key --create
app-store-connect certificates list --type DISTRIBUTION --certificate-key=@file:cert_key --save
app-store-connect certificates list --type MAC_INSTALLER_DISTRIBUTION --certificate-key=@file:cert_key --save 2>&1 | grep -q 'Did not find' && app-store-connect certificates create --type MAC_INSTALLER_DISTRIBUTION --certificate-key=@file:cert_key --save
keychain initialize
keychain add-certificates
xcode-project use-profiles
Expand All @@ -123,7 +123,7 @@ jobs:
INSTALLER_CERT_NAME=$(keychain list-certificates \
| jq '[.[]
| select(.common_name
| contains("Apple Distribution"))
| contains("Mac Developer Installer"))
| .common_name][0]' \
| xargs)
xcrun productsign --sign "$INSTALLER_CERT_NAME" unsigned.pkg "$PACKAGE_NAME"
Expand Down
1 change: 1 addition & 0 deletions chameleonultragui/lib/gui/component/mifare/ultralight.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class CardReaderState extends State<MifareUltralightHelper> {
int passwordPage = mfUltralightGetPasswordPage(widget.hfInfo.type);
if (passwordPage != 0 && withPassword) {
cardData[passwordPage] = hexToBytes(keyController.text);
cardData[passwordPage + 1] = Uint8List(4);
for (var byte = 0; byte < pack!.length; byte++) {
cardData[passwordPage + 1][byte] = pack[byte];
}
Expand Down
66 changes: 37 additions & 29 deletions chameleonultragui/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ packages:
dependency: "direct main"
description:
name: archive
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
url: "https://pub.dev"
source: hosted
version: "3.6.1"
version: "4.0.1"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -203,7 +203,7 @@ packages:
description:
path: "."
ref: fix-windows
resolved-ref: "6929891b6b166cd40379d817a1e807fd18ce489e"
resolved-ref: "3038d74d5560dcca528423fffd745abf31eb88ae"
url: "https://github.com/Foxushka/file_saver.git"
source: git
version: "0.2.14"
Expand Down Expand Up @@ -232,10 +232,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_launcher_icons
sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77"
sha256: "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5"
url: "https://pub.dev"
source: hosted
version: "0.14.1"
version: "0.14.2"
flutter_libserialport:
dependency: "direct main"
description:
Expand Down Expand Up @@ -328,10 +328,10 @@ packages:
dependency: transitive
description:
name: image
sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
sha256: "599d08e369969bdf83138f5b4e0a7e823d3f992f23b8a64dd626877c37013533"
url: "https://pub.dev"
source: hosted
version: "4.3.0"
version: "4.4.0"
intl:
dependency: "direct main"
description:
Expand Down Expand Up @@ -440,10 +440,10 @@ packages:
dependency: "direct main"
description:
name: mobile_scanner
sha256: "728828a798d1a2ee506beb652ca23d974c542c96ed03dcbd5eaf97bef96cdaad"
sha256: d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760
url: "https://pub.dev"
source: hosted
version: "6.0.2"
version: "5.2.3"
nested:
dependency: transitive
description:
Expand All @@ -456,26 +456,26 @@ packages:
dependency: transitive
description:
name: package_config
sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
package_info_plus:
dependency: "direct main"
description:
name: package_info_plus
sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d"
url: "https://pub.dev"
source: hosted
version: "8.1.1"
version: "8.1.2"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "3.0.2"
path:
dependency: "direct main"
description:
Expand All @@ -496,18 +496,18 @@ packages:
dependency: transitive
description:
name: path_provider_android
sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
url: "https://pub.dev"
source: hosted
version: "2.2.12"
version: "2.2.15"
path_provider_foundation:
dependency: transitive
description:
name: path_provider_foundation
sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.4.1"
path_provider_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -604,6 +604,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.8"
posix:
dependency: transitive
description:
name: posix
sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
url: "https://pub.dev"
source: hosted
version: "6.0.1"
protobuf:
dependency: "direct main"
description:
Expand All @@ -624,10 +632,10 @@ packages:
dependency: transitive
description:
name: pub_semver
sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
qr:
dependency: transitive
description:
Expand Down Expand Up @@ -680,10 +688,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_android
sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549"
url: "https://pub.dev"
source: hosted
version: "2.3.3"
version: "2.3.4"
shared_preferences_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -813,10 +821,10 @@ packages:
dependency: transitive
description:
name: url_launcher_ios
sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
url: "https://pub.dev"
source: hosted
version: "6.3.1"
version: "6.3.2"
url_launcher_linux:
dependency: transitive
description:
Expand All @@ -829,10 +837,10 @@ packages:
dependency: transitive
description:
name: url_launcher_macos
sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "3.2.2"
url_launcher_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -926,10 +934,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2"
sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69"
url: "https://pub.dev"
source: hosted
version: "5.8.0"
version: "5.9.0"
xdg_directories:
dependency: transitive
description:
Expand Down
6 changes: 3 additions & 3 deletions chameleonultragui/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ dependencies:
git:
url: https://github.com/Foxushka/file_saver.git
ref: fix-windows
file_picker: ^8.0.1
file_picker: 8.1.4
flutter_staggered_grid_view: ^0.7.0
uuid: ^4.0.0
http: ^1.1.0
archive: ^3.3.7
archive: ^4.0.1
flutter_reactive_ble: ^5.2.0
permission_handler: ^11.0.0
protobuf: ^2.1.0
Expand All @@ -70,7 +70,7 @@ dependencies:
intl: any
wakelock_plus: ^1.2.4
qr_flutter: ^4.1.0
mobile_scanner: ^6.0.2
mobile_scanner: ">=5.2.3 <6.0.0" # 6.0.0 version bumps minimal iOS version to 15

dev_dependencies:
flutter_test:
Expand Down
Loading