Skip to content

Commit bceca21

Browse files
dzarrasdzarras
authored
Release/0.8.0 (#92)
1 parent b27a5e9 commit bceca21

8 files changed

Lines changed: 98 additions & 66 deletions

File tree

‎api/eudi-lib-jvm-rqes-csc-kt.api‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public final class eu/europa/ec/eudi/documentretrieval/AuthorizationRequestResol
6969
}
7070

7171
public abstract interface class eu/europa/ec/eudi/documentretrieval/Client : java/io/Serializable {
72-
public abstract fun getId ()Ljava/lang/String;
72+
public fun getId ()Ljava/lang/String;
7373
}
7474

7575
public final class eu/europa/ec/eudi/documentretrieval/Client$DefaultImpls {
@@ -638,7 +638,7 @@ public final class eu/europa/ec/eudi/documentretrieval/ResponseMode$DirectPost :
638638
}
639639

640640
public abstract interface class eu/europa/ec/eudi/documentretrieval/SupportedClientIdScheme {
641-
public abstract fun scheme ()Leu/europa/ec/eudi/documentretrieval/ClientIdScheme;
641+
public fun scheme ()Leu/europa/ec/eudi/documentretrieval/ClientIdScheme;
642642
}
643643

644644
public final class eu/europa/ec/eudi/documentretrieval/SupportedClientIdScheme$DefaultImpls {
@@ -717,7 +717,7 @@ public final class eu/europa/ec/eudi/documentretrieval/internal/request/Document
717717
public fun toString ()Ljava/lang/String;
718718
}
719719

720-
public synthetic class eu/europa/ec/eudi/documentretrieval/internal/request/DocumentDigestDTO$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
720+
public final synthetic class eu/europa/ec/eudi/documentretrieval/internal/request/DocumentDigestDTO$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
721721
public static final field $stable I
722722
public static final field INSTANCE Leu/europa/ec/eudi/documentretrieval/internal/request/DocumentDigestDTO$$serializer;
723723
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
@@ -726,6 +726,7 @@ public synthetic class eu/europa/ec/eudi/documentretrieval/internal/request/Docu
726726
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
727727
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Leu/europa/ec/eudi/documentretrieval/internal/request/DocumentDigestDTO;)V
728728
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
729+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
729730
}
730731

731732
public final class eu/europa/ec/eudi/documentretrieval/internal/request/DocumentDigestDTO$Companion {
@@ -1084,7 +1085,9 @@ public final class eu/europa/ec/eudi/rqes/AuthorizationServerMetadataResolver$Co
10841085

10851086
public abstract interface class eu/europa/ec/eudi/rqes/AuthorizeCredential {
10861087
public abstract fun authorizeWithAuthorizationCode-LnDQM3A (Leu/europa/ec/eudi/rqes/CredentialAuthorizationRequestPrepared;Ljava/lang/String;Ljava/lang/String;Leu/europa/ec/eudi/rqes/AccessTokenOption;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1088+
public static synthetic fun authorizeWithAuthorizationCode-LnDQM3A$default (Leu/europa/ec/eudi/rqes/AuthorizeCredential;Leu/europa/ec/eudi/rqes/CredentialAuthorizationRequestPrepared;Ljava/lang/String;Ljava/lang/String;Leu/europa/ec/eudi/rqes/AccessTokenOption;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
10871089
public abstract fun prepareCredentialAuthorizationRequest-0E7RQCE (Leu/europa/ec/eudi/rqes/CredentialAuthorizationSubject;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1090+
public static synthetic fun prepareCredentialAuthorizationRequest-0E7RQCE$default (Leu/europa/ec/eudi/rqes/AuthorizeCredential;Leu/europa/ec/eudi/rqes/CredentialAuthorizationSubject;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
10881091
}
10891092

10901093
public final class eu/europa/ec/eudi/rqes/AuthorizeCredential$DefaultImpls {
@@ -1096,6 +1099,7 @@ public abstract interface class eu/europa/ec/eudi/rqes/AuthorizeService {
10961099
public abstract fun authorizeWithAuthorizationCode-TkUMWgo (Leu/europa/ec/eudi/rqes/AuthorizationRequestPrepared;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
10971100
public abstract fun authorizeWithClientCredentials-IoAF18A (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
10981101
public abstract fun prepareServiceAuthorizationRequest-gIAlu-s (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1102+
public static synthetic fun prepareServiceAuthorizationRequest-gIAlu-s$default (Leu/europa/ec/eudi/rqes/AuthorizeService;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
10991103
}
11001104

11011105
public final class eu/europa/ec/eudi/rqes/AuthorizeService$DefaultImpls {
@@ -1147,7 +1151,7 @@ public abstract interface class eu/europa/ec/eudi/rqes/CalculateDocumentHashes {
11471151

11481152
public abstract interface class eu/europa/ec/eudi/rqes/CanExpire {
11491153
public abstract fun getExpiresIn ()Ljava/time/Duration;
1150-
public abstract fun isExpired (Ljava/time/Instant;Ljava/time/Instant;)Z
1154+
public fun isExpired (Ljava/time/Instant;Ljava/time/Instant;)Z
11511155
}
11521156

11531157
public final class eu/europa/ec/eudi/rqes/CanExpire$DefaultImpls {
@@ -1585,7 +1589,7 @@ public abstract interface class eu/europa/ec/eudi/rqes/Digest {
15851589
public abstract fun asBase64 ()Ljava/lang/String;
15861590
public abstract fun asBase64URLEncoded ()Ljava/lang/String;
15871591
public abstract fun getValue ()Ljava/lang/String;
1588-
public abstract fun isBase64encoded (Ljava/lang/String;)Z
1592+
public fun isBase64encoded (Ljava/lang/String;)Z
15891593
public abstract fun raw ()[B
15901594
}
15911595

@@ -2124,7 +2128,9 @@ public final class eu/europa/ec/eudi/rqes/ServiceAuthorizationRequestPrepared$Co
21242128

21252129
public abstract interface class eu/europa/ec/eudi/rqes/SignDoc {
21262130
public abstract fun signDoc-2IQxUvg (Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL2;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2131+
public static synthetic fun signDoc-2IQxUvg$default (Leu/europa/ec/eudi/rqes/SignDoc;Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL2;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
21272132
public abstract fun signDoc-yw8GWXw (Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL1;Ljava/util/List;Leu/europa/ec/eudi/rqes/DocumentDigestList;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2133+
public static synthetic fun signDoc-yw8GWXw$default (Leu/europa/ec/eudi/rqes/SignDoc;Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL1;Ljava/util/List;Leu/europa/ec/eudi/rqes/DocumentDigestList;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
21282134
}
21292135

21302136
public final class eu/europa/ec/eudi/rqes/SignDoc$DefaultImpls {
@@ -2150,7 +2156,9 @@ public final class eu/europa/ec/eudi/rqes/SignDocResponse {
21502156

21512157
public abstract interface class eu/europa/ec/eudi/rqes/SignHash {
21522158
public abstract fun signHash-2IQxUvg (Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL1;Leu/europa/ec/eudi/rqes/DocumentDigestList;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2159+
public static synthetic fun signHash-2IQxUvg$default (Leu/europa/ec/eudi/rqes/SignHash;Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL1;Leu/europa/ec/eudi/rqes/DocumentDigestList;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
21532160
public abstract fun signHash-cqdPT90 (Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL2;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2161+
public static synthetic fun signHash-cqdPT90$default (Leu/europa/ec/eudi/rqes/SignHash;Leu/europa/ec/eudi/rqes/CredentialAuthorized$SCAL2;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
21542162
}
21552163

21562164
public final class eu/europa/ec/eudi/rqes/SignHash$DefaultImpls {

‎build.gradle.kts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
2-
import org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
33
import java.net.URI
44

55
object Meta {
@@ -32,16 +32,14 @@ android {
3232
targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
3333
}
3434

35-
kotlinOptions {
36-
jvmTarget = libs.versions.java.get()
37-
}
38-
3935
buildFeatures {
4036
compose = true
4137
}
38+
}
4239

43-
composeOptions {
44-
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
40+
kotlin {
41+
compilerOptions {
42+
jvmTarget = JvmTarget.fromTarget(libs.versions.java.get())
4543
}
4644
}
4745

@@ -50,6 +48,7 @@ dependencies {
5048
api(libs.ktor.client.core)
5149
api(libs.ktor.client.content.negotiation)
5250
api(libs.ktor.client.serialization)
51+
api(libs.kotlinx.serialization.json)
5352
api(libs.ktor.serialization.kotlinx.json)
5453
implementation(libs.uri.kmp)
5554
implementation(libs.eudi.podofo)
@@ -133,9 +132,10 @@ mavenPublishing {
133132
}
134133
}
135134

136-
val nvdApiKey: String? = System.getenv("NVD_API_KEY") ?: properties["nvdApiKey"]?.toString()
137-
val dependencyCheckExtension = extensions.findByType(DependencyCheckExtension::class.java)
138-
dependencyCheckExtension?.apply {
135+
dependencyCheck {
139136
formats = mutableListOf("XML", "HTML")
140-
nvd.apiKey = nvdApiKey ?: ""
137+
138+
nvd {
139+
apiKey = System.getenv("NVD_API_KEY") ?: properties["nvdApiKey"]?.toString() ?: ""
140+
}
141141
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
1010

1111
# Project properties
1212
group=eu.europa.ec.eudi
13-
version=0.7.1-SNAPSHOT
13+
version=0.8.0-SNAPSHOT
1414

1515
# Sonar
1616
systemProp.sonar.host.url=https://sonarcloud.io

‎gradle/libs.versions.toml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
2-
agp = "8.2.0"
3-
kotlin = "2.1.21"
2+
agp = "8.12.2"
3+
kotlin = "2.2.21"
44
coroutines = "1.10.2"
5-
dependency-check = "12.1.1"
5+
dependency-check = "12.2.0"
66
spotless = "6.25.0"
7-
nimbus-sdk = "11.20.1"
8-
ktor = "3.2.3"
9-
jsoup = "1.18.3"
7+
nimbus-sdk = "11.37"
8+
ktor = "3.3.3"
9+
jsoup = "1.22.1"
1010
java = "17"
1111
ktlint = "0.50.0"
12-
dokka = "2.1.0"
13-
maven-publish = "0.34.0"
14-
binary-compatibility-validator = "0.16.3"
15-
uri-kmp = "0.0.18"
16-
kover = "0.9.1"
17-
composeBom = "2024.06.00"
18-
composeCompiler = "1.5.13"
19-
eudi-podofo="0.3.1"
12+
dokka = "2.2.0"
13+
maven-publish = "0.35.0"
14+
binary-compatibility-validator = "0.18.1"
15+
uri-kmp = "0.0.21"
16+
kover = "0.9.8"
17+
composeBom = "2026.03.00"
18+
eudi-podofo = "0.3.1"
19+
kotlinx-serialization = "1.9.0"
2020

2121
[libraries]
2222
nimbus-oauth2-oidc-sdk = { module = "com.nimbusds:oauth2-oidc-sdk", version.ref = "nimbus-sdk" }
@@ -35,6 +35,7 @@ uri-kmp = { module = "com.eygraber:uri-kmp", version.ref = "uri-kmp" }
3535
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
3636
compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
3737
eudi-podofo = { module = "eu.europa.ec.eudi:eudi-lib-android-podofo", version.ref = "eudi-podofo" }
38+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
3839

3940
[plugins]
4041
android-library = { id = "com.android.library", version.ref = "agp" }

‎gradle/wrapper/gradle-wrapper.jar‎

-16.6 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue Sep 03 15:15:30 EEST 2024
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 32 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)