Introduce base provider to share implementation details between different providers

whyoleg · whyoleg · commit 490ab7cd6655 · 2024-10-04T20:48:22.000+03:00
diff --git a/build-logic/src/main/kotlin/ckbuild/artifacts.kt b/build-logic/src/main/kotlin/ckbuild/artifacts.kt
@@ -13,6 +13,7 @@ val artifacts
         "cryptography-serialization-asn1",
         "cryptography-serialization-asn1-modules",
         "cryptography-core",
+        "cryptography-provider-base",
         "cryptography-provider-jdk",
         "cryptography-provider-apple",
         "cryptography-provider-webcrypto",
diff --git a/cryptography-providers/apple/build.gradle.kts b/cryptography-providers/apple/build.gradle.kts
@@ -27,9 +27,7 @@ kotlin {
 
     sourceSets.commonMain.dependencies {
         api(projects.cryptographyCore)
-        implementation(projects.cryptographySerializationPem)
-        implementation(projects.cryptographySerializationAsn1)
-        implementation(projects.cryptographySerializationAsn1Modules)
+        implementation(projects.cryptographyProviderBase)
     }
 }
 
diff --git a/cryptography-providers/base/README.md b/cryptography-providers/base/README.md
@@ -0,0 +1,3 @@
+# Module cryptography-provider-base
+
+Shared implementation details for providers 
diff --git a/cryptography-providers/base/build.gradle.kts b/cryptography-providers/base/build.gradle.kts
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import ckbuild.*
+
+plugins {
+    id("ckbuild.multiplatform-library")
+}
+
+description = "cryptography-kotlin base provider"
+
+kotlin {
+    jvmTarget()
+    jsTarget()
+    nativeTargets()
+    wasmTargets()
+
+    sourceSets.commonMain.dependencies {
+        api(projects.cryptographyCore)
+        api(projects.cryptographySerializationPem)
+        api(projects.cryptographySerializationAsn1)
+        api(projects.cryptographySerializationAsn1Modules)
+    }
+}
diff --git a/cryptography-providers/jdk/build.gradle.kts b/cryptography-providers/jdk/build.gradle.kts
@@ -26,9 +26,7 @@ kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(projects.cryptographyCore)
-            implementation(projects.cryptographySerializationPem)
-            implementation(projects.cryptographySerializationAsn1)
-            implementation(projects.cryptographySerializationAsn1Modules)
+            implementation(projects.cryptographyProviderBase)
         }
         jvmTest.dependencies {
             implementation(libs.bouncycastle)
diff --git a/cryptography-providers/openssl3/api/build.gradle.kts b/cryptography-providers/openssl3/api/build.gradle.kts
@@ -30,9 +30,7 @@ kotlin {
 
     sourceSets.commonMain.dependencies {
         api(projects.cryptographyCore)
-
-        implementation(projects.cryptographySerializationAsn1)
-        implementation(projects.cryptographySerializationAsn1Modules)
+        implementation(projects.cryptographyProviderBase)
     }
 
     targets.withType<KotlinNativeTarget>().configureEach {
diff --git a/cryptography-providers/webcrypto/build.gradle.kts b/cryptography-providers/webcrypto/build.gradle.kts
@@ -27,9 +27,7 @@ kotlin {
 
     sourceSets.commonMain.dependencies {
         api(projects.cryptographyCore)
-        implementation(projects.cryptographySerializationPem)
-        implementation(projects.cryptographySerializationAsn1)
-        implementation(projects.cryptographySerializationAsn1Modules)
+        implementation(projects.cryptographyProviderBase)
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -46,6 +46,7 @@ projects("cryptography-kotlin") {
 
     // providers
     folder("cryptography-providers", prefix = "cryptography-provider") {
+        module("base")
         module("jdk") {
             module("android-tests")
         }

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,7 @@ kotlin {`
`27`	`27`
`28`	`28`	`sourceSets.commonMain.dependencies {`
`29`	`29`	`api(projects.cryptographyCore)`
`30`		`- implementation(projects.cryptographySerializationPem)`
`31`		`- implementation(projects.cryptographySerializationAsn1)`
`32`		`- implementation(projects.cryptographySerializationAsn1Modules)`
	`30`	`+ implementation(projects.cryptographyProviderBase)`
`33`	`31`	`}`
`34`	`32`	`}`
`35`	`33`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Module cryptography-provider-base`
	`2`	`+`
	`3`	`+Shared implementation details for providers`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ kotlin {`
`30`	`30`
`31`	`31`	`sourceSets.commonMain.dependencies {`
`32`	`32`	`api(projects.cryptographyCore)`
`33`		`-`
`34`		`- implementation(projects.cryptographySerializationAsn1)`
`35`		`- implementation(projects.cryptographySerializationAsn1Modules)`
	`33`	`+ implementation(projects.cryptographyProviderBase)`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`targets.withType<KotlinNativeTarget>().configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ projects("cryptography-kotlin") {`
`46`	`46`
`47`	`47`	`// providers`
`48`	`48`	`folder("cryptography-providers", prefix = "cryptography-provider") {`
	`49`	`+ module("base")`
`49`	`50`	`module("jdk") {`
`50`	`51`	`module("android-tests")`
`51`	`52`	`}`