prepare next development iteration

a-sit-plus · Feb 19, 2024 · 213e69b · 213e69b
1 parent 6ea81d2
commit 213e69b
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/conventions-vclib/settings.gradle.kts b/conventions-vclib/settings.gradle.kts
@@ -1,3 +1,5 @@
 rootProject.name = "vclib-conventions"
 
+//we don't want to pollute the classpath with a shadowed conventions plugin
+System.setProperty("at.asitplus.gradle", "legacy")
 includeBuild("gradle-conventions-plugin")
diff --git a/conventions-vclib/src/main/kotlin/Plugin.kt b/conventions-vclib/src/main/kotlin/Plugin.kt
@@ -34,7 +34,7 @@ fun commonIosExports() = arrayOf(
 
 class VcLibConventions : Plugin<Project> {
     override fun apply(target: Project) {
-        target.plugins.apply("at.asitplus.gradle.conventions-legacy")
+        target.plugins.apply("at.asitplus.gradle.conventions")
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -21,6 +21,6 @@ kotlin.mpp.hierarchicalStructureSupport=false
 # workaround dokka bug (need to wait for next snapshot build)
 org.jetbrains.dokka.classpath.excludePlatformDependencyFiles=true
 
-artifactVersion = 3.4.0
+artifactVersion = 3.5.0-SNAPSHOT
 jdk.version=17
 
diff --git a/kmp-crypto b/kmp-crypto
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,14 +8,14 @@ pluginManagement {
     }
 }
 
-/*
+
 includeBuild("kmp-crypto") {
     dependencySubstitution {
         substitute(module("at.asitplus.crypto:datatypes")).using(project(":datatypes"))
         substitute(module("at.asitplus.crypto:datatypes-jws")).using(project(":datatypes-jws"))
         substitute(module("at.asitplus.crypto:datatypes-cose")).using(project(":datatypes-cose"))
     }
-}*/
+}
 
 rootProject.name = "vclibrary"
 include(":vclib")

diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts
@@ -15,7 +15,6 @@ version = artifactVersion
 
 
 kotlin {
-
     ios()
     iosSimulatorArm64()
     jvm()
@@ -27,11 +26,12 @@ kotlin {
                 api(project(":vclib"))
             }
         }
-
         val commonTest by getting
 
         val iosMain by getting
         val iosSimulatorArm64Main by getting { dependsOn(iosMain) }
+        val iosTest by getting
+
         val jvmMain by getting {
             dependencies {
                 implementation(bouncycastle("bcprov"))

diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts
@@ -27,11 +27,12 @@ kotlin {
                 api(project(":vclib"))
             }
         }
-
         val commonTest by getting
 
         val iosMain by getting
         val iosSimulatorArm64Main by getting { dependsOn(iosMain) }
+        val iosTest by getting
+
         val jvmMain by getting {
             dependencies {
                 implementation(bouncycastle("bcprov"))

diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -41,6 +41,8 @@ kotlin {
 
         val iosMain by getting
         val iosSimulatorArm64Main by getting { dependsOn(iosMain) }
+        val iosTest by getting
+
         val jvmMain by getting {
             dependencies {
                 implementation(bouncycastle("bcpkix"))
+8 −0		CHANGELOG.md
+30 −5		README.md
+1 −1		gradle.properties
+5 −1		k2/build.gradle.kts
+1 −1		legacy/build.gradle.kts
+4 −4		legacy/src/main/kotlin/AspVersions.kt
+7 −1		legacy/src/main/kotlin/at/asitplus/gradle/Plugin.kt
+1 −1		sample-project/build.gradle.kts
+3 −10		sample-project/settings.gradle.kts