Merge branch 'develop' of https://github.com/mogol/flutter_secure_sto…

…rage into cake-9.1.0 # Conflicts: # flutter_secure_storage/pubspec.yaml
cake-tech · May 8, 2024 · c288cca · c288cca
2 parents ed88ef1 + d552076
commit c288cca
Show file tree

Hide file tree

Showing 23 changed files with 259 additions and 61 deletions.
diff --git a/.github/workflows/flutter_drive.yml b/.github/workflows/flutter_drive.yml
@@ -2,26 +2,31 @@ name: integration test
 on: [pull_request]
 jobs:
   drive_android:
-      runs-on: macos-latest
+      runs-on: ubuntu-latest
       steps:
         - uses: actions/checkout@v4
         - uses: subosito/[email protected]
         - uses: actions/setup-java@v3
           with:
             distribution: 'temurin'
             java-version: '17'
-        - name: "Run Flutter Driver tests API 18"
+        - name: Enable KVM
+          run: |
+            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+            sudo udevadm control --reload-rules
+            sudo udevadm trigger --name-match=kvm
+        - name: "Run Flutter Driver tests API 19"
           uses: reactivecircus/android-emulator-runner@v2
           with:
-            api-level: 18
+            api-level: 19
             target: default
             arch: x86
             script: "cd example && flutter drive --target=test_driver/app.dart"
             working-directory: ./flutter_secure_storage
-        - name: "Run Flutter Driver tests API 33"
+        - name: "Run Flutter Driver tests API 34"
           uses: reactivecircus/android-emulator-runner@v2
           with:
-            api-level: 33
+            api-level: 34
             target: google_apis
             arch: x86_64
             script: "cd example && flutter drive --target=test_driver/app.dart"

diff --git a/flutter_secure_storage/CHANGELOG.md b/flutter_secure_storage/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 9.1.0
+New Features:
+* [iOS, macOS] Added isProtectedDataAvailable, A boolean value that indicates whether content protection is active.
+
+Improvements:
+* [iOS, macOS] Use accessibility option for all operations
+* [iOS, macOS] Added privacy manifest 
+* [iOS] Fixes error when no item exists
+* [Linux] Fixed search with schemas fails in cold keyrings
+* [Linux] Fixed erase called on null
+* [Android] Fixed native Android stacktraces in PlatformExceptions
+* [Android] Fixed exception when reading data after boot
+
 ## 9.0.0
 Breaking changes:
 * [Windows] Migrated to FFI with win32 package.

diff --git a/flutter_secure_storage/android/build.gradle b/flutter_secure_storage/android/build.gradle
@@ -30,15 +30,15 @@ android {
         buildConfig = true
     }
 
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 19
     }
 
 }

diff --git a/flutter_secure_storage/example/android/app/build.gradle b/flutter_secure_storage/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdk 33
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -35,8 +35,8 @@ android {
 
     defaultConfig {
         applicationId "com.it_nomads.fluttersecurestorageexample"
-        minSdkVersion 18
-        targetSdkVersion 33
+        minSdkVersion 19
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/flutter_secure_storage/example/macos/Podfile.lock b/flutter_secure_storage/example/macos/Podfile.lock
@@ -2,21 +2,28 @@ PODS:
   - flutter_secure_storage_macos (6.1.1):
     - FlutterMacOS
   - FlutterMacOS (1.0.0)
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
+  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
 
 EXTERNAL SOURCES:
   flutter_secure_storage_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
+  path_provider_foundation:
+    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
 
 SPEC CHECKSUMS:
-  flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
+  flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
 
 PODFILE CHECKSUM: ce7dbe26c78bfc7ba46736094c1e2d25982870fa
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.15.2
diff --git a/flutter_secure_storage/example/macos/Runner.xcodeproj/project.pbxproj b/flutter_secure_storage/example/macos/Runner.xcodeproj/project.pbxproj
@@ -202,7 +202,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/flutter_secure_storage/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_secure_storage/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/flutter_secure_storage/example/pubspec.lock b/flutter_secure_storage/example/pubspec.lock
@@ -129,42 +129,42 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "9.0.0"
+    version: "9.1.0"
   flutter_secure_storage_linux:
     dependency: "direct overridden"
     description:
       path: "../../flutter_secure_storage_linux"
       relative: true
     source: path
-    version: "1.2.0"
+    version: "1.2.1"
   flutter_secure_storage_macos:
     dependency: "direct overridden"
     description:
       path: "../../flutter_secure_storage_macos"
       relative: true
     source: path
-    version: "3.0.1"
+    version: "3.1.0"
   flutter_secure_storage_platform_interface:
     dependency: "direct main"
     description:
       path: "../../flutter_secure_storage_platform_interface"
       relative: true
     source: path
-    version: "1.0.2"
+    version: "1.1.0"
   flutter_secure_storage_web:
     dependency: "direct overridden"
     description:
       path: "../../flutter_secure_storage_web"
       relative: true
     source: path
-    version: "1.1.2"
+    version: "1.2.0"
   flutter_secure_storage_windows:
     dependency: "direct overridden"
     description:
       path: "../../flutter_secure_storage_windows"
       relative: true
     source: path
-    version: "3.0.0"
+    version: "3.1.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/flutter_secure_storage/pubspec.yaml b/flutter_secure_storage/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_secure_storage
 description: Flutter Secure Storage provides API to store data in secure storage. Keychain is used in iOS, KeyStore based solution is used in Android.
-version: 9.0.0
+version: 9.1.0
 repository: https://github.com/mogol/flutter_secure_storage/tree/develop/flutter_secure_storage
 
 environment:
@@ -31,15 +31,11 @@ dependencies:
   # implementation constraints as "any". We cannot do it right now as it fails pub publish
   # validation, so we set a ^ constraint.
   # https://github.com/flutter/flutter/issues/46264
-  flutter_secure_storage_linux: ^1.1.3
-  flutter_secure_storage_macos:
-    git:
-      url: https://github.com/cake-tech/flutter_secure_storage.git
-      ref: cake-8.0.0
-      path: flutter_secure_storage_macos
-  flutter_secure_storage_platform_interface: ^1.0.1
-  flutter_secure_storage_web: ^1.1.1
-  flutter_secure_storage_windows: ^3.0.0
+  flutter_secure_storage_linux: ^1.2.1
+  flutter_secure_storage_macos: ^3.1.0
+  flutter_secure_storage_platform_interface: ^1.1.0
+  flutter_secure_storage_web: ^1.2.0
+  flutter_secure_storage_windows: ^3.1.1
   meta: ^1.3.0
 
 dev_dependencies:

diff --git a/flutter_secure_storage_linux/CHANGELOG.md b/flutter_secure_storage_linux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.1
+- Fixed search with schemas fails in cold keyrings
+- Fixed erase called on null
+
 ## 1.2.0
 - Remove and replace libjsoncpp1 dependency
 - Update Dart SDK Constraint to support <4.0.0 instead of <3.0.0.

diff --git a/flutter_secure_storage_linux/pubspec.lock b/flutter_secure_storage_linux/pubspec.lock
@@ -0,0 +1,72 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.18.0"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_secure_storage_platform_interface:
+    dependency: "direct main"
+    description:
+      name: flutter_secure_storage_platform_interface
+      sha256: fa6beabb78596a93540d7c23519ed11f80f85431016b1660ce7b985ed6a7fd49
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+sdks:
+  dart: ">=3.2.0-0 <4.0.0"
+  flutter: ">=1.20.0"
diff --git a/flutter_secure_storage_linux/pubspec.yaml b/flutter_secure_storage_linux/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_secure_storage_linux
 description: Linux implementation of flutter_secure_storage
 repository: https://github.com/mogol/flutter_secure_storage
-version: 1.2.0
+version: 1.2.1
 
 environment:
   sdk: ">=2.12.0 <4.0.0"

diff --git a/flutter_secure_storage_macos/CHANGELOG.md b/flutter_secure_storage_macos/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 3.1.0
+New Features:
+* Added isProtectedDataAvailable, A Boolean value that indicates whether content protection is active.
+
+Improvements:
+* Use accessibility option for all operations
+* Added privacy manifest
+
 ## 3.0.1
 Update Dart SDK Constraint to support <4.0.0 instead of <3.0.0.
 

diff --git a/flutter_secure_storage_macos/pubspec.lock b/flutter_secure_storage_macos/pubspec.lock
@@ -0,0 +1,72 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.18.0"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_secure_storage_platform_interface:
+    dependency: "direct main"
+    description:
+      name: flutter_secure_storage_platform_interface
+      sha256: fa6beabb78596a93540d7c23519ed11f80f85431016b1660ce7b985ed6a7fd49
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+sdks:
+  dart: ">=3.2.0-0 <4.0.0"
+  flutter: ">=1.20.0"