From 3bcb8d9ebf6f52a7716943bfcc4f633e2047fc84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20Pr=C3=BCnster?= Date: Mon, 5 Feb 2024 08:12:06 +0100 Subject: [PATCH] remove --- .../src/main/kotlin/VcLibVersions.kt | 2 +- vclib-aries/build.gradle.kts | 17 +++++++------- vclib-openid/build.gradle.kts | 18 +++++++-------- vclib/build.gradle.kts | 23 +++++++++---------- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/conventions-vclib/src/main/kotlin/VcLibVersions.kt b/conventions-vclib/src/main/kotlin/VcLibVersions.kt index 17d4a98c0..e2a8825b7 100644 --- a/conventions-vclib/src/main/kotlin/VcLibVersions.kt +++ b/conventions-vclib/src/main/kotlin/VcLibVersions.kt @@ -3,7 +3,7 @@ object VcLibVersions { const val resultlib = "1.5.3" const val encoding = "1.2.3" const val okio = "3.5.0" - const val kmpcrypto = "2.2.0-SNAPSHOT" + const val kmpcrypto = "2.3.0-SNAPSHOT" object Jvm { const val `jose-jwt` = "9.31" diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts index b57a02ea3..32c7ffdb6 100644 --- a/vclib-aries/build.gradle.kts +++ b/vclib-aries/build.gradle.kts @@ -13,16 +13,12 @@ val artifactVersion: String by extra group = "at.asitplus.wallet" version = artifactVersion -val iosDisabled: String? by extra - kotlin { jvm() - if (iosDisabled != "true") { - iosArm64() - iosSimulatorArm64() - iosX64() - } + iosArm64() + iosSimulatorArm64() + iosX64() sourceSets { commonMain { @@ -46,9 +42,12 @@ kotlin { } } -if (iosDisabled != "true") exportIosFramework("VcLibAriesKmm", *commonIosExports(), project(":vclib")) +exportIosFramework("VcLibAriesKmm", *commonIosExports(), project(":vclib")) -val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true) +val javadocJar = setupDokka( + baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", + multiModuleDoc = true +) publishing { publications { diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts index 8a56f6b85..e1e341c64 100644 --- a/vclib-openid/build.gradle.kts +++ b/vclib-openid/build.gradle.kts @@ -14,17 +14,12 @@ group = "at.asitplus.wallet" version = artifactVersion -val iosDisabled: String? by extra - - kotlin { jvm() - if (iosDisabled != "true") { - iosArm64() - iosSimulatorArm64() - iosX64() - } + iosArm64() + iosSimulatorArm64() + iosX64() sourceSets { commonMain { @@ -49,9 +44,12 @@ kotlin { } } -if (iosDisabled != "true") exportIosFramework("VcLibOpenIdKmm", *commonIosExports(), project(":vclib")) +exportIosFramework("VcLibOpenIdKmm", *commonIosExports(), project(":vclib")) -val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true) +val javadocJar = setupDokka( + baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", + multiModuleDoc = true +) publishing { publications { diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts index 13acc6243..588466a83 100644 --- a/vclib/build.gradle.kts +++ b/vclib/build.gradle.kts @@ -15,19 +15,15 @@ group = "at.asitplus.wallet" version = artifactVersion -val iosDisabled: String? by extra - kotlin { jvm() - if (iosDisabled != "true") { - iosArm64() - iosSimulatorArm64() - iosX64() - } + iosArm64() + iosSimulatorArm64() + iosX64() sourceSets { - commonMain { + commonMain { dependencies { commonImplementationDependencies() api("at.asitplus.crypto:datatypes-cose:${VcLibVersions.kmpcrypto}") @@ -41,12 +37,12 @@ kotlin { } - jvmMain { + jvmMain { dependencies { implementation(bouncycastle("bcpkix")) } } - jvmTest { + jvmTest { dependencies { implementation("com.nimbusds:nimbus-jose-jwt:${VcLibVersions.Jvm.`jose-jwt`}") implementation("org.json:json:${VcLibVersions.Jvm.json}") @@ -55,9 +51,12 @@ kotlin { } } -if (iosDisabled != "true") exportIosFramework("VcLibKmm", *commonIosExports()) +exportIosFramework("VcLibKmm", *commonIosExports()) -val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true) +val javadocJar = setupDokka( + baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", + multiModuleDoc = true +) publishing { publications {