Skip to content

Commit a8bbe65

Browse files
sosweethamsosweetham
committed
merge: main
2 parents 81203b8 + 4644f3d commit a8bbe65

File tree

36 files changed

+1663
-318
lines changed

36 files changed

+1663
-318
lines changed

‎infrastructure/eid-wallet/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eid-wallet",
3-
"version": "0.2.1",
3+
"version": "0.3.0",
44
"description": "",
55
"type": "module",
66
"scripts": {
@@ -29,6 +29,7 @@
2929
"@tauri-apps/plugin-barcode-scanner": "^2.2.0",
3030
"@tauri-apps/plugin-biometric": "^2.2.0",
3131
"@tauri-apps/plugin-deep-link": "^2.4.1",
32+
"@tauri-apps/plugin-notification": "^2.3.1",
3233
"@tauri-apps/plugin-opener": "^2",
3334
"@tauri-apps/plugin-store": "^2.2.0",
3435
"@veriff/incontext-sdk": "^2.4.0",

‎infrastructure/eid-wallet/src-tauri/Cargo.lock‎

Lines changed: 69 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infrastructure/eid-wallet/src-tauri/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ tauri-build = { version = "2", features = [] }
2121
tauri = { version = "2", features = [] }
2222
tauri-plugin-opener = "2"
2323
tauri-plugin-deep-link = "2"
24+
tauri-plugin-notification = "2"
2425
serde = { version = "1", features = ["derive"] }
2526
serde_json = "1"
2627
tauri-plugin-store = "2.2.0"
28+
uuid = { version = "1.0", features = ["v4"] }
2729

2830

2931
argon2 = { version = "0.5.3" }

‎infrastructure/eid-wallet/src-tauri/capabilities/mobile.json‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
2-
"$schema": "../gen/schemas/mobile-schema.json",
3-
"identifier": "mobile-capability",
4-
"description": "Capability for the main window on mobile",
5-
"windows": ["main"],
6-
"permissions": [
7-
"core:default",
8-
"opener:default",
9-
"store:default",
10-
"biometric:default",
11-
"barcode-scanner:default",
12-
"deep-link:default",
13-
"crypto-hw:default"
14-
],
15-
"platforms": ["iOS", "android"]
16-
}
2+
"$schema": "../gen/schemas/mobile-schema.json",
3+
"identifier": "mobile-capability",
4+
"description": "Capability for the main window on mobile",
5+
"windows": [
6+
"main"
7+
],
8+
"permissions": [
9+
"core:default",
10+
"opener:default",
11+
"store:default",
12+
"biometric:default",
13+
"barcode-scanner:default",
14+
"deep-link:default",
15+
"crypto-hw:default",
16+
"notification:default"
17+
],
18+
"platforms": [
19+
"iOS",
20+
"android"
21+
]
22+
}

‎infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infrastructure/eid-wallet/src-tauri/gen/android/app/arm64/release/app-arm64-release.aab‎

10.3 MB
Binary file not shown.

‎infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
1414
}
1515

1616
android {
17-
compileSdk = 34
17+
compileSdk = 35
1818
namespace = "foundation.metastate.eid_wallet"
1919
defaultConfig {
2020
manifestPlaceholders["usesCleartextTraffic"] = "false"
2121
applicationId = "foundation.metastate.eid_wallet"
2222
minSdk = 24
23-
targetSdk = 34
23+
targetSdk = 35
2424
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
2525
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
2626
}

‎infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33
<uses-permission android:name="android.permission.INTERNET" />
4+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
5+
<uses-permission android:name="android.permission.VIBRATE" />
46

57
<!-- AndroidTV support -->
68
<uses-feature android:name="android.software.leanback" android:required="false" />

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
245245
);
246246
runOnlyForDeploymentPostprocessing = 0;
247-
shellPath = /bin/sh;
247+
shellPath = /bin/zsh;
248248
shellScript = "[ -s \"$NVM_DIR/nvm.sh\" ] && \\. \"$NVM_DIR/nvm.sh\"\npnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}\n";
249249
};
250250
/* End PBXShellScriptBuildPhase section */
@@ -388,7 +388,7 @@
388388
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
389389
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
390390
CODE_SIGN_IDENTITY = "iPhone Developer";
391-
CURRENT_PROJECT_VERSION = 0.2.1.2;
391+
CURRENT_PROJECT_VERSION = 0.3.0.0;
392392
DEVELOPMENT_TEAM = M49C8XS835;
393393
ENABLE_BITCODE = NO;
394394
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
@@ -415,8 +415,8 @@
415415
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
416416
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
417417
);
418-
MARKETING_VERSION = 0.2.1;
419-
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
418+
MARKETING_VERSION = 0.3.0;
419+
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
420420
PRODUCT_NAME = "eID for W3DS";
421421
SDKROOT = iphoneos;
422422
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -436,7 +436,7 @@
436436
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
437437
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
438438
CODE_SIGN_IDENTITY = "iPhone Developer";
439-
CURRENT_PROJECT_VERSION = 0.2.1.2;
439+
CURRENT_PROJECT_VERSION = 0.3.0.0;
440440
DEVELOPMENT_TEAM = M49C8XS835;
441441
ENABLE_BITCODE = NO;
442442
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
@@ -463,8 +463,8 @@
463463
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
464464
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
465465
);
466-
MARKETING_VERSION = 0.2.1;
467-
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
466+
MARKETING_VERSION = 0.3.0;
467+
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
468468
PRODUCT_NAME = "eID for W3DS";
469469
SDKROOT = iphoneos;
470470
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.2.1</string>
18+
<string>0.3.0</string>
1919
<key>CFBundleURLTypes</key>
2020
<array>
2121
<dict>
@@ -28,7 +28,7 @@
2828
</dict>
2929
</array>
3030
<key>CFBundleVersion</key>
31-
<string>0.2.1.2</string>
31+
<string>0.3.0.0</string>
3232
<key>LSRequiresIPhoneOS</key>
3333
<true/>
3434
<key>NSAppTransportSecurity</key>
@@ -61,4 +61,4 @@
6161
<string>UIInterfaceOrientationLandscapeRight</string>
6262
</array>
6363
</dict>
64-
</plist>
64+
</plist>

0 commit comments

Comments
 (0)