use conventions plugin

a-sit-plus · Dec 9, 2023 · f34ff09 · f34ff09
1 parent 191ca98
commit f34ff09
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 63 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,6 @@ kotlin.native.ignoreDisabledTargets=true
 
 gitLabProjectId = 751
 gitLabGroupId = 159
-artifactVersion = 1.8.0-SNAPSHOT
+artifactVersion = 1.8.1
 
 jdk.version=17
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,4 +2,5 @@ pluginManagement {
     includeBuild("conventions-vclib")
 }
 rootProject.name = "vclibrary"
-include(":vclib")
+include(":vclib")
+
diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -36,7 +36,7 @@ kotlin {
                 implementation(bouncycastle("bcpkix"))
             }
         }
-        jvmTest  {
+        jvmTest {
             dependencies {
                 implementation("com.nimbusds:nimbus-jose-jwt:${VcLibVersions.Jvm.`jose-jwt`}")
                 implementation("org.json:json:${VcLibVersions.Jvm.json}")
@@ -47,36 +47,7 @@ kotlin {
 
 exportIosFramework("VcLibKmm", *commonIosExports())
 
-val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
-
-val gitLabPrivateToken: String? by extra
-val gitLabProjectId: String by extra
-val gitLabGroupId: String by extra
-
-repositories {
-    mavenLocal()
-    if (System.getenv("CI_JOB_TOKEN") != null || gitLabPrivateToken != null) {
-        maven {
-            name = "gitlab"
-            url = uri("https://gitlab.iaik.tugraz.at/api/v4/groups/$gitLabGroupId/-/packages/maven")
-            if (gitLabPrivateToken != null) {
-                credentials(HttpHeaderCredentials::class) {
-                    name = "Private-Token"
-                    value = gitLabPrivateToken
-                }
-            } else if (System.getenv("CI_JOB_TOKEN") != null) {
-                credentials(HttpHeaderCredentials::class) {
-                    name = "Job-Token"
-                    value = System.getenv("CI_JOB_TOKEN")
-                }
-            }
-            authentication {
-                create<HttpHeaderAuthentication>("header")
-            }
-        }
-    }
-    mavenCentral()
-}
+val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/backport/conventions")
 
 publishing {
     publications {

diff --git a/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/agent/DummyCredentialDataProvider.kt b/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/agent/DummyCredentialDataProvider.kt
@@ -17,10 +17,10 @@ class DummyCredentialDataProvider(
     private val defaultLifetime = 1.minutes
 
     override fun getClaim(subjectId: String, attributeName: String) =
-        KmmResult.failure(UnsupportedOperationException("empty"))
+        KmmResult.failure<IssuerCredentialDataProvider.CredentialToBeIssued>(UnsupportedOperationException("empty"))
 
     override fun getCredential(subjectId: String, attributeType: String) =
-        KmmResult.failure(UnsupportedOperationException("empty"))
+        KmmResult.failure<IssuerCredentialDataProvider.CredentialToBeIssued>(UnsupportedOperationException("empty"))
 
     override fun getCredentialWithType(
         subjectId: String,