Upgrade dependencies + ios xcframework (#78)

Author: jerson

.github/workflows/example-docker.yml

@@ -10,15 +10,15 @@ jobs:
   web:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v6
         with:
           context: .
           file: ./example/Dockerfile

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: scottbrenner/generate-changelog-action@master

.github/workflows/tests_android.yml

@@ -11,12 +11,12 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-      - uses: android-actions/setup-android@v2
+      - uses: android-actions/setup-android@v3
       - uses: subosito/flutter-action@main
         with:
           flutter-version: '3.x'

.github/workflows/tests_browser.yml

@@ -12,7 +12,7 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@main
         with:
           flutter-version: '3.x'

.github/workflows/tests_ios.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: futureware-tech/simulator-action@v1
         with:
           os: iOS
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@main
         with:
           flutter-version: '3.x'

.github/workflows/tests_linux.yml

@@ -11,7 +11,7 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@main
         with:
           flutter-version: '3.x'
@@ -23,4 +23,4 @@ jobs:
           flutter pub get
       - run: sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
       - run: "cd example && DISPLAY=:99 flutter test -d linux integration_test/app_test.dart"
-      - run: "cd example && flutter test test/app_test.dart"
+      - run: "cd example && flutter test test/app_test.dart"

.github/workflows/tests_macos.yml

@@ -11,7 +11,7 @@ jobs:
   e2e:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@main
         with:
           flutter-version: '3.x'

.github/workflows/tests_windows.yml

@@ -11,7 +11,7 @@ jobs:
   e2e:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@main
         with:
           flutter-version: '3.x'

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.9.0
+- Updates binaries
+- Add XCFramework for ios 
+
 ## 3.8.3
 - Migrate to package:web
 

Makefile

@@ -3,6 +3,10 @@ default: test
 test:
 	cd example && flutter test integration_test/app_test.dart
 
+fmt:
+	dart format . && dart fix --apply 
+	cd example && dart format . && dart fix --apply 
+
 upgrade: upgrade-libs upgrade-flatbuffers
 
 upgrade-libs:
@@ -12,4 +16,4 @@ upgrade-flatbuffers:
 	./scripts/upgrade_bridge_flatbuffers.sh
 
 example-web:
-	docker build -t flutter-openpgp-web -f example/Dockerfile .
+	docker build -t flutter-openpgp-web -f example/Dockerfile .

analysis_options.yaml

@@ -1,3 +1,5 @@
+include: package:flutter_lints/flutter.yaml
+
 analyzer:
   exclude: 
     - example/**

android/.gitignore

@@ -6,3 +6,4 @@
 .DS_Store
 /build
 /captures
+.cxx

android/build.gradle

@@ -1,54 +1,73 @@
-group 'dev.jerson.openpgp'
-version '1.0'
+group = "dev.jerson.openpgp"
+version = "1.0-SNAPSHOT"
 
 buildscript {
+    ext.kotlin_version = "1.8.22"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 android {
-    // Conditional for compatibility with AGP <4.2.
     if (project.android.hasProperty("namespace")) {
-      namespace 'dev.jerson.openpgp'
+        namespace = "dev.jerson.openpgp"
+    }
+
+    compileSdk = 34
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
-    compileSdkVersion 31
+    sourceSets {
+        main {
+            java.srcDirs += "src/main/kotlin"
+            jniLibs.srcDirs = ['src/main/jniLibs']
+        }
+        test {
+            java.srcDirs += "src/test/kotlin"
+        }
+    }
 
     defaultConfig {
-        minSdkVersion 19
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    lintOptions {
-        disable 'InvalidPackage'
+        minSdk = 21
     }
-}
 
-task nativeLibsToJar(type: Jar, description: 'create a jar archive of the native libs') {
-    destinationDirectory.set(file("$buildDir/native-libs"))
-    archiveBaseName = 'native-libs'
-    from fileTree(dir: 'libs', include: '**/*.so')
-    into 'lib/'
-}
+    dependencies {
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("org.mockito:mockito-core:5.0.0")
+    }
 
-tasks.withType(JavaCompile) {
-    compileTask -> compileTask.dependsOn(nativeLibsToJar)
-}
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
 
-dependencies {
-    api fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
+    }
 }

android/gradle.properties

@@ -0,0 +1,35 @@
+package dev.jerson.openpgp
+
+import androidx.annotation.NonNull
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import io.flutter.plugin.common.MethodChannel.Result
+
+/** OpenpgpPlugin */
+class OpenpgpPlugin: FlutterPlugin, MethodCallHandler {
+  /// The MethodChannel that will the communication between Flutter and native Android
+  ///
+  /// This local reference serves to register the plugin with the Flutter Engine and unregister it
+  /// when the Flutter Engine is detached from the Activity
+  private lateinit var channel : MethodChannel
+
+  override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "openpgp")
+    channel.setMethodCallHandler(this)
+  }
+
+  override fun onMethodCall(call: MethodCall, result: Result) {
+    if (call.method == "getPlatformVersion") {
+      result.success("Android ${android.os.Build.VERSION.RELEASE}")
+    } else {
+      result.notImplemented()
+    }
+  }
+
+  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+    channel.setMethodCallHandler(null)
+  }
+}

android/gradle/wrapper/gradle-wrapper.properties

@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks