diff options
| author | J08nY | 2024-03-28 15:16:16 +0100 |
|---|---|---|
| committer | J08nY | 2024-03-28 15:16:16 +0100 |
| commit | 6456d96c094646b86c644c305b1addcbd335cdc0 (patch) | |
| tree | e70564acb2044396794cde343b317e561c9b25a3 | |
| parent | b3d94dd54e9af330d62aeea8b36be3fff7756df1 (diff) | |
| download | ECTester-6456d96c094646b86c644c305b1addcbd335cdc0.tar.gz ECTester-6456d96c094646b86c644c305b1addcbd335cdc0.tar.zst ECTester-6456d96c094646b86c644c305b1addcbd335cdc0.zip | |
Fix BouncyCastle reader version colission in reader module.
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | applet/build.gradle.kts | 6 | ||||
| -rw-r--r-- | reader/build.gradle.kts | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e06faa..67992be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,7 +125,7 @@ jobs: uses: actions/cache@v4 id: cache-libs with: - key: libs-${{ env.BORINGSSL_VERSION }}-${{ env.LIBRESSL_VERSION }}-${{ env.LIBRESSL_VERSION }}-${{ env.IPPCP_VERSION }}-${{ env.WOLFCRYPT_VERSION }}-${{ env.WOLFSSL_VERSION }}-{{ hashFiles(".github/workflows/build.yml") }}-${{ matrix.java }} + key: libs-${{ env.BORINGSSL_VERSION }}-${{ env.LIBRESSL_VERSION }}-${{ env.LIBRESSL_VERSION }}-${{ env.IPPCP_VERSION }}-${{ env.WOLFCRYPT_VERSION }}-${{ env.WOLFSSL_VERSION }}-${{ hashFiles(".github/workflows/build.yml") }}-${{ matrix.java }} path: | ext/boringssl/build/ ext/libressl/build/ diff --git a/applet/build.gradle.kts b/applet/build.gradle.kts index d5ef7f4..61071c2 100644 --- a/applet/build.gradle.kts +++ b/applet/build.gradle.kts @@ -48,7 +48,11 @@ dependencies { // Include plugin as it has bundled GP & other tools. // Alternative: include GP manually, but the included // version has to be compatible with the plugin. - runtimeOnly("com.klinec:gradle-javacard:1.8.0") + runtimeOnly("com.klinec:gradle-javacard:1.8.0") { + // Exclude old BouncyCastle (we have newer). + exclude(group = "org.bouncycastle", module="bcpkix-jdk15on") + } + runtimeOnly("org.bouncycastle:bcpkix-jdk18on:1.77") } java { diff --git a/reader/build.gradle.kts b/reader/build.gradle.kts index ac32214..0e8de4e 100644 --- a/reader/build.gradle.kts +++ b/reader/build.gradle.kts @@ -61,6 +61,6 @@ tasks.register<Jar>("uberJar") { dependsOn(configurations.runtimeClasspath) from({ - configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it).matching { exclude("META-INF/*.DSA", "META-INF/*.SF", "META-INF/*.RSA", "META-INF/versions/*/module-info.class") } } + configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it).matching { exclude("META-INF/*.DSA", "META-INF/*.SF", "META-INF/*.RSA", "META-INF/versions/*/module-info.class", "apdu4j/*") } } }) }
\ No newline at end of file |