Skip to content

Commit 3023943

Browse files
committed
updated deps
1 parent dcd9382 commit 3023943

File tree

141 files changed

+2042
-1856
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+2042
-1856
lines changed

.github/workflows/example-docker.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
web:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: docker/setup-qemu-action@v1
15-
- uses: docker/setup-buildx-action@v1
16-
- uses: docker/login-action@v1
13+
- uses: actions/checkout@v4
14+
- uses: docker/setup-qemu-action@v3
15+
- uses: docker/setup-buildx-action@v3
16+
- uses: docker/login-action@v3
1717
with:
1818
registry: ghcr.io
1919
username: ${{ github.repository_owner }}
2020
password: ${{ secrets.CR_PAT }}
21-
- uses: docker/build-push-action@v2
21+
- uses: docker/build-push-action@v6
2222
with:
2323
context: .
2424
file: ./example/Dockerfile

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515
- uses: scottbrenner/generate-changelog-action@master

.github/workflows/tests_android.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
e2e:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions/setup-java@v3
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-java@v4
1616
with:
1717
distribution: 'temurin'
1818
java-version: '17'
19-
- uses: android-actions/setup-android@v2
19+
- uses: android-actions/setup-android@v3
2020
- uses: subosito/flutter-action@main
2121
with:
2222
flutter-version: '3.x'

.github/workflows/tests_browser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
e2e:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- uses: subosito/flutter-action@main
1717
with:
1818
flutter-version: '3.x'

.github/workflows/tests_ios.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: futureware-tech/simulator-action@v1
1515
with:
1616
os: iOS
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: subosito/flutter-action@main
1919
with:
2020
flutter-version: '3.x'

.github/workflows/tests_linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
e2e:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: subosito/flutter-action@main
1616
with:
1717
flutter-version: '3.x'
@@ -23,4 +23,4 @@ jobs:
2323
flutter pub get
2424
- run: sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
2525
- run: "cd example && DISPLAY=:99 flutter test -d linux integration_test/app_test.dart"
26-
- run: "cd example && flutter test test/app_test.dart"
26+
- run: "cd example && flutter test test/app_test.dart"

.github/workflows/tests_macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
e2e:
1212
runs-on: macos-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: subosito/flutter-action@main
1616
with:
1717
flutter-version: '3.x'

.github/workflows/tests_windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
e2e:
1212
runs-on: windows-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: subosito/flutter-action@main
1616
with:
1717
flutter-version: '3.x'

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.9.0
2+
- Updates binaries
3+
- Add XCFramework for ios
4+
15
## 3.8.3
26
- Migrate to package:web
37

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ default: test
33
test:
44
cd example && flutter test integration_test/app_test.dart
55

6+
fmt:
7+
dart format . && dart fix --apply
8+
cd example && dart format . && dart fix --apply
9+
610
upgrade: upgrade-libs upgrade-flatbuffers
711

812
upgrade-libs:
@@ -12,4 +16,4 @@ upgrade-flatbuffers:
1216
./scripts/upgrade_bridge_flatbuffers.sh
1317

1418
example-web:
15-
docker build -t flutter-openpgp-web -f example/Dockerfile .
19+
docker build -t flutter-openpgp-web -f example/Dockerfile .

analysis_options.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include: package:flutter_lints/flutter.yaml
2+
13
analyzer:
24
exclude:
35
- example/**

android/.gitignore

100755100644
+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
.DS_Store
77
/build
88
/captures
9+
.cxx

android/build.gradle

100755100644
+44-25
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,73 @@
1-
group 'dev.jerson.openpgp'
2-
version '1.0'
1+
group = "dev.jerson.openpgp"
2+
version = "1.0-SNAPSHOT"
33

44
buildscript {
5+
ext.kotlin_version = "1.8.22"
56
repositories {
67
google()
78
mavenCentral()
89
}
910

1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.1.0'
12+
classpath("com.android.tools.build:gradle:8.1.0")
13+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1214
}
1315
}
1416

15-
rootProject.allprojects {
17+
allprojects {
1618
repositories {
1719
google()
1820
mavenCentral()
1921
}
2022
}
2123

22-
apply plugin: 'com.android.library'
24+
apply plugin: "com.android.library"
25+
apply plugin: "kotlin-android"
2326

2427
android {
25-
// Conditional for compatibility with AGP <4.2.
2628
if (project.android.hasProperty("namespace")) {
27-
namespace 'dev.jerson.openpgp'
29+
namespace = "dev.jerson.openpgp"
30+
}
31+
32+
compileSdk = 34
33+
34+
compileOptions {
35+
sourceCompatibility = JavaVersion.VERSION_1_8
36+
targetCompatibility = JavaVersion.VERSION_1_8
37+
}
38+
39+
kotlinOptions {
40+
jvmTarget = JavaVersion.VERSION_1_8
2841
}
2942

30-
compileSdkVersion 31
43+
sourceSets {
44+
main {
45+
java.srcDirs += "src/main/kotlin"
46+
jniLibs.srcDirs = ['src/main/jniLibs']
47+
}
48+
test {
49+
java.srcDirs += "src/test/kotlin"
50+
}
51+
}
3152

3253
defaultConfig {
33-
minSdkVersion 19
34-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
35-
}
36-
lintOptions {
37-
disable 'InvalidPackage'
54+
minSdk = 21
3855
}
39-
}
4056

41-
task nativeLibsToJar(type: Jar, description: 'create a jar archive of the native libs') {
42-
destinationDirectory.set(file("$buildDir/native-libs"))
43-
archiveBaseName = 'native-libs'
44-
from fileTree(dir: 'libs', include: '**/*.so')
45-
into 'lib/'
46-
}
57+
dependencies {
58+
testImplementation("org.jetbrains.kotlin:kotlin-test")
59+
testImplementation("org.mockito:mockito-core:5.0.0")
60+
}
4761

48-
tasks.withType(JavaCompile) {
49-
compileTask -> compileTask.dependsOn(nativeLibsToJar)
50-
}
62+
testOptions {
63+
unitTests.all {
64+
useJUnitPlatform()
5165

52-
dependencies {
53-
api fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
66+
testLogging {
67+
events "passed", "skipped", "failed", "standardOut", "standardError"
68+
outputs.upToDateWhen {false}
69+
showStandardStreams = true
70+
}
71+
}
72+
}
5473
}

android/gradle.properties

-4
This file was deleted.

android/gradle/wrapper/gradle-wrapper.properties

-5
This file was deleted.

android/settings.gradle

100755100644
File mode changed.

android/src/main/AndroidManifest.xml

100755100644
File mode changed.

android/src/main/java/dev/jerson/openpgp/OpenpgpPlugin.java

-36
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package dev.jerson.openpgp
2+
3+
import androidx.annotation.NonNull
4+
5+
import io.flutter.embedding.engine.plugins.FlutterPlugin
6+
import io.flutter.plugin.common.MethodCall
7+
import io.flutter.plugin.common.MethodChannel
8+
import io.flutter.plugin.common.MethodChannel.MethodCallHandler
9+
import io.flutter.plugin.common.MethodChannel.Result
10+
11+
/** OpenpgpPlugin */
12+
class OpenpgpPlugin: FlutterPlugin, MethodCallHandler {
13+
/// The MethodChannel that will the communication between Flutter and native Android
14+
///
15+
/// This local reference serves to register the plugin with the Flutter Engine and unregister it
16+
/// when the Flutter Engine is detached from the Activity
17+
private lateinit var channel : MethodChannel
18+
19+
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
20+
channel = MethodChannel(flutterPluginBinding.binaryMessenger, "openpgp")
21+
channel.setMethodCallHandler(this)
22+
}
23+
24+
override fun onMethodCall(call: MethodCall, result: Result) {
25+
if (call.method == "getPlatformVersion") {
26+
result.success("Android ${android.os.Build.VERSION.RELEASE}")
27+
} else {
28+
result.notImplemented()
29+
}
30+
}
31+
32+
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
33+
channel.setMethodCallHandler(null)
34+
}
35+
}

example/android/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
1212
**/*.keystore
1313
**/*.jks

0 commit comments

Comments
 (0)