Move module multipaz-models into multipaz as a package.

Test: All Unit tests are passing (bar Longfellow).
Test: Manually tested via samples/testapp on Android.

Signed-off-by: koukarine <[email protected]>

Author: koukarine

matcherTest/CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.16)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+add_library(
+        MatcherTest
+        SHARED
+        MatcherTest.cpp
+        DcqlQueryTest.cpp
+        ../multipaz/src/androidMain/matcher/Request.cpp
+        ../multipaz/src/androidMain/matcher/CredentialDatabase.cpp
+        ../multipaz/src/androidMain/matcher/cppbor.cpp
+        ../multipaz/src/androidMain/matcher/cppbor_parse.cpp
+        ../multipaz/src/androidMain/matcher/cJSON.c
+        ../multipaz/src/androidMain/matcher/matcher.cpp
+        ../multipaz/src/androidMain/matcher/logger.cpp
+        ../multipaz/src/androidMain/matcher/dcql.cpp
+        ../multipaz/src/androidMain/matcher/paths.cpp
+)
+
+target_link_libraries(MatcherTest android log)
+
+target_compile_definitions(MatcherTest PRIVATE MATCHER_TEST_BUILD)

multipaz-models/matcherTest/DcqlQueryTest.cpp renamed to matcherTest/DcqlQueryTest.cpp

@@ -6,8 +6,8 @@
 #include <string>
 #include <format>
 
-#include "../src/androidMain/matcher/CredentialDatabase.h"
-#include "../src/androidMain/matcher/Request.h"
+#include "../multipaz/src/androidMain/matcher/CredentialDatabase.h"
+#include "../multipaz/src/androidMain/matcher/Request.h"
 
 extern "C"
 JNIEXPORT jstring JNICALL

multipaz-models/matcherTest/MatcherTest.cpp renamed to matcherTest/MatcherTest.cpp

@@ -75,7 +75,6 @@ kotlin {
                 api(libs.jetbrains.navigation.runtime)
 
                 implementation(project(":multipaz"))
-                implementation(project(":multipaz-models"))
                 implementation(libs.kotlinx.datetime)
                 implementation(libs.kotlinx.serialization.json)
                 implementation(libs.kotlinx.io.core)

multipaz-models/matcherTest/build.gradle.kts renamed to matcherTest/build.gradle.kts

@@ -21,7 +21,6 @@ import org.multipaz.documenttype.DocumentTypeRepository
 import org.multipaz.mdoc.engagement.buildDeviceEngagement
 import org.multipaz.mdoc.role.MdocRole
 import org.multipaz.mdoc.transport.MdocTransportFactory
-import org.multipaz.mdoc.transport.MdocTransportOptions
 import org.multipaz.mdoc.transport.advertise
 import org.multipaz.mdoc.transport.waitForConnection
 import org.multipaz.models.presentment.MdocPresentmentMechanism

multipaz-compose/build.gradle.kts

@@ -26,7 +26,6 @@ dependencies {
     ksp(project(":multipaz-cbor-rpc"))
     implementation(project(":multipaz"))
     implementation(project(":multipaz-doctypes"))
-    implementation(project(":multipaz-models"))
     implementation(project(":multipaz-longfellow"))
 
     implementation(libs.kotlinx.datetime)

multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/presentment/MdocProximityQrPresentment.kt

@@ -1,4 +1,5 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.kotlin.dsl.implementation
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.get
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
@@ -102,6 +103,7 @@ kotlin {
                 implementation(libs.bouncy.castle.bcpkix)
                 implementation(libs.kotlin.test)
                 implementation(libs.kotlinx.coroutines.test)
+                implementation(libs.ktor.client.mock)
                 implementation(project(":multipaz-doctypes"))
             }
         }
@@ -126,6 +128,12 @@ kotlin {
             dependencies {
                 implementation(libs.androidx.biometrics)
                 implementation(libs.androidx.lifecycle.viewmodel)
+                implementation(libs.tink)
+                implementation(libs.accompanist.permissions)
+                implementation(libs.androidx.material)
+                implementation(libs.play.services.identity.credentials)
+                implementation(libs.androidx.credentials)
+                implementation(libs.androidx.credentials.play.services.auth)
             }
         }
 
@@ -152,7 +160,9 @@ kotlin {
         }
 
         val androidInstrumentedTest by getting {
+            dependsOn(commonTest)
             dependencies {
+                implementation(project(":matcherTest"))
                 implementation(libs.androidx.sqlite)
                 implementation(libs.androidx.sqlite.framework)
                 implementation(libs.androidx.sqlite.bundled)
@@ -217,6 +227,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
     dependencies {
+        implementation(libs.kotlinx.datetime)
     }
 
     packaging {