From e07804a8a88aa6b82e2942383510143261a136e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Thu, 3 Jun 2021 20:36:24 +0200 Subject: [PATCH] build update --- .travis.yml | 3 --- README.adoc => README.md | 8 ++++---- build.gradle | 2 +- gradle/{compile/repo.gradle => repositories/maven.gradle} | 0 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 .travis.yml rename README.adoc => README.md (82%) rename gradle/{compile/repo.gradle => repositories/maven.gradle} (100%) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 94d2a22..0000000 --- a/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: java -jdk: - - openjdk11 diff --git a/README.adoc b/README.md similarity index 82% rename from README.adoc rename to README.md index c3e42ab..76cdc83 100644 --- a/README.adoc +++ b/README.md @@ -1,15 +1,15 @@ -# xbib Guava +# Guava - simplified and reduced This is xbib Guava, a build of Google Guava with the following differences to the original [Google Guava Library](https://github.com/google/guava): -- forked master branch on November 21, 2019 ("28.1+") +- forked master branch on November 21, 2019 (28.1+) - removed all external annotations, so this library does not have any dependencies -- removed duplicate JDK classes (LongAdder, Striped64) +- compiled under Java 11 and with a module info for JPMS (module org.xbib.guava) +- removed duplicate JDK11 classes (LongAdder, Striped64) - replaced sun.misc.Unsafe dependent classes with safe versions (LongAdders, UnsignedBytes, LittleEndianByteArray, AbstractFuture) - the guava failureaccess dependency is included - removed listenablefuture empty dependency hack -- compiled under and for Java 11 and with a module info for JPMS (module org.xbib.guava) - Gradle as build system All credits belong to the original authors diff --git a/build.gradle b/build.gradle index 32128e2..7d7af4b 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ ext { apply plugin: 'java-library' apply from: rootProject.file('gradle/init/banner.gradle') apply from: rootProject.file('gradle/ide/idea.gradle') -apply from: rootProject.file('gradle/compile/repo.gradle') +apply from: rootProject.file('gradle/repositories/maven.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') apply from: rootProject.file('gradle/publishing/publication.gradle') diff --git a/gradle/compile/repo.gradle b/gradle/repositories/maven.gradle similarity index 100% rename from gradle/compile/repo.gradle rename to gradle/repositories/maven.gradle