dependencies updated. migrated to dokka v2. broken references fixed.

Author: syslogic

build.gradle.kts

@@ -18,8 +18,8 @@
 plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.dokka) apply false
     alias(libs.plugins.dependency.license.report) apply false
     alias(libs.plugins.dependencycheck) apply false
-    alias(libs.plugins.jetbrains.kotlin.jvm) apply false
-}
+    alias(libs.plugins.dokka.javadoc) apply false
+    alias(libs.plugins.dokka.html) apply false
+}

gradle/libs.versions.toml

@@ -1,49 +1,40 @@
 [versions]
-androidx-credentials-registry-provider = "1.0.0-alpha01"
+android-gradle-plugin = "8.13.1"
+androidx-credentials-registry-provider = "1.0.0-alpha03"
 appcompat = "1.7.1"
 biometricKtx = "1.2.0-alpha05"
-bouncy-castle = "1.78.1"
+bouncy-castle = "1.83"
 cbor = "0.9"
 coseJava = "1.1.0"
-dependency-license-report = "2.9"
-dependencycheck = "12.1.3"
-dokka = "1.9.20"
-espresso-contrib = "3.6.1"
-espresso-core = "3.6.1"
+dependency-license-report = "3.0.1"
+dependencycheck = "12.1.9"
+dokka = "2.1.0"
+espresso = "3.7.0"
 eudi-document-manager = "0.13.0"
 eudi-iso18013-data-transfer = "0.10.0"
 eudi-lib-jvm-openid4vci-kt = "0.9.1"
 eudi-lib-jvm-siop-openid4vp-kt = "0.11.1"
-eudi-lib-jvm-sdjwt-kt = "0.10.0"
+eudi-lib-jvm-sdjwt-kt = "0.10.0" # 0.17.2
 eudi-lib-kmp-statium = "0.4.0"
-gradle-plugin = "8.13.0"
-java = "17"
 json = "20250517"
-junit = "5.13.2"
-junit-android = "1.2.1"
-kotlin = "2.1.21"
+junit-android = "1.3.0"
+kotlin = "2.2.21"
 kotlin-coroutines-test = "1.10.2"
-kotlinx-io = "0.7.0"
-ktor = "3.3.0"
-mavenPublish = "0.33.0"
-mockito-android = "5.18.0"
-mockito-inline = "5.2.0"
-mockito-kotlin = "5.4.0"
-mockk = "1.14.4"
-multipaz = "0.94.0"
-nimbus-sdk = "11.20.1"
-play-services-identity-credentials = "16.0.0-alpha05"
-robolectric = "4.15.1"
-sonarqube = "6.2.0.5505"
-test-core = "1.6.1"
-test-rules = "1.6.1"
-test-runner = "1.6.2"
+kotlinx-io = "0.8.2"
+ktor = "3.3.3"
+mavenPublish = "0.35.0"
+mockito-android = "5.20.0"
+mockk = "1.14.6"
+multipaz = "0.94.0" # 0.95.0
+nimbus-sdk = "11.30.1"
+play-services-identity-credentials = "16.0.0-alpha08"
+robolectric = "4.16"
+sonarqube = "7.1.0.6387"
+test-core = "1.7.0"
+test-rules = "1.7.0"
+test-runner = "1.7.0"
 upokecenter-cbor = "4.5.6"
-coreKtx = "1.16.0"
-material = "1.12.0"
-jetbrainsKotlinJvm = "2.2.0"
-testng = "7.11.0"
-kover = "0.9.1"
+kover = "0.9.3"
 
 [libraries]
 androidx-credentials-registry-provider = { module = "androidx.credentials.registry:registry-provider", version.ref = "androidx-credentials-registry-provider" }
@@ -54,26 +45,22 @@ bouncy-castle-pkix = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref =
 bouncy-castle-prov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncy-castle" }
 cbor = { module = "co.nstant.in:cbor", version.ref = "cbor" }
 cose-java = { module = "com.augustcellars.cose:cose-java", version.ref = "coseJava" }
-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso-contrib" }
-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso-core" }
+espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
+espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso" }
 eudi-document-manager = { module = "eu.europa.ec.eudi:eudi-lib-android-wallet-document-manager", version.ref = "eudi-document-manager" }
 eudi-iso18013-data-transfer = { module = "eu.europa.ec.eudi:eudi-lib-android-iso18013-data-transfer", version.ref = "eudi-iso18013-data-transfer" }
 eudi-lib-jvm-openid4vci-kt = { module = "eu.europa.ec.eudi:eudi-lib-jvm-openid4vci-kt", version.ref = "eudi-lib-jvm-openid4vci-kt" }
 eudi-lib-jvm-siop-openid4vp-kt = { module = "eu.europa.ec.eudi:eudi-lib-jvm-siop-openid4vp-kt", version.ref = "eudi-lib-jvm-siop-openid4vp-kt" }
 eudi-lib-jvm-sdjwt-kt = { module = "eu.europa.ec.eudi:eudi-lib-jvm-sdjwt-kt", version.ref = "eudi-lib-jvm-sdjwt-kt" }
 eudi-lib-kmp-statium = { module = "eu.europa.ec.eudi:eudi-lib-kmp-statium-android", version.ref = "eudi-lib-kmp-statium" }
 json = { module = "org.json:json", version.ref = "json" }
-junit = { module = "junit:junit", version.ref = "junit" }
-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines-test" }
 kotlinx-io-bytestring = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-bytestring", version.ref = "kotlinx-io" }
 kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io" }
 ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockito-android" }
-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito-inline" }
-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 multipaz-android = { module = "org.multipaz:multipaz-android", version.ref = "multipaz" }
 nimbus-oauth2-oidc-sdk = { module = "com.nimbusds:oauth2-oidc-sdk", version.ref = "nimbus-sdk" }
@@ -84,18 +71,15 @@ test-coreKtx = { module = "androidx.test:core-ktx", version.ref = "test-core" }
 test-rules = { module = "androidx.test:rules", version.ref = "test-rules" }
 test-runner = { module = "androidx.test:runner", version.ref = "test-runner" }
 upokecenter-cbor = { module = "com.upokecenter:cbor", version.ref = "upokecenter-cbor" }
-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-testng = { group = "org.testng", name = "testng", version.ref = "testng" }
 
 [plugins]
-android-library = { id = "com.android.library", version.ref = "gradle-plugin" }
+android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
 dependency-license-report = { id = "com.github.jk1.dependency-license-report", version.ref = "dependency-license-report" }
 dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "dependencycheck" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+dokka-html = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "jetbrainsKotlinJvm" }
-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }

gradle/wrapper/gradle-wrapper.properties

@@ -16,7 +16,7 @@
 
 #Thu Sep 12 17:12:58 EEST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -18,17 +18,19 @@ pluginManagement {
     repositories {
         google {
             content {
-                includeGroupByRegex("com\\.android.*")
-                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("com.google.*")
+                includeGroupByRegex("com.android.*")
                 includeGroupByRegex("androidx.*")
             }
         }
         mavenCentral()
         gradlePluginPortal()
     }
 }
+
+@Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {
         mavenLocal()
         google()

wallet-core/build.gradle.kts

@@ -14,19 +14,23 @@
  * limitations under the License.
  */
 
+import com.github.jk1.license.filter.DependencyFilter
 import com.github.jk1.license.filter.ExcludeTransitiveDependenciesFilter
 import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.filter.ReduceDuplicateLicensesFilter
 import com.github.jk1.license.render.InventoryMarkdownReportRenderer
 import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
+import org.jetbrains.dokka.gradle.DokkaExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Locale
 
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     id("kotlin-parcelize")
-    alias(libs.plugins.dokka)
+    alias(libs.plugins.dokka.html)
+    alias(libs.plugins.dokka.javadoc)
     alias(libs.plugins.dependency.license.report)
     alias(libs.plugins.dependencycheck)
     alias(libs.plugins.sonarqube)
@@ -39,21 +43,26 @@ val GROUP: String by project
 val POM_SCM_URL: String by project
 val POM_DESCRIPTION: String by project
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        optIn.add("kotlin.RequiresOptIn")
+        optIn.add("kotlin.time.ExperimentalTime")
+    }
+}
+
 android {
     namespace = NAMESPACE
     group = GROUP
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 26
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testApplicationId = "$NAMESPACE.test"
         testHandleProfiling = true
         testFunctionalTest = true
-
         consumerProguardFiles("consumer-rules.pro")
-
     }
 
     buildTypes {
@@ -70,11 +79,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
-        targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
-    }
-    kotlinOptions {
-        jvmTarget = libs.versions.java.get()
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     testOptions {
@@ -99,14 +105,6 @@ android {
             withSourcesJar()
         }
     }
-
-    kotlinOptions {
-        jvmTarget = libs.versions.java.get()
-        freeCompilerArgs += listOf(
-            "-opt-in=kotlin.RequiresOptIn",
-            "-opt-in=kotlin.time.ExperimentalTime",
-        )
-    }
 }
 
 dependencies {
@@ -180,34 +178,42 @@ dependencyCheck {
 }
 
 // Dokka generation
-
-tasks.dokkaGfm.configure {
-    val outputDir = file("$rootDir/docs")
-    doFirst { delete(outputDir) }
-    outputDirectory.set(outputDir)
+dokka {
+    dokkaSourceSets.configureEach {
+        dokkaPublications.html {
+            outputDirectory.set(rootProject.file("docs"))
+        }
+        externalDocumentationLinks.register("android") {
+            url("https://developer.android.com/reference")
+            packageListUrl("https://developer.android.com/reference/kotlin/package-list")
+        }
+        externalDocumentationLinks.register("java") {
+            url("https://docs.oracle.com/en/java/javase/17/docs/api/")
+            packageListUrl("https://docs.oracle.com/en/java/javase/17/docs/api/allpackages-index.html")
+        }
+    }
 }
 
-tasks.register<Jar>("dokkaHtmlJar") {
+val dokkaHtmlJar by tasks.registering(Jar::class) {
     group = "documentation"
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.flatMap { it.outputDirectory })
+    dependsOn(tasks.dokkaGeneratePublicationHtml)
+    from(tasks.dokkaGeneratePublicationHtml.flatMap { it.outputDirectory })
     archiveClassifier.set("html-docs")
     description = "Assembles a JAR containing the HTML documentation generated by Dokka."
 }
 
-tasks.register<Jar>("dokkaJavadocJar") {
+val dokkaJavadocJar by tasks.registering(Jar::class) {
     group = "documentation"
-    dependsOn(tasks.dokkaJavadoc)
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+    dependsOn(tasks.dokkaGeneratePublicationJavadoc)
+    from(tasks.dokkaGeneratePublicationJavadoc.flatMap { it.outputDirectory })
     archiveClassifier.set("javadoc")
     description = "Assembles a JAR containing the Javadoc-style documentation generated by Dokka."
 }
 
 // Third-party licenses report
-
 licenseReport {
     unionParentPomLicenses = false
-    filters = arrayOf(
+    filters = arrayOf<DependencyFilter>(
         LicenseBundleNormalizer(),
         ReduceDuplicateLicensesFilter(),
         ExcludeTransitiveDependenciesFilter()
@@ -238,7 +244,6 @@ tasks.assemble.configure {
 }
 
 // Publish
-
 mavenPublishing {
     configure(
         AndroidMultiVariantLibrary(
@@ -254,6 +259,7 @@ mavenPublishing {
         }
     }
 }
+
 // handle java.lang.UnsupportedOperationException: PermittedSubclasses requires ASM9
 // when publishing module
 afterEvaluate {

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/EudiWallet.kt

@@ -95,7 +95,7 @@ interface EudiWallet : SampleDocumentManager, PresentationManager, DocumentStatu
      * @param readerCertificates the list of reader certificates
      * @return this [EudiWallet] instance
      */
-    fun setTrustedReaderCertificates(trustedReaderCertificates: List<X509Certificate>): EudiWallet
+    fun setTrustedReaderCertificates(readerCertificates: List<X509Certificate>): EudiWallet
 
     /**
      * Sets the reader trust store with the given list of raw resource IDs. This method is useful
@@ -179,7 +179,7 @@ interface EudiWallet : SampleDocumentManager, PresentationManager, DocumentStatu
      * @property transactionLogger the transaction logger to use if you want to provide a custom implementation
      * @property documentStatusResolver the document status resolver to use if you want to provide a custom implementation
      * @property dcapiRegistration the DCAPI registration to use if you want to provide a custom implementation, by default
-     * it will be [DCAPIIsoMdocRegistration] when the DCAPI is enabled in the configuration
+     * it will be [eu.europa.ec.eudi.wallet.dcapi.DCAPIIsoMdocRegistration] when the DCAPI is enabled in the configuration
      */
     class Builder(
         context: Context,
@@ -221,9 +221,8 @@ interface EudiWallet : SampleDocumentManager, PresentationManager, DocumentStatu
 
         /**
          * Configure with the given [DocumentManager] to use. If not set, the default document manager
-         * will be used which is [DocumentManagerImpl] configured with the provided [storageEngine] and [secureAreas]
-         * if they are set.
-         *
+         * will be used which is [eu.europa.ec.eudi.wallet.document.DocumentManagerImpl] configured
+         * with the provided [storage] and [secureAreas] if they are set.
          * @param documentManager the document manager
          * @return this [Builder] instance
          */
@@ -302,9 +301,8 @@ interface EudiWallet : SampleDocumentManager, PresentationManager, DocumentStatu
         /**
          * Configure with the given [DCAPIRegistration] to use for registering credentials
          * with the Digital Credential API (DCAPI).
-         * If not set, the default [DCAPIIsoMdocRegistration] will be used when the DCAPI is enabled
-         * in the configuration.
-         *
+         * If not set, the default [eu.europa.ec.eudi.wallet.dcapi.DCAPIIsoMdocRegistration]
+         * will be used when the DCAPI is enabled in the configuration.
          * @param dcapiRegistration the DCAPI registration
          * @return this [Builder] instance
          */
@@ -320,7 +318,7 @@ interface EudiWallet : SampleDocumentManager, PresentationManager, DocumentStatu
          * The [EudiWallet] instance will be created with the following default implementations if not set:
          * - [AndroidStorage] for storing/retrieving documents
          * - [AndroidKeystoreSecureArea] for managing documents' keys
-         * - [DocumentManagerImpl] for managing documents
+         * - [eu.europa.ec.eudi.wallet.document.DocumentManagerImpl] for managing documents
          * - [PresentationManagerImpl] for both proximity and remote presentation
          * - [OpenId4VpManager] for remote presentation
          * - [eu.europa.ec.eudi.iso18013.transfer.TransferManagerImpl] for proximity presentation

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/internal/OpenId4VpUtils.kt

@@ -261,10 +261,10 @@ internal fun ResolvedRequestObject.OpenId4VPAuthorization.getSessionTranscriptBy
 }
 
 /**
- * Converts a list of [Format]s to [VpFormats] for use in VP configuration.
+ * Converts a list of [Format]s to [VpFormatsSupported] for use in VP configuration.
  *
  * @receiver List of credential formats.
- * @return The corresponding [VpFormats] object.
+ * @return The corresponding [VpFormatsSupported] object.
  */
 internal fun List<Format>.toVpFormats(): VpFormatsSupported {