chore: ios updates

sphereon-ci · sphereon-ci · commit 165ac26efc26 · 2025-12-12T14:06:20.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -53,9 +53,9 @@ plugins {
     alias(sphereonplug.plugins.dev.petuska.npm.publish.dev.petuska.npm.publish.gradle.plugin) apply false
     alias(sphereonplug.plugins.software.amazon.app.platform) apply false
     alias(sphereonplug.plugins.org.jetbrains.kotlinx.atomicfu) apply false
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.conventions) apply false
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.integration.tests) apply false
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication) apply false
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.conventions) apply false
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.integration.tests) apply false
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication) apply false
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose) apply false
     alias(sphereonplug.plugins.org.jetbrains.compose) apply false
     alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload) apply false
diff --git a/example/holder/app/composeApp/build.gradle.kts b/example/holder/app/composeApp/build.gradle.kts
@@ -124,6 +124,18 @@ kotlin {
 //            implementation(libs.amz.app.platform.presenter.molecule.public)
             api(libs.amz.app.platform.presenter.molecule.impl)
         }
+
+        iosX64Main.dependencies {
+            api(libs.amz.app.platform.presenter.molecule.impl)
+        }
+
+        iosArm64Main.dependencies {
+            api(libs.amz.app.platform.presenter.molecule.impl)
+        }
+
+        iosSimulatorArm64Main.dependencies {
+            api(libs.amz.app.platform.presenter.molecule.impl)
+        }
         commonMain.dependencies {
             implementation(compose.runtime)
             implementation(compose.foundation)
@@ -141,6 +153,7 @@ kotlin {
             // Kiwa SDK interfaces and common code
             api(libs.kiwa.holder.sdk.public)
             api(libs.sphereon.mdoc.datatransfer)
+
             api(libs.amz.app.platform.presenter.molecule.public)
             api(libs.amz.app.platform.renderer.compose.public)
             api(libs.amz.app.platform.scope.public)
diff --git a/example/holder/ui/auth/impl/build.gradle.kts b/example/holder/ui/auth/impl/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
diff --git a/example/holder/ui/auth/public/build.gradle.kts b/example/holder/ui/auth/public/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     alias(sphereonplug.plugins.com.android.library)
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
diff --git a/example/holder/ui/card/impl/build.gradle.kts b/example/holder/ui/card/impl/build.gradle.kts
@@ -28,7 +28,7 @@ plugins {
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
diff --git a/example/holder/ui/card/public/build.gradle.kts b/example/holder/ui/card/public/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
diff --git a/example/holder/ui/core/impl/build.gradle.kts b/example/holder/ui/core/impl/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     alias(sphereonplug.plugins.com.android.library)
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
     alias(sphereonplug.plugins.com.google.devtools.ksp.com.google.devtools.ksp.gradle.plugin)
 }
diff --git a/example/holder/ui/core/public/build.gradle.kts b/example/holder/ui/core/public/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     alias(sphereonplug.plugins.com.android.library)
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
diff --git a/example/holder/ui/elicense/impl/build.gradle.kts b/example/holder/ui/elicense/impl/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
@@ -65,6 +65,7 @@ kotlin {
             implementation(libs.sphereon.mdoc.datatransfer)
             implementation(libs.kottage)
             implementation(libs.qrcode.kotlin)
+            implementation(libs.easyqrscan)
             implementation(projects.example.holder.ui.auth.kiwaExampleHolderUiAuthPublic)
             implementation(projects.example.holder.ui.auth.kiwaExampleHolderUiAuthImpl)
             implementation(projects.example.holder.ui.core.kiwaExampleHolderUiCorePublic)
diff --git a/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/issuance/KiwaWalletServiceImpl.kt b/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/issuance/KiwaWalletServiceImpl.kt
@@ -57,7 +57,7 @@ class KiwaWalletServiceImpl(
 
     init {
         DefaultCallbacks.setCoseCryptoDefault(
-            CoseCryptoProviderToCallbackAdapter(keyManagerService = services.crypto.keyManagerService)
+            CoseCryptoProviderToCallbackAdapter(keyManagerServiceProvider = {services.crypto.keyManagerService})
         )
     }
 
diff --git a/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/issuance/TestPidIssuerImpl.kt b/example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/issuance/TestPidIssuerImpl.kt
@@ -77,7 +77,7 @@ class TestPidIssuerImpl(
     private val initMutex = Mutex()
 
     init {
-        DefaultCallbacks.setCoseCryptoDefault(CoseCryptoProviderToCallbackAdapter(keyManagerService = kms))
+        DefaultCallbacks.setCoseCryptoDefault(CoseCryptoProviderToCallbackAdapter(keyManagerServiceProvider = {kms}))
         /*registerMemoryKeyStoreSerialization()
         registerSoftwareKeyStoreSerialization()
         registerSoftwareKmsSerialization()*/
@@ -476,13 +476,13 @@ class TestPidIssuerImpl(
 
             // Pre-calculate time values once
             val currentTime = Clock.System.now()
-            val signedTime = DateTimeUtils.DEFAULT.dateTime(
+            val signedTime = DateTimeUtils.DEFAULTS.dateTime(
                 epochSeconds = (currentTime.epochSeconds - TIME_OFFSET_PAST_SECONDS).toInt()
             )
-            val validFromTime = DateTimeUtils.DEFAULT.dateTime(
+            val validFromTime = DateTimeUtils.DEFAULTS.dateTime(
                 epochSeconds = (currentTime.epochSeconds - TIME_OFFSET_PAST_SECONDS).toInt()
             )
-            val validUntilTime = DateTimeUtils.DEFAULT.dateTime(
+            val validUntilTime = DateTimeUtils.DEFAULTS.dateTime(
                 epochSeconds = (currentTime.epochSeconds + TIME_OFFSET_FUTURE_SECONDS).toInt()
             )
 
diff --git a/example/holder/ui/elicense/public/build.gradle.kts b/example/holder/ui/elicense/public/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
 //    alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)
-    alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)
+    alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)
     id("maven-publish")
 }
 
diff --git a/example/holder/xcframework/build.gradle.kts b/example/holder/xcframework/build.gradle.kts
@@ -15,9 +15,10 @@
  *
  */
 
-@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+@file:OptIn(KspExperimental::class, ExperimentalKotlinGradlePluginApi::class)
 
 import co.touchlab.skie.configuration.SealedInterop
+import com.google.devtools.ksp.KspExperimental
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
 
@@ -26,6 +27,7 @@ plugins {
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.serialization)
     alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)
     alias(sphereonplug.plugins.org.jetbrains.compose)
+    alias(sphereonplug.plugins.com.google.devtools.ksp.com.google.devtools.ksp.gradle.plugin)
     id("co.touchlab.skie") version "0.10.8"
 }
 
@@ -65,6 +67,7 @@ kotlin {
             export(libs.sphereon.core.api.public)
             export(libs.sphereon.core.api.default)
             export(libs.sphereon.data.link.http.client)
+            export(libs.sphereon.core.logger.mobile)
             export(libs.sphereon.mdoc.core)
             export(libs.sphereon.mdoc.datatransfer)
             transitiveExport = false
@@ -78,7 +81,7 @@ kotlin {
             api(libs.kiwa.holder.sdk.public)
             // Logger directly from the Sphereon Identity Development Kit as it is not exposed via the Kiwa SDK
             api(libs.sphereon.core.logger.mobile)
-            api(libs.sphereon.mdoc.transport.nfc)
+//            api(libs.sphereon.mdoc.transport.nfc)
             api(libs.sphereon.mdoc.transport.ble)
             api(libs.sphereon.mdoc.transport.restapi)
             api(libs.sphereon.mdoc.transport.oid4vp)
@@ -97,3 +100,24 @@ kotlin {
         }
     }
 }
+
+
+ksp {
+    useKsp2.set(false)
+    arg("software.amazon.lastmile.kotlin.inject.anvil.processor.ContributesBindingProcessor", "disabled")
+}
+
+fun DependencyHandlerScope.addKspDependencies(configName: String) {
+    addProvider(configName, libs.kotlin.inject.compiler.ksp)
+    add(configName, libs.amz.kotlin.inject.contribute.public)
+    add(configName, libs.amz.kotlin.inject.contribute.code.generators)
+    add(configName, libs.anvil.compiler.ksp)
+}
+
+dependencies {
+    // KSP for generating DI components
+    addKspDependencies("ksp")
+    addKspDependencies("kspIosX64")
+    addKspDependencies("kspIosArm64")
+    addKspDependencies("kspIosSimulatorArm64")
+}
diff --git a/example/holder/xcframework/src/commonMain/kotlin/com/sphereon/kiwa/sdk/KiwaSdkConst.kt b/example/holder/xcframework/src/commonMain/kotlin/com/sphereon/kiwa/sdk/KiwaSdkConst.kt
diff --git a/example/holder/xcframework/src/iosArm64Main/kotlin/com/sphereon/kiwa/sdk/KiwaSdkComponent.kt b/example/holder/xcframework/src/iosArm64Main/kotlin/com/sphereon/kiwa/sdk/KiwaSdkComponent.kt
@@ -0,0 +1,108 @@
+/*
+ * © 2025 Sphereon International B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.sphereon.kiwa.sdk
+
+import me.tatarka.inject.annotations.Component
+import software.amazon.lastmile.kotlin.inject.anvil.AppScope
+import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
+import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
+import com.sphereon.core.defaults.app.DefaultRootScopeProvider
+import com.sphereon.di.app.AbstractAppComponent
+import com.sphereon.di.context.UserScope
+import com.sphereon.di.session.SessionScope
+import kotlin.experimental.ExperimentalObjCName
+import kotlin.native.ObjCName
+
+/**
+ * Pre-generated AllLibraries AppComponent that merges all library modules.
+ *
+ * This component is intended for external developers who do not want to use KSP
+ * to build their own components. It provides a ready-to-use dependency injection
+ * setup that includes all library modules in the project.
+ *
+ * This class is a singleton and provides all bindings from all libraries
+ * through the [MergeComponent] annotation.
+ */
+@OptIn(ExperimentalObjCName::class)
+@ObjCName("KiwaSdkAppComponent", exact = true)
+@SingleIn(AppScope::class)
+@MergeComponent(AppScope::class)
+@Component
+abstract class KiwaSdkAppComponent(
+    application: Any,
+    appId: String = "all-libraries-app",
+    profile: String = "profile",
+    version: String = "version-example",
+) : KiwaSdkAppComponentMerged,
+    AbstractAppComponent(
+        application,
+        appId = appId,
+        profile = profile,
+        version = version,
+        rootScopeProvider = DefaultRootScopeProvider()
+    ) {
+    companion object {
+        fun init(
+            application: Any,
+            appId: String = "all-libraries-app",
+            profile: String = "profile",
+            version: String = "version-example"
+        ): KiwaSdkAppComponentMerged {
+            val appComponent = KiwaSdkAppComponent::class.create(
+                application = application,
+                appId = appId,
+                profile = profile,
+                version = version
+            )
+            return appComponent.initRootScopeProvider() as KiwaSdkAppComponentMerged
+        }
+    }
+}
+
+/**
+ * Pre-generated AllLibraries UserContext Component that merges all library modules.
+ *
+ * This component handles user-scoped dependencies and is a child of the AppComponent.
+ */
+@OptIn(ExperimentalObjCName::class)
+@ObjCName("KiwaSdkUserContextComponent", exact = true)
+@SingleIn(UserScope::class)
+@MergeComponent(UserScope::class)
+@Component
+abstract class KiwaSdkUserContextComponent(
+    @Component
+    val appComponent: KiwaSdkAppComponent
+) : KiwaSdkUserContextComponentMerged
+
+/**
+ * Pre-generated AllLibraries Session Component that merges all library modules.
+ *
+ * This component handles session-scoped dependencies and is a child of both
+ * the AppComponent and UserContextComponent.
+ */
+@OptIn(ExperimentalObjCName::class)
+@ObjCName("KiwaSdkSessionComponent", exact = true)
+@MergeComponent(SessionScope::class)
+@SingleIn(SessionScope::class)
+@Component
+abstract class KiwaSdkSessionComponent(
+    @Component
+    val appComponent: KiwaSdkAppComponent,
+    @Component
+    val userContextComponent: KiwaSdkUserContextComponent
+) : KiwaSdkSessionComponentMerged {}
diff --git a/example/holder/xcframework/src/iosSimulatorArm64Main/kotlin/com/sphereon/kiwa/sdk/KiwaSdkComponent.kt b/example/holder/xcframework/src/iosSimulatorArm64Main/kotlin/com/sphereon/kiwa/sdk/KiwaSdkComponent.kt
diff --git a/example/holder/xcframework/src/iosX64Main/kotlin/com/sphereon/kiwa/sdk/KiwaSdkComponent.kt b/example/holder/xcframework/src/iosX64Main/kotlin/com/sphereon/kiwa/sdk/KiwaSdkComponent.kt
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ plugins {`
`26`	`26`	`alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)`
`27`	`27`	`alias(sphereonplug.plugins.org.jetbrains.compose)`
`28`	`28`	`alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)`
`29`		`- alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)`
	`29`	`+ alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)`
`30`	`30`	`id("maven-publish")`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ plugins {`
`24`	`24`	`alias(sphereonplug.plugins.com.android.library)`
`25`	`25`	`alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)`
`26`	`26`	`alias(sphereonplug.plugins.org.jetbrains.compose)`
`27`		`- alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)`
	`27`	`+ alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)`
`28`	`28`	`id("maven-publish")`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ plugins {`
`28`	`28`	`alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)`
`29`	`29`	`alias(sphereonplug.plugins.org.jetbrains.compose)`
`30`	`30`	`alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)`
`31`		`- alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)`
	`31`	`+ alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)`
`32`	`32`	`id("maven-publish")`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ plugins {`
`25`	`25`	`alias(sphereonplug.plugins.org.jetbrains.kotlin.plugin.compose)`
`26`	`26`	`alias(sphereonplug.plugins.org.jetbrains.compose)`
`27`	`27`	`alias(sphereonplug.plugins.org.jetbrains.compose.hot.reload)`
`28`		`- alias(sphereonplug.plugins.sphereon.gradle.plugin.project.publication)`
	`28`	`+ alias(sphereonplug.plugins.com.sphereon.gradle.plugin.project.publication)`
`29`	`29`	`id("maven-publish")`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class KiwaWalletServiceImpl(`
`57`	`57`
`58`	`58`	`init {`
`59`	`59`	`DefaultCallbacks.setCoseCryptoDefault(`
`60`		`- CoseCryptoProviderToCallbackAdapter(keyManagerService = services.crypto.keyManagerService)`
	`60`	`+ CoseCryptoProviderToCallbackAdapter(keyManagerServiceProvider = {services.crypto.keyManagerService})`
`61`	`61`	`)`
`62`	`62`	`}`
`63`	`63`