Please note I made a change to move the project to use Java 11, and therefore the next version, per semver, will be 1.0.0.
Cheers! Antoine > Begin forwarded message: > > From: toulm...@apache.org > Subject: [incubator-tuweni] branch master updated: Move to Java 11. Remove > deprecation warnings - not sure why this was deprecated. Remove some dokka > parameters > Date: December 6, 2019 at 4:28:35 PM PST > To: "comm...@tuweni.apache.org" <comm...@tuweni.apache.org> > Reply-To: dev@tuweni.apache.org > > This is an automated email from the ASF dual-hosted git repository. > > toulmean pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git > > > The following commit(s) were added to refs/heads/master by this push: > new c0a26d3 Move to Java 11. Remove deprecation warnings - not sure why > this was deprecated. Remove some dokka parameters > c0a26d3 is described below > > commit c0a26d3bedabede59e8472e4871c3837a474e317 > Author: Antoine Toulme <anto...@lunar-ocean.com> > AuthorDate: Fri Dec 6 16:28:19 2019 -0800 > > Move to Java 11. Remove deprecation warnings - not sure why this was > deprecated. Remove some dokka parameters > --- > README.md | 2 +- > build.gradle | 78 ++++++++++------------ > .../org/apache/tuweni/crypto/sodium/AES256GCM.java | 2 - > .../java/org/apache/tuweni/crypto/sodium/Auth.java | 2 - > .../java/org/apache/tuweni/crypto/sodium/Box.java | 2 - > .../apache/tuweni/crypto/sodium/DiffieHelman.java | 2 - > .../apache/tuweni/crypto/sodium/GenericHash.java | 2 - > .../apache/tuweni/crypto/sodium/KeyDerivation.java | 2 - > .../apache/tuweni/crypto/sodium/KeyExchange.java | 4 -- > .../apache/tuweni/crypto/sodium/SHA256Hash.java | 2 - > .../org/apache/tuweni/crypto/sodium/SecretBox.java | 2 - > .../org/apache/tuweni/crypto/sodium/Signature.java | 2 - > .../tuweni/crypto/sodium/XChaCha20Poly1305.java | 2 - > 13 files changed, 35 insertions(+), 69 deletions(-) > > diff --git a/README.md b/README.md > index 74de4d9..f7e55b7 100644 > --- a/README.md > +++ b/README.md > @@ -11,7 +11,7 @@ Tuweni is a set of libraries and other tools to aid > development of blockchain an > > It includes a low-level bytes library, serialization and deserialization > codecs (e.g. [RLP](https://github.com/ethereum/wiki/wiki/RLP)), various > cryptography functions and primatives, and lots of other helpful utilities. > > -Tuweni is developed for JDK 1.8 or higher. > +Tuweni is developed for JDK 11 or higher. > > ## Build Instructions > > diff --git a/build.gradle b/build.gradle > index 73e9e0e..9e6ccdf 100644 > --- a/build.gradle > +++ b/build.gradle > @@ -31,8 +31,8 @@ plugins { > id 'io.spring.dependency-management' version '1.0.6.RELEASE' > id 'com.github.hierynomus.license' version '0.15.0' > id 'org.gradle.crypto.checksum' version '1.1.0' > - id 'org.jetbrains.kotlin.jvm' version '1.3.20' > - id 'org.jetbrains.dokka' version '0.9.17' > + id 'org.jetbrains.kotlin.jvm' version '1.3.30' > + id 'org.jetbrains.dokka' version '0.10.0' > id 'maven-publish' > id 'com.jfrog.bintray' version '1.8.3' > } > @@ -49,7 +49,7 @@ if > (!file("${rootDir}/eth-reference-tests/src/test/resources/eth2.0-tests/README > ////// > // Version numbering > > -def versionNumber = '0.11.0' > +def versionNumber = '1.0.0' > def buildVersion = versionNumber + buildTag() > > static String buildTag() { > @@ -201,8 +201,8 @@ allprojects { > ////// > // Compiler arguments > > - sourceCompatibility = '1.8' > - targetCompatibility = '1.8' > + sourceCompatibility = '1.11' > + targetCompatibility = '1.11' > > jacoco { toolVersion = '0.8.2' } > > @@ -219,12 +219,6 @@ allprojects { > } > > tasks.withType(JavaCompile) { > - // Until https://github.com/gradle/gradle/issues/2510 is resolved and > - // something like a `releaseCompability` property is added, we have to > add > - // the --release flag explicitly > - if (JavaVersion.current() > JavaVersion.VERSION_1_8) { > - options.compilerArgs.addAll(['--release', '8']) > - } > options.compilerArgs += [ > '-Xlint:unchecked', > '-Xlint:cast', > @@ -246,7 +240,7 @@ allprojects { > > tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { > kotlinOptions { > - jvmTarget = "1.8" > + jvmTarget = "11" > allWarningsAsErrors = true > freeCompilerArgs = [ > '-Xjsr305=strict', > @@ -269,13 +263,17 @@ allprojects { > dokka { > outputFormat = 'html' > outputDirectory = "$buildDir/docs/dokka" > - jdkVersion = 8 > - includeNonPublic = false > - def relativePath = > rootDir.toPath().relativize(projectDir.toPath()).toString() > - linkMapping { > - dir = projectDir.toString() > - url = > "https://github.com/apache/incubator-tuweni/blob/master/$relativePath"; > - suffix = "#L" > + configuration { > + noStdlibLink = true > + noJdkLink = true > + jdkVersion = 11 > + includeNonPublic = false > + def relativePath = > rootDir.toPath().relativize(projectDir.toPath()).toString() > + sourceLink { > + path = projectDir.toString() > + url = > "https://github.com/apache/incubator-tuweni/blob/master/$relativePath"; > + lineSuffix = "#L" > + } > } > } > > @@ -568,35 +566,27 @@ javadoc { > } > > dokka { > - moduleName = rootProject.name > - subprojects.each { > - dependsOn it.classes > - it.sourceSets.main.output.each { d -> > - if (d.exists()) { > - classpath += d > + > + configuration { > + noStdlibLink = true > + noJdkLink = true > + moduleName = rootProject.name > + subprojects.each { > + dependsOn it.classes > + it.sourceSets.main.output.each { d -> > + if (d.exists()) { > + classpath += d > + } > } > } > - } > - sourceDirs = files(subprojects.collect { > - return [ > - new File(it.projectDir, '/src/main/kotlin'), > - new File(it.projectDir, '/src/main/java') > - ] > - }) > - linkMapping { > - dir = rootDir.toString() > - url = "https://github.com/apache/incubator-tuweni/blob/master"; > - suffix = "#L" > - } > - > - includes = ['PACKAGES.md'] > > - externalDocumentationLink { > - url = new URL("https://docs.oracle.com/javase/8/docs/api/";) > - } > + sourceLink { > + path = rootDir.toString() > + url = "https://github.com/apache/incubator-tuweni/blob/master"; > + lineSuffix = "#L" > + } > > - externalDocumentationLink { > - url = new > URL('https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/') > + includes = ['PACKAGES.md'] > } > } > > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/AES256GCM.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/AES256GCM.java > index c5b58fd..e9e3fac 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/AES256GCM.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/AES256GCM.java > @@ -185,8 +185,6 @@ public final class AES256GCM implements AutoCloseable { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Auth.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Auth.java > index d163376..c493a83 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Auth.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Auth.java > @@ -158,8 +158,6 @@ public final class Auth { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Box.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Box.java > index 9df2dc8..56a4125 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Box.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Box.java > @@ -298,8 +298,6 @@ public final class Box implements AutoCloseable { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/DiffieHelman.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/DiffieHelman.java > index 3ee9ddb..6859bea 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/DiffieHelman.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/DiffieHelman.java > @@ -245,8 +245,6 @@ public final class DiffieHelman { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/GenericHash.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/GenericHash.java > index a6005b2..b37003f 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/GenericHash.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/GenericHash.java > @@ -171,8 +171,6 @@ public final class GenericHash { > * WARNING: This will cause the hash to be copied into heap memory. > * > * @return The bytes of this hash. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyDerivation.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyDerivation.java > index 71439fd..33033eb 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyDerivation.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyDerivation.java > @@ -239,8 +239,6 @@ public final class KeyDerivation { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyExchange.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyExchange.java > index e604ec2..9707e16 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyExchange.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/KeyExchange.java > @@ -202,8 +202,6 @@ public final class KeyExchange { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > @@ -550,8 +548,6 @@ public final class KeyExchange { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return Bytes.wrap(bytesArray()); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SHA256Hash.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SHA256Hash.java > index 39f16f6..97b6d97 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SHA256Hash.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SHA256Hash.java > @@ -192,8 +192,6 @@ public class SHA256Hash { > * WARNING: This will cause the hash to be copied into heap memory. > * > * @return The bytes of this hash. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SecretBox.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SecretBox.java > index 1783867..bd7e53d 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SecretBox.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/SecretBox.java > @@ -170,8 +170,6 @@ public final class SecretBox { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Signature.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Signature.java > index 5e08e30..52b456f 100644 > --- a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Signature.java > +++ b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/Signature.java > @@ -249,8 +249,6 @@ public final class Signature { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > diff --git > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/XChaCha20Poly1305.java > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/XChaCha20Poly1305.java > index e63e5fe..13d65aa 100644 > --- > a/crypto/src/main/java/org/apache/tuweni/crypto/sodium/XChaCha20Poly1305.java > +++ > b/crypto/src/main/java/org/apache/tuweni/crypto/sodium/XChaCha20Poly1305.java > @@ -208,8 +208,6 @@ public final class XChaCha20Poly1305 { > * WARNING: This will cause the key to be copied into heap memory. > * > * @return The bytes of this key. > - * @deprecated Use {@link #bytesArray()} to obtain the bytes as an > array, which should be overwritten when no longer > - * required. > */ > public Bytes bytes() { > return value.bytes(); > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: commits-unsubscr...@tuweni.apache.org > For additional commands, e-mail: commits-h...@tuweni.apache.org >
