Merge pull request #203 from dint-dev/fix/cryptography_flutter

Fix issues in cryptography_flutter.

Author: terrier989

.github/workflows/dart.yml

@@ -24,6 +24,7 @@ jobs:
       matrix:
         package:
           - cryptography
+          - cryptography_test
           - jwk
         sdk:
           # The oldest supported Dart SDK at the moment.
@@ -128,6 +129,7 @@ jobs:
       matrix:
         package:
           - cryptography_flutter
+          - cryptography_flutter/example
           - cryptography_flutter_integration_test
         sdk:
           # The oldest supported Dart SDK at the moment.

cryptography/pubspec.yaml

@@ -24,5 +24,5 @@ dev_dependencies:
   #
   # Packages by Google:
   #
-  lints: '>=3.0.0 <7.0.0'
+  lints: '>=3.0.0 <7.0.0' # A large range is needed because we support old Flutter SDKs
   test: ^1.24.0

cryptography_flutter/.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related
@@ -26,5 +28,6 @@ migrate_working_dir/
 /pubspec.lock
 **/doc/api/
 .dart_tool/
-.packages
-build/
+.flutter-plugins-dependencies
+/build/
+/coverage/

cryptography_flutter/.metadata

@@ -4,7 +4,33 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 652bc59414cf04fd841e15b250c1de4fda00d38a
-  channel: master
+  revision: "f5a8537f90d143abd5bb2f658fa69c388da9677b"
+  channel: "stable"
 
 project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+      base_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+    - platform: android
+      create_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+      base_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+    - platform: ios
+      create_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+      base_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+    - platform: macos
+      create_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+      base_revision: f5a8537f90d143abd5bb2f658fa69c388da9677b
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

cryptography_flutter/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 2.3.3
 * Improves dependency constraints.
+* Fixes problems when building the plugin.
 
 ## 2.3.2
 * Improves documentation.
@@ -9,30 +10,30 @@
 * Fixes type inference warnings by Swift compiler.
 
 ## 2.3.0
-* Adds support for algorithms. In this version, the following operating system API adapters pass 
+* Adds support for algorithms. In this version, the following operating system API adapters pass
   tests:
-  * Android:
-    * FlutterAesGcm
-    * FlutterChacha20.poly1305Aead()
-    * FlutterHmac.sha1()
-    * FlutterHmac.sha224()
-    * FlutterHmac.sha256()
-    * FlutterHmac.sha384()
-    * FlutterHmac.sha512()
-    * FlutterPbkdf2()
-  * Apple operating systems:
-    * FlutterAesGcm
-    * FlutterChacha20.poly1305Aead()
-    * FlutterEd25519()
-    * FlutterEcdh.p256()
-    * FlutterEcdh.p384()
-    * FlutterEcdh.p521()
-    * FlutterEcdsa.p256()
-    * FlutterEcdsa.p384()
-    * FlutterEcdsa.p521()
-    * FlutterHmac.sha256()
-    * FlutterHmac.sha512()
-    * FlutterX25519()
+    * Android:
+        * FlutterAesGcm
+        * FlutterChacha20.poly1305Aead()
+        * FlutterHmac.sha1()
+        * FlutterHmac.sha224()
+        * FlutterHmac.sha256()
+        * FlutterHmac.sha384()
+        * FlutterHmac.sha512()
+        * FlutterPbkdf2()
+    * Apple operating systems:
+        * FlutterAesGcm
+        * FlutterChacha20.poly1305Aead()
+        * FlutterEd25519()
+        * FlutterEcdh.p256()
+        * FlutterEcdh.p384()
+        * FlutterEcdh.p521()
+        * FlutterEcdsa.p256()
+        * FlutterEcdsa.p384()
+        * FlutterEcdsa.p521()
+        * FlutterHmac.sha256()
+        * FlutterHmac.sha512()
+        * FlutterX25519()
 * Requires "package:cryptography" 2.5.0, which has enough DER encoding/decoding support for us to
   use Apple's CryptoKit ECDH/ECDSA functions.
 * Adds support for reading names of crypto providers in Android.

cryptography_flutter/README.md

@@ -51,8 +51,8 @@ In _pubspec.yaml_:
 
 ```yaml
 dependencies:
-  cryptography: ^2.7.0
-  cryptography_flutter: ^2.3.2
+  cryptography: ^2.8.0
+  cryptography_flutter: ^2.3.3
 ```
 
 That's it!

cryptography_flutter/android/build.gradle

@@ -1,16 +1,16 @@
-group 'dev.dint.cryptography_flutter'
-version '1.0-SNAPSHOT'
+group = "dev.dint.cryptography_flutter"
+version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = "2.2.20"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.11.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
@@ -21,35 +21,50 @@ allprojects {
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 android {
-    if (project.android.hasProperty("namespace")) {
-        namespace "dev.dint.cryptography_flutter"
-    }
+    namespace = "dev.dint.cryptography_flutter"
 
-    compileSdkVersion 31
+    compileSdk = 36
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += "src/main/kotlin"
+        test.java.srcDirs += "src/test/kotlin"
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdk = 24
+    }
+
+    dependencies {
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("org.mockito:mockito-core:5.0.0")
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
     }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.security:security-crypto:1.1.0-alpha05"
+    implementation "androidx.security:security-crypto:1.1.0"
 }