diff --git a/.pubignore b/.pubignore index 2c5c965..3a3800f 100644 --- a/.pubignore +++ b/.pubignore @@ -33,5 +33,4 @@ zxscanner/ # Ignore ZXing-CPP unneeded files src/zxing/* -!src/zxing/CMakeLists.txt !src/zxing/core/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 149f945..72e3533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.0-beta.5 + +* Fixed compilation issue on Android + ## 1.0.0-beta.4 * Fixed compilation issue on Android diff --git a/example/pubspec.lock b/example/pubspec.lock index 48c3d0a..dbdaac8 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -148,7 +148,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0-beta.1" + version: "1.0.0-beta.4" font_awesome_flutter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index ff2d9c8..83433f5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_zxing description: A barcode scanner and generator natively in Flutter with Dart FFI based on ZXing. -version: 1.0.0-beta.4 +version: 1.0.0-beta.5 repository: https://github.com/khoren93/flutter_zxing environment: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ee226a..9b6b60d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,7 @@ add_library( set (BUILD_WRITERS ON) -add_subdirectory(zxing) +add_subdirectory(zxing/core) find_library(log-lib log) target_link_libraries(flutter_zxing ZXing ${log-lib}) \ No newline at end of file diff --git a/src/native_zxing.h b/src/native_zxing.h index db5a508..e2d631b 100644 --- a/src/native_zxing.h +++ b/src/native_zxing.h @@ -117,7 +117,7 @@ extern "C" struct EncodeResult encodeBarcode(char *contents, int width, int height, int format, int margin, int eccLevel); // Private functions - // void resultToCodeResult(struct CodeResult *code, ZXing::Result result); + void resultToCodeResult(struct CodeResult *code, ZXing::Result result); #ifdef __cplusplus } diff --git a/zxscanner/pubspec.lock b/zxscanner/pubspec.lock index 9badee0..3691e9b 100644 --- a/zxscanner/pubspec.lock +++ b/zxscanner/pubspec.lock @@ -321,7 +321,7 @@ packages: name: flutter_zxing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0-beta.1" + version: "1.0.0-beta.4" font_awesome_flutter: dependency: "direct main" description: diff --git a/zxscanner/pubspec.yaml b/zxscanner/pubspec.yaml index 112d7ef..aa535cc 100644 --- a/zxscanner/pubspec.yaml +++ b/zxscanner/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: sdk: flutter flutter_markdown: ^0.6.13 flutter_mobx: ^2.0.6 - flutter_zxing: 1.0.0-beta.1 + flutter_zxing: 1.0.0-beta.4 font_awesome_flutter: ^10.3.0 hive: ^2.2.3 hive_flutter: ^1.1.0