Skip to content

Commit f8b034c

Browse files
committed
Release plugin-compatible stable versions with .0.1 version suffix
1 parent c92ac39 commit f8b034c

2 files changed

Lines changed: 20 additions & 28 deletions

File tree

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,20 @@ Add the dependencies, based on the Maven modules mentioned above, to your `gradl
5454

5555
```toml
5656
[versions]
57-
openssl = "3.5.2"
57+
openssl = "3.5.2.0.1"
58+
zstd = "1.5.7"
5859
nativebuilds = "0.1.0"
5960

6061
[libraries]
6162
# KMP wrapper module for libcrypto.a
62-
openssl-libcrypto = { module = "com.ensody.nativebuilds:openssl-libcrypto", version.ref = "openssl" }
63+
nativebuilds-openssl-libcrypto = { module = "com.ensody.nativebuilds:openssl-libcrypto", version.ref = "openssl" }
6364
# KMP wrapper module for libssl.a
64-
openssl-libssl = { module = "com.ensody.nativebuilds:openssl-libssl", version.ref = "openssl" }
65-
# Needed to integrate the OpenSSL headers for cinterop (only if you need to call the C API directly)
66-
openssl-raw = { module = "com.ensody.nativebuilds:openssl", version.ref = "openssl" }
65+
nativebuilds-openssl-libssl = { module = "com.ensody.nativebuilds:openssl-libssl", version.ref = "openssl" }
66+
# Needed to integrate the OpenSSL headers for cinterop (only if you need to call the C API directly).
67+
nativebuilds-openssl-raw = { module = "com.ensody.nativebuilds:openssl", version.ref = "openssl" }
6768

68-
# Note: Most libraries consist of only one binary, so a single entry is sufficient
69-
zstd = { module = "com.ensody.nativebuilds:zstd", version = "1.5.7" }
69+
# Most libraries consist of only one binary, so a single dependency is sufficient
70+
nativebuilds-zstd = { module = "com.ensody.nativebuilds:zstd", version.ref = "zstd" }
7071

7172
[plugins]
7273
nativebuilds = { id = "com.ensody.nativebuilds", version.ref = "nativebuilds" }
@@ -91,19 +92,19 @@ kotlin {
9192

9293
// Add the KMP dependency containing the pre-built static library (the .a file)
9394
sourceSets.nativeMain.dependencies {
94-
api(libs.openssl.libcrypto)
95+
api(libs.nativebuilds.openssl.libcrypto)
9596
}
9697

9798
// If you need direct access to the libcrypto/OpenSSL API you have to activate cinterop
9899
// for the OpenSSL header files.
99-
// Note: for zstd you'd use the libs.zstd both here and in sourceSets.nativeMain.
100-
cinterops(libs.openssl.raw) {
100+
// Note: for zstd you'd use libs.nativebuilds.zstd both here and in sourceSets.nativeMain.
101+
cinterops(libs.nativebuilds.openssl.raw) {
101102
definitionFile.set(file("src/nativeMain/cinterop/openssl.def"))
102103
}
103104
}
104105
```
105106

106-
Create `src/nativeMain/cinterop/openssl.def`, but focus only on the headers. The native .a is already part of `api(libs.openssl.libcrypto)` above.
107+
Create `src/nativeMain/cinterop/openssl.def`, but don't define staticLibraries. The native .a is already part of `api(libs.nativebuilds.openssl.libcrypto)` above.
107108

108109
```
109110
package = my.package.openssl

nativebuilds/build.gradle.kts

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,14 @@ val initBuildTask = tasks.register("cleanNativeBuild") {
3535

3636
// This is used to publish a new version in case the build script has changed fundamentally
3737
val rebuildVersionWithSuffix = mapOf<String, Map<String, String>>(
38-
// TODO: Publish with real suffix once we've tested in practice
39-
// "curl" to mapOf("8.15.0" to ".0.1"),
40-
// "lz4" to mapOf("1.10.0" to ".0.1"),
41-
// "nghttp2" to mapOf("1.66.0" to ".0.1"),
42-
// "nghttp3" to mapOf("1.11.0" to ".0.1"),
43-
// "ngtcp2" to mapOf("1.14.0" to ".0.1"),
44-
// "openssl" to mapOf("3.5.2" to ".0.1"),
45-
// "zlib" to mapOf("1.3.1" to ".0.1"),
46-
// "zstd" to mapOf("1.5.7" to ".0.1"),
47-
"curl" to mapOf("8.15.0" to "-preview.1"),
48-
"lz4" to mapOf("1.10.0" to "-preview.1"),
49-
"nghttp2" to mapOf("1.66.0" to "-preview.1"),
50-
"nghttp3" to mapOf("1.11.0" to "-preview.1"),
51-
"ngtcp2" to mapOf("1.14.0" to "-preview.1"),
52-
"openssl" to mapOf("3.5.2" to "-preview.1"),
53-
"zlib" to mapOf("1.3.1" to "-preview.1"),
54-
"zstd" to mapOf("1.5.7" to "-preview.1"),
38+
"curl" to mapOf("8.15.0" to ".0.1"),
39+
"lz4" to mapOf("1.10.0" to ".0.1"),
40+
"nghttp2" to mapOf("1.66.0" to ".0.1"),
41+
"nghttp3" to mapOf("1.11.0" to ".0.1"),
42+
"ngtcp2" to mapOf("1.14.0" to ".0.1"),
43+
"openssl" to mapOf("3.5.2" to ".0.1"),
44+
"zlib" to mapOf("1.3.1" to ".0.1"),
45+
"zstd" to mapOf("1.5.7" to ".0.1"),
5546
)
5647

5748
val packages = loadBuildPackages(rootDir).map { pkg ->

0 commit comments

Comments
 (0)