Skip to content

Commit

Permalink
add KMP Crypto Composite Build
Browse files Browse the repository at this point in the history
  • Loading branch information
JesusMcCloud committed Oct 11, 2023
1 parent 5312d84 commit e06ece7
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 17 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "conventions-vclib/gradle-conventions-plugin"]
path = conventions-vclib/gradle-conventions-plugin
url = https://github.com/a-sit-plus/gradle-conventions-plugin.git
url = https://github.com/a-sit-plus/gradle-conventions-plugin.git
[submodule "kmp-crypto"]
path = kmp-crypto
url = git@github.com:a-sit-plus/kmp-crypto.git
16 changes: 1 addition & 15 deletions conventions-vclib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ plugins {
}
group = "at.asitplus.gradle"

idea {
project {
jdkName = "11" //TODO use from ASP conventions plugin?
}
}

dependencies {
api("at.asitplus.gradle:conventions")
}
Expand All @@ -19,15 +13,7 @@ repositories {
mavenCentral()
gradlePluginPortal()
}
kotlin {
jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11/*TODO share*/))
}
/*compilerOptions {
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
}*/
}


gradlePlugin {
plugins.register("vclib-conventions") {
Expand Down
1 change: 1 addition & 0 deletions conventions-vclib/src/main/kotlin/VcLibVersions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +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 = "1.0-SNAPSHOT"

object Jvm {
const val `jose-jwt` = "9.31"
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ kotlin.experimental.tryK2=false
org.jetbrains.dokka.classpath.excludePlatformDependencyFiles=true

artifactVersion = 3.0.2-SNAPSHOT
#jvm.version=17
1 change: 1 addition & 0 deletions kmp-crypto
Submodule kmp-crypto added at 77fb58
8 changes: 8 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,11 @@ rootProject.name = "vclibrary"
include(":vclib")
include(":vclib-aries")
include(":vclib-openid")

includeBuild("kmp-crypto") {
dependencySubstitution {
substitute(module("at.asitplus.crypto:datatypse")).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"))
}
}
2 changes: 2 additions & 0 deletions vclib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ kotlin {
val commonMain by getting {
dependencies {
commonImplementationDependencies()
api("at.asitplus.crypto:datatypes-cose:${VcLibVersions.kmpcrypto}")
api("at.asitplus.crypto:datatypes-jws:${VcLibVersions.kmpcrypto}")
api(datetime())
api(serialization("cbor"))
api("at.asitplus:kmmresult:${VcLibVersions.resultlib}")
Expand Down

0 comments on commit e06ece7

Please sign in to comment.