fix complication errors

a-sit-plus · Sep 18, 2023 · df31199 · df31199
1 parent a271689
commit df31199
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Build klibs
         run: ./gradlew iosArm64MainKlibrary iosX64MainKlibrary
       - name: Build XCFrameworks

diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Maven Local
         run: ./gradlew clean publishToMavenLocal
         env:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype
         run: ./gradlew clean publishToSonatype closeSonatypeStagingRepository
         env:

diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/vclib-openid/src/commonTest/kotlin/at/asitplus/wallet/lib/oidc/TestCredentialScheme.kt b/vclib-openid/src/commonTest/kotlin/at/asitplus/wallet/lib/oidc/TestCredentialScheme.kt
@@ -30,7 +30,7 @@ data class TestCredential (
 
     @SerialName("value")
     val value: String
-) : CredentialSubject()
+) : CredentialSubject(id)
 
 class TestCredentialDataProvider(
     private val clock: Clock = Clock.System,

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/data/AtomicAttribute2023.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/data/AtomicAttribute2023.kt
@@ -20,6 +20,7 @@ data class AtomicAttribute2023 (
 
     @SerialName("mime-type")
     val mimeType: String,
+
 ) : CredentialSubject() {
 
     constructor(id: String, name: String, value: String) : this(id, name, value, "application/text")

diff --git a/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt b/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt
@@ -10,7 +10,9 @@ import kotlinx.serialization.json.Json
 class CredentialSubjectTest : FreeSpec({
     "Subclasses are correctly deserialized" {
         @Serializable
-        class SpecializedCredentialTest(override val id: String, @SerialName("not-foo") val foo: String): CredentialSubject()
+        class SpecializedCredentialTest(override val id: String, @SerialName("not-foo") val foo: String): CredentialSubject(
+            id
+        )
         val result = Json.decodeFromString<SpecializedCredentialTest>("{\"id\":\"Test\",\"not-foo\":\"bar\"}")
         result.id shouldBe "Test"
         result.foo shouldBe "bar"