update to latest conventions

a-sit-plus · Apr 10, 2024 · 02653f1 · 02653f1
1 parent b87cace
commit 02653f1
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ Release 3.6.0:
  - `OidcSiopVerifier`: Refactor list of parameters for customizing authentication requests to single data class `RequestOptions`
  - `OidcSiopWallet`: Rename constructor parameter `jwkSetRetriever` to a more general `remoteResourceRetriever`, to use it for various parameters defined by reference
  - `OidcSiopWallet`: Replace constructor parameter `verifierJwsService` with `requestObjectJwsVerifier` to allow callers to verify JWS objects with a pre-registered key (as in the OpenId4VP client ID scheme "pre-registered")
+ - Dependency updates
+   - Conventions 1.9.23+20240410
+     - Ktor 2.3.10
+     - Auto-publish version catalogs
 
 Release 3.5.0:
 - Kotlin 1.9.23

diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/conventions-vclib/src/main/kotlin/VcLibConventions.kt b/conventions-vclib/src/main/kotlin/VcLibConventions.kt
@@ -8,32 +8,38 @@ import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
 
 
-inline fun commonApiDependencies() = listOf(
-    coroutines(),
-    serialization("json"),
-    serialization("cbor"),
-    "at.asitplus.crypto:datatypes-cose:${VcLibVersions.kmpcrypto}",
-    "at.asitplus.crypto:datatypes-jws:${VcLibVersions.kmpcrypto}",
-    datetime(),
-    "com.squareup.okio:okio:${VcLibVersions.okio}",
-    "at.asitplus.crypto:datatypes:${VcLibVersions.kmpcrypto}", //for iosExport
-    "io.matthewnelson.kotlin-components:encoding-base16:${VcLibVersions.encoding}",
-    "io.matthewnelson.kotlin-components:encoding-base64:${VcLibVersions.encoding}"
-)
+inline fun Project.commonApiDependencies(): List<String> {
+    project.AspVersions.versions["kmpcrypto"] = VcLibVersions.kmpcrypto
+    project.AspVersions.versions["okio"] = VcLibVersions.okio
+    project.AspVersions.versions["encoding"] = VcLibVersions.encoding
+    return listOf(
+        coroutines(),
+        serialization("json"),
+        serialization("cbor"),
+        addDependency("at.asitplus.crypto:datatypes", "kmpcrypto"), //for iOS Export
+        addDependency("at.asitplus.crypto:datatypes-cose", "kmpcrypto"),
+        addDependency("at.asitplus.crypto:datatypes-jws", "kmpcrypto"),
+        datetime(),
+        addDependency("com.squareup.okio:okio", "okio"),
+        addDependency("io.matthewnelson.kotlin-components:encoding-base16", "encoding"),
+        addDependency("io.matthewnelson.kotlin-components:encoding-base64", "encoding"),
+    )
+}
 
 inline fun KotlinDependencyHandler.commonImplementationAndApiDependencies() {
-    commonApiDependencies().forEach { dep -> api(dep) }
+    project.commonApiDependencies().forEach { dep -> api(dep) }
     commonImplementationDependencies()
 }
 
 inline fun KotlinDependencyHandler.commonImplementationDependencies() {
-    implementation(ktor("http"))
-    implementation(napier())
-    implementation(ktor("utils"))
-    implementation("com.benasher44:uuid:${VcLibVersions.uuid}")
+    implementation(project.ktor("http"))
+    implementation(project.napier())
+    implementation(project.ktor("utils"))
+    project.AspVersions.versions["uuid"] = VcLibVersions.uuid
+    implementation(project.addDependency("com.benasher44:uuid", "uuid"))
 }
 
-fun commonIosExports() = arrayOf(
+fun Project.commonIosExports() = arrayOf(
     datetime(),
     "com.ionspin.kotlin:bignum:${VcLibVersions.bignum}",
     kmmresult(),

diff --git a/conventions-vclib/src/main/kotlin/VcLibVersions.kt b/conventions-vclib/src/main/kotlin/VcLibVersions.kt
@@ -1,6 +1,5 @@
 object VcLibVersions {
     const val uuid = "0.8.1"
-    const val resultlib = "1.5.3"
     const val encoding = "1.2.3"
     const val okio = "3.5.0"
     const val kmpcrypto = "2.5.0"

diff --git a/gradle.properties b/gradle.properties
@@ -15,10 +15,9 @@ kotlin.native.binary.freezing=disabled
 kotlin.native.ignoreDisabledTargets=true
 kotlin.experimental.tryK2=false
 
-
-# workaround dokka bug (need to wait for next snapshot build)
-org.jetbrains.dokka.classpath.excludePlatformDependencyFiles=true
-
 artifactVersion = 3.6.0-SNAPSHOT
 jdk.version=17
 
+#just in case we add resources
+kt65315.workaround=true
+
+24 −1		CHANGELOG.md
+37 −14		README.md
+1 −1		gradle.properties
+5 −4		k2/src/main/kotlin/at/asitplus/gradle/K2Plugin.kt
+1 −1		k2/src/main/resources/k2versions.properties
+1 −0		legacy/build.gradle.kts
+0 −56		legacy/src/main/kotlin/AspVersions.kt
+64 −0		legacy/src/main/kotlin/at/asitplus/gradle/AspVersions.kt
+89 −24		legacy/src/main/kotlin/at/asitplus/gradle/CommonDependencies.kt
+19 −1		legacy/src/main/kotlin/at/asitplus/gradle/IosFrameworkSetup.kt
+35 −15		legacy/src/main/kotlin/at/asitplus/gradle/Plugin.kt
+156 −4		legacy/src/main/kotlin/at/asitplus/gradle/Publishing.kt
+3 −3		legacy/src/main/resources/versions.properties
+1 −3		sample-project/build.gradle.kts
+16 −0		sample-project/gradle/libs.versions.toml
+1 −1		sample-project/gradle/wrapper/gradle-wrapper.properties
+23 −0		sample-project/sample-module/build.gradle.kts
+3 −3		sample-project/settings.gradle.kts