Skip to content

Commit 21c87d4

Browse files
authored
Remove multipaz-extras modules. (#1319)
1. Remove modules moving to multipaz-extras repo (jpeg2k, mtrd-reader, mtrd-reader-android, multipaz-vision) along with their external dependencies. 2. Remove corresponding use cases from Multipaz TestApp. Test: All Unit tests are passing (bar KI). Test: Manually tested via samples/testapp on Android and iOS. Signed-off-by: koukarine <[email protected]>
1 parent c362d65 commit 21c87d4

File tree

78 files changed

+24
-6687
lines changed

Some content is hidden

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

78 files changed

+24
-6687
lines changed

DEVELOPER-ENVIRONMENT.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,7 @@ $EDITOR samples/testapp/iosApp/DeveloperConfig.xcconfig
3737
```
3838
In the opened editor, add the Team ID assigned to you by Apple.
3939

40-
You also need to install [CocoaPods](https://cocoapods.org/) and set up your environment so
41-
it's functional (e.g. the `pod` program is in PATH). Then you need to run
42-
43-
```shell
44-
pod install
45-
```
46-
47-
Once this is done, you can open `TestApp.xcworkspace` in Xcode, select TestApp and a target
40+
Then, you can open `/samples/testapp/iosApp/TestApp.xcodeproj` in Xcode, select TestApp and a target
4841
(e.g. an iPhone), and run the app.
4942

5043
# Linux and Windows

Podfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

Podfile.lock

Lines changed: 0 additions & 115 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ The project provides libraries written in [Kotlin Multiplatform](https://kotlinl
3333
- `multipaz-longfellow` bundles the [Google Longfellow-ZK](https://github.com/google/longfellow-zk) library
3434
and integrates with the core `multipaz` for Zero-Knowledge Proofs
3535
according to latest available [ISO/IEC 18013-5 Second Edition draft](https://github.com/ISOWG10/ISO-18013).
36-
- `multipaz-vision` provides barcode scanning, face detection, and face
37-
matching.
3836

3937
## Command-line tool
4038

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ plugins {
6565
alias(libs.plugins.navigation.safe.args) apply false
6666
alias(libs.plugins.parcelable) apply false
6767
alias(libs.plugins.buildconfig) apply false
68-
alias(libs.plugins.kotlinCocoapods) apply false
6968
alias(libs.plugins.skie) apply false
7069
id("org.jetbrains.dokka") version "2.0.0"
7170
}

gradle/libs.versions.toml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ androidx-espresso-core = "3.7.0"
1010
androidx-material = "1.12.0"
1111
androidx-test-junit = "1.3.0"
1212
compose-plugin = "1.8.2"
13-
faceDetection = "16.1.7"
1413
junit = "4.13.2"
1514
kotlin = "2.2.0"
1615
kotlinx-coroutines = "1.10.2"
@@ -24,9 +23,6 @@ androidx-biometrics = "1.2.0-alpha05"
2423
uiToolingPreview = "1.8.3"
2524
volley = "1.2.1"
2625
cbor = "0.9"
27-
scuba = "0.0.26"
28-
jmrtd = "0.8.2"
29-
mlkit = "16.0.1"
3026
camera = "1.4.2"
3127
ktor = "2.3.13"
3228
logback = "1.5.18"
@@ -49,19 +45,13 @@ play-services-identity-credentials = "16.0.0-alpha08"
4945
androidx-credentials = "1.5.0"
5046
androidx-credentials-registry-provider = "1.0.0-alpha01"
5147
errorprone = "2.41.0"
52-
mlkit-barcode-scanning = "17.3.0"
5348
semver = "3.0.0"
5449
skie = "0.10.5"
5550
process-phoenix = "3.0.0"
56-
litert = "1.4.0"
57-
litertGpu = "1.4.0"
58-
litertMetadata = "1.4.0"
59-
litertSupport = "1.4.0"
6051
coil = "3.3.0"
6152

6253
[libraries]
6354
androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
64-
face-detection = { module = "com.google.mlkit:face-detection", version.ref = "faceDetection" }
6555
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
6656
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref="kotlinx-coroutines" }
6757
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
@@ -85,9 +75,6 @@ ksp-symbol-processing-api = {module="com.google.devtools.ksp:symbol-processing-a
8575
androidx-biometrics = { module = "androidx.biometric:biometric", version.ref = "androidx-biometrics" }
8676
volley = { module = "com.android.volley:volley", version.ref = "volley" }
8777
cbor = { module = "co.nstant.in:cbor", version.ref = "cbor" }
88-
net-sf-scuba-scuba-sc-android = { group = "net.sf.scuba", name = "scuba-sc-android", version.ref="scuba" }
89-
org-jmrtd-jmrtd = { group = "org.jmrtd", name ="jmrtd", version.ref="jmrtd" }
90-
com-google-mlkit-text-recognition = { group = "com.google.mlkit", name = "text-recognition", version.ref="mlkit" }
9178
androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "camera" }
9279
androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "camera" }
9380
androidx-camera-camera2 = { group = "androidx.camera", name = "camera-camera2", version.ref = "camera" }
@@ -126,13 +113,8 @@ androidx-credentials = { module = "androidx.credentials:credentials", version.re
126113
androidx-credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref="androidx-credentials" }
127114
androidx-credentials-registry-provider = { module = "androidx.credentials.registry:registry-provider", version.ref = "androidx-credentials-registry-provider" }
128115
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref="errorprone"}
129-
mlkit-barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref="mlkit-barcode-scanning"}
130116
semver = { module = "io.github.z4kn4fein:semver", version.ref="semver" }
131117
process-phoenix = { module = "com.jakewharton:process-phoenix", version.ref="process-phoenix" }
132-
litert-gpu = { module = "com.google.ai.edge.litert:litert-gpu", version.ref = "litertGpu" }
133-
litert-metadata = { module = "com.google.ai.edge.litert:litert-metadata", version.ref = "litertMetadata" }
134-
litert-support = { module = "com.google.ai.edge.litert:litert-support", version.ref = "litertSupport" }
135-
litert = { module = "com.google.ai.edge.litert:litert", version.ref = "litert" }
136118
coil-core = { module = "io.coil-kt.coil3:coil-core", version.ref = "coil" }
137119
coil-compose-core = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil" }
138120
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
@@ -151,5 +133,4 @@ parcelable = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotl
151133
buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }
152134
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
153135
ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
154-
kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
155136
skie = { id = "co.touchlab.skie", version.ref = "skie" }

jpeg2k/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

jpeg2k/build.gradle.kts

Lines changed: 0 additions & 49 deletions
This file was deleted.

jpeg2k/src/main/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)