Merge branch 'feature/mdl-cbor' into feature/mdl-cbor-serializer-cert…

…ificates

.github/workflows/build-ios.yml

@@ -12,9 +12,8 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-      - name: Build kotlinx.serialization
-        run: ./gradlew publishToMavenLocal
-        working-directory: kotlinx.serialization
+      - name: Build klibs
+        run: ./gradlew iosArm64MainKlibrary iosX64MainKlibrary
       - name: Build XCFrameworks
         run: ./gradlew assembleVcLibKmmXCFramework assembleVcLibAriesKmmXCFramework assembleVcLibOpenIdKmmXCFramework
       - name: Upload debug XCFramework vclib

.github/workflows/build-jvm.yml

@@ -8,9 +8,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: Build kotlinx.serialization
-        run: ./gradlew build :build -x :kotlinx-serialization-cbor:animalsnifferMain -x :kotlinx-serialization-cbor:jvmApiCheck -x :kotlinx-serialization-cbor:jsLegacyNode publishToMavenLocal
-        working-directory: kotlinx.serialization
       - name: Build jar
         run: ./gradlew assemble
       - name: Upload jar vclib

.github/workflows/publish-dry-run.yml

@@ -0,0 +1,36 @@
+name: Publish Dry Run
+on: workflow_dispatch
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      - name: Publish to Maven Local
+        run: ./gradlew clean publishToMavenLocal
+        env:
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PUBLISH_SIGNING_KEYID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PUBLISH_SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PUBLISH_SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.PUBLISH_SONATYPE_USER }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.PUBLISH_SONATYPE_PASSWORD }}
+  deploy-docs:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Build Dokka HTML
+        run: ./gradlew dokkaHtmlMultiModule

.github/workflows/publish.yml

@@ -12,9 +12,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-      - name: Build kotlinx.serialization
-        run: ./gradlew publishToMavenLocal
-        working-directory: kotlinx.serialization
       - name: Publish to Sonatype
         run: ./gradlew clean publishToSonatype closeSonatypeStagingRepository
         env:

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/a-sit-plus/gradle-conventions-plugin.git
 [submodule "kotlinx.serialization"]
 	path = kotlinx.serialization
-	url = git@github.com:a-sit-plus/kotlinx.serialization.git
+	url = https://github.com/a-sit-plus/kotlinx.serialization.git

build.gradle.kts

@@ -1,7 +1,17 @@
+import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
+
 plugins {
     id("at.asitplus.gradle.vclib-conventions")
 }
 
+//access dokka plugin from conventions plugin's classpath in root project → no need to specify version
+apply(plugin = "org.jetbrains.dokka")
+tasks.getByName("dokkaHtmlMultiModule") {
+    (this as DokkaMultiModuleTask)
+    outputDirectory.set(File("$buildDir/dokka"))
+    includes.from("README.md")
+}
+
 task<Exec>("purge") {
     dependsOn("clean")
     workingDir = layout.projectDirectory.dir("vclib").asFile
@@ -14,4 +24,4 @@ task<Exec>("purge") {
 
 val artifactVersion: String by extra
 group = "at.asitplus.wallet"
-version = artifactVersion
+version = artifactVersion

conventions-vclib/build.gradle.kts

@@ -15,13 +15,18 @@ dependencies {
 }
 
 repositories {
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
     mavenCentral()
     gradlePluginPortal()
 }
 kotlin {
     jvmToolchain {
         (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11/*TODO share*/))
     }
+    /*compilerOptions {
+        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+    }*/
 }
 
 gradlePlugin {

conventions-vclib/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

conventions-vclib/gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradle.properties

@@ -13,5 +13,9 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.binary.memoryModel=experimental
 kotlin.native.binary.freezing=disabled
 kotlin.native.ignoreDisabledTargets=true
+kotlin.experimental.tryK2=false
+
+# workaround dokka bug (need to wait for next snapshot build)
+org.jetbrains.dokka.classpath.excludePlatformDependencyFiles=true
 
 artifactVersion = 2.1.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

settings.gradle.kts

@@ -1,5 +1,11 @@
 pluginManagement {
     includeBuild("conventions-vclib")
+    repositories {
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
 }
 
 rootProject.name = "vclibrary"

vclib-aries/build.gradle.kts

@@ -1,7 +1,4 @@
-import at.asitplus.gradle.bouncycastle
-import at.asitplus.gradle.commonImplementationDependencies
-import at.asitplus.gradle.commonIosExports
-import at.asitplus.gradle.exportIosFramework
+import at.asitplus.gradle.*
 
 plugins {
     kotlin("multiplatform")
@@ -16,26 +13,6 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-val dokkaOutputDir = "$buildDir/dokka"
-tasks.dokkaHtml {
-    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
-    dependsOn(":vclib-openid:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
-    outputDirectory.set(file(dokkaOutputDir))
-}
-val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
-    delete(dokkaOutputDir)
-}
-val javadocJar = tasks.register<Jar>("javadocJar") {
-    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
-    archiveClassifier.set("javadoc")
-    from(dokkaOutputDir)
-}
-
-val signingTasks: TaskCollection<Sign> = tasks.withType<Sign>()
-tasks.withType<PublishToMavenRepository>().configureEach {
-    mustRunAfter(signingTasks)
-}
-
 exportIosFramework("VcLibAriesKmm", *commonIosExports(), project(":vclib"))
 kotlin {
 
@@ -64,11 +41,7 @@ kotlin {
     }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
+val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {
     publications {