diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml index 71bbd95..f22b7a9 100644 --- a/.github/workflows/publish-central.yml +++ b/.github/workflows/publish-central.yml @@ -7,7 +7,7 @@ on: required: true default: '0.0.0' jobs: - build: + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml index 32a3041..8be609b 100644 --- a/.github/workflows/publish-github.yml +++ b/.github/workflows/publish-github.yml @@ -35,6 +35,6 @@ jobs: SLACK_ICON_EMOJI: ':bot:' SLACK_CHANNEL: 'cryptomator-desktop' SLACK_TITLE: "Published ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}" - SLACK_MESSAGE: "Ready to ." + SLACK_MESSAGE: "Ready to ." SLACK_FOOTER: - MSG_MINIMAL: true \ No newline at end of file + MSG_MINIMAL: true diff --git a/README.md b/README.md index 36ed0df..4b14701 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Java RFC 5297 SIV Authenticated Encryption [![Build](https://github.com/cryptomator/siv-mode/workflows/Build/badge.svg)](https://github.com/cryptomator/siv-mode/actions?query=workflow%3ABuild) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8b274788dab046259a40e56688236790)](https://www.codacy.com/app/cryptomator/siv-mode) -[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/8b274788dab046259a40e56688236790)](https://www.codacy.com/app/cryptomator/siv-mode) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8b274788dab046259a40e56688236790)](https://www.codacy.com/gh/cryptomator/siv-mode/dashboard) +[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/8b274788dab046259a40e56688236790)](https://www.codacy.com/gh/cryptomator/siv-mode/dashboard) [![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/siv-mode/badge.svg)](https://snyk.io/test/github/cryptomator/siv-mode) [![Maven Central](https://img.shields.io/maven-central/v/org.cryptomator/siv-mode.svg?maxAge=86400)](https://repo1.maven.org/maven2/org/cryptomator/siv-mode/) [![Javadocs](http://www.javadoc.io/badge/org.cryptomator/siv-mode.svg)](http://www.javadoc.io/doc/org.cryptomator/siv-mode) diff --git a/pom.xml b/pom.xml index 0f1d017..3807a06 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator siv-mode - 1.4.1 + 1.4.2 SIV Mode RFC 5297 SIV mode: deterministic authenticated encryption @@ -41,10 +41,10 @@ 5.7.1 - 3.7.7 - 1.27 + 3.10.0 + 1.31 2.2 - 30.1-jre + 30.1.1-jre diff --git a/src/main/java/org/cryptomator/siv/SivMode.java b/src/main/java/org/cryptomator/siv/SivMode.java index 99e7160..fc1a6d2 100644 --- a/src/main/java/org/cryptomator/siv/SivMode.java +++ b/src/main/java/org/cryptomator/siv/SivMode.java @@ -17,7 +17,6 @@ import javax.crypto.IllegalBlockSizeException; import javax.crypto.SecretKey; -import java.nio.ByteBuffer; import java.security.Provider; import java.util.Arrays; diff --git a/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/Placeholder.java b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/Placeholder.java new file mode 100644 index 0000000..a76af0a --- /dev/null +++ b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/Placeholder.java @@ -0,0 +1,8 @@ +package org.cryptomator.siv.org.bouncycastle.crypto; + +/** + * module-info will be evaluated before maven-shade-plugin, so we need this placeholder + * to avoid complaints about this package being empty. + */ +class Placeholder { +} diff --git a/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/macs/Placeholder.java b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/macs/Placeholder.java new file mode 100644 index 0000000..80440f2 --- /dev/null +++ b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/macs/Placeholder.java @@ -0,0 +1,8 @@ +package org.cryptomator.siv.org.bouncycastle.crypto.macs; + +/** + * module-info will be evaluated before maven-shade-plugin, so we need this placeholder + * to avoid complaints about this package being empty. + */ +class Placeholder { +} diff --git a/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/modes/Placeholder.java b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/modes/Placeholder.java new file mode 100644 index 0000000..11e15ab --- /dev/null +++ b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/modes/Placeholder.java @@ -0,0 +1,8 @@ +package org.cryptomator.siv.org.bouncycastle.crypto.modes; + +/** + * module-info will be evaluated before maven-shade-plugin, so we need this placeholder + * to avoid complaints about this package being empty. + */ +class Placeholder { +} diff --git a/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/paddings/Placeholder.java b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/paddings/Placeholder.java new file mode 100644 index 0000000..c169c7f --- /dev/null +++ b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/paddings/Placeholder.java @@ -0,0 +1,8 @@ +package org.cryptomator.siv.org.bouncycastle.crypto.paddings; + +/** + * module-info will be evaluated before maven-shade-plugin, so we need this placeholder + * to avoid complaints about this package being empty. + */ +class Placeholder { +} diff --git a/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/params/Placeholder.java b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/params/Placeholder.java new file mode 100644 index 0000000..009b51f --- /dev/null +++ b/src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/params/Placeholder.java @@ -0,0 +1,8 @@ +package org.cryptomator.siv.org.bouncycastle.crypto.params; + +/** + * module-info will be evaluated before maven-shade-plugin, so we need this placeholder + * to avoid complaints about this package being empty. + */ +class Placeholder { +} diff --git a/src/main/java/org/cryptomator/siv/org/bouncycastle/util/Placeholder.java b/src/main/java/org/cryptomator/siv/org/bouncycastle/util/Placeholder.java new file mode 100644 index 0000000..83642ce --- /dev/null +++ b/src/main/java/org/cryptomator/siv/org/bouncycastle/util/Placeholder.java @@ -0,0 +1,8 @@ +package org.cryptomator.siv.org.bouncycastle.util; + +/** + * module-info will be evaluated before maven-shade-plugin, so we need this placeholder + * to avoid complaints about this package being empty. + */ +class Placeholder { +} diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java index dd56671..0a33327 100644 --- a/src/main/java9/module-info.java +++ b/src/main/java9/module-info.java @@ -1,4 +1,11 @@ module org.cryptomator.siv { - exports org.cryptomator.siv; requires static org.bouncycastle.provider; + + exports org.cryptomator.siv; + exports org.cryptomator.siv.org.bouncycastle.crypto; + exports org.cryptomator.siv.org.bouncycastle.crypto.macs; + exports org.cryptomator.siv.org.bouncycastle.crypto.modes; + exports org.cryptomator.siv.org.bouncycastle.crypto.paddings; + exports org.cryptomator.siv.org.bouncycastle.crypto.params; + exports org.cryptomator.siv.org.bouncycastle.util; } \ No newline at end of file