update to latest conventions (kotlin 1.9.20)

a-sit-plus · Dec 1, 2023 · 066d7b3 · 066d7b3
1 parent 3914412
commit 066d7b3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 24 deletions.
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/gradle.properties b/gradle.properties
@@ -19,3 +19,5 @@ kotlin.experimental.tryK2=false
 org.jetbrains.dokka.classpath.excludePlatformDependencyFiles=true
 
 artifactVersion = 3.2.0-SNAPSHOT
+
+jvm.version=11
diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts
@@ -13,26 +13,26 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-exportIosFramework("VcLibAriesKmm", *commonIosExports(), project(":vclib"))
 kotlin {
+    jvm()
+    iosArm64()
+    iosSimulatorArm64()
+    iosX64()
 
     sourceSets {
-        val commonMain by getting {
+         commonMain {
             dependencies {
                 commonImplementationDependencies()
                 api(project(":vclib"))
             }
         }
-        val commonTest by getting
 
-        val iosMain by getting
-        val iosSimulatorArm64Main by getting { dependsOn(iosMain) }
-        val jvmMain by getting {
+         jvmMain  {
             dependencies {
                 implementation(bouncycastle("bcprov"))
             }
         }
-        val jvmTest by getting {
+         jvmTest  {
             dependencies {
                 implementation("com.nimbusds:nimbus-jose-jwt:${VcLibVersions.Jvm.`jose-jwt`}")
                 implementation("org.json:json:${VcLibVersions.Jvm.json}")
@@ -41,6 +41,8 @@ kotlin {
     }
 }
 
+exportIosFramework("VcLibAriesKmm", *commonIosExports(), project(":vclib"))
+
 val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {

diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts
@@ -13,26 +13,25 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-exportIosFramework("VcLibOpenIdKmm", *commonIosExports(), project(":vclib"))
 kotlin {
-
+    jvm()
+    iosArm64()
+    iosSimulatorArm64()
+    iosX64()
     sourceSets {
-        val commonMain by getting {
+         commonMain {
             dependencies {
                 commonImplementationDependencies()
                 api(project(":vclib"))
             }
         }
-        val commonTest by getting
 
-        val iosMain by getting
-        val iosSimulatorArm64Main by getting { dependsOn(iosMain) }
-        val jvmMain by getting {
+         jvmMain  {
             dependencies {
                 implementation(bouncycastle("bcprov"))
             }
         }
-        val jvmTest by getting {
+         jvmTest  {
             dependencies {
                 implementation("com.nimbusds:nimbus-jose-jwt:${VcLibVersions.Jvm.`jose-jwt`}")
                 implementation("org.json:json:${VcLibVersions.Jvm.json}")
@@ -41,6 +40,8 @@ kotlin {
     }
 }
 
+exportIosFramework("VcLibOpenIdKmm", *commonIosExports(), project(":vclib"))
+
 val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {

diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -14,12 +14,14 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-exportIosFramework("VcLibKmm", *commonIosExports())
 kotlin {
-
+    jvm()
+    iosArm64()
+    iosSimulatorArm64()
+    iosX64()
     sourceSets {
 
-        val commonMain by getting {
+         commonMain  {
             dependencies {
                 commonImplementationDependencies()
                 api(datetime())
@@ -30,16 +32,13 @@ kotlin {
             }
         }
 
-        val commonTest by getting
 
-        val iosMain by getting
-        val iosSimulatorArm64Main by getting { dependsOn(iosMain) }
-        val jvmMain by getting {
+         jvmMain {
             dependencies {
                 implementation(bouncycastle("bcpkix"))
             }
         }
-        val jvmTest by getting {
+         jvmTest  {
             dependencies {
                 implementation("com.nimbusds:nimbus-jose-jwt:${VcLibVersions.Jvm.`jose-jwt`}")
                 implementation("org.json:json:${VcLibVersions.Jvm.json}")
@@ -48,6 +47,8 @@ kotlin {
     }
 }
 
+exportIosFramework("VcLibKmm", *commonIosExports())
+
 val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
 publishing {