From 8b3453dc65b823b3d6df2af48b1cabe2ad23126b Mon Sep 17 00:00:00 2001 From: Andrew Katz Date: Sun, 6 Dec 2020 10:47:35 -0700 Subject: [PATCH 1/4] Update gradle --- build.gradle | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index e700542a..49783cda 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'maven-publish' id 'jacoco' - id "io.freefair.lombok" version "5.3.0" + //id "io.freefair.lombok" version "5.3.0" id "com.github.hierynomus.license" version "0.15.0" } @@ -13,7 +13,8 @@ jacoco { group = 'com.dumbdogdiner' -version = '2.0.0' +// Suffix with -pre while in development +version = '2.0.0-pre' // License Plugin Options license { header = file('LICENSE_HEADER') } @@ -30,21 +31,50 @@ repositories { mavenCentral() jcenter() + maven { url 'https://jitpack.io' } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } maven { url 'https://papermc.io/repo/repository/maven-public/' } + maven { url = "https://repo.extendedclip.com/content/repositories/placeholderapi/" } + maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' } + maven { + credentials { + username "$ghUser" + password "$ghPass" + } + url = "https://maven.pkg.github.com/DumbDogDiner/buildtoolspackages/" } + + maven { + credentials { + username "$ghUser" + password "$ghPass" + } + url = "https://maven.pkg.github.com/DumbDogDiner/closedsource-package-mirror/" } } dependencies { compileOnly 'org.projectlombok:lombok:1.18.16' annotationProcessor 'org.projectlombok:lombok:1.18.16' - compileOnly 'com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT' - compileOnly 'net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT' + compileOnly 'com.dumbdogdiner.buildtools:paper:1.16.4-318-SNAPSHOT' + compileOnly 'io.github.waterfallmc:waterfall-api:1.16-R0.4-SNAPSHOT' + implementation 'org.jetbrains:annotations:20.1.0' implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.atlassian.commonmark:commonmark:0.15.2' implementation 'io.github.classgraph:classgraph:4.8.92' implementation 'com.github.seancfoley:ipaddress:5.3.3' - + implementation 'org.apache.httpcomponents:httpclient:4.5' + implementation 'com.squareup.okhttp3:okhttp:4.9.0' + + //Softdepend Plugins (not all are used yet) + compileOnly 'net.luckperms:api:5.2' + compileOnly 'com.github.MilkBowl:VaultAPI:1.7' + compileOnly 'me.clip:placeholderapi:2.10.6' + compileOnly 'com.dumbdogdiner.closedsource-package-mirror:stafffacilities:4.8.5' + compileOnly 'com.dumbdogdiner.closedsource-package-mirror:plotsquared-bukkit-premium:5.13.8' + compileOnly 'com.dumbdogdiner.closedsource-package-mirror:spartan:377.1' + compileOnly 'com.dumbdogdiner.closedsource-package-mirror:warpsystem:4.2.12' + // JUnit 5 Testing testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") @@ -80,12 +110,13 @@ task sources(type: Jar, dependsOn: classes) { from sourceSets.main.allSource } +tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-XDignore.symbol.file" +} tasks.publish.dependsOn build, sources - - publishing { repositories { maven { From aa2dbe17f1ca74b8de8126ef73add01cf9eb5f6c Mon Sep 17 00:00:00 2001 From: Andrew Katz Date: Sun, 6 Dec 2020 10:47:53 -0700 Subject: [PATCH 2/4] fixup ci --- .github/workflows/ci.yml | 8 ++++++++ .github/workflows/docs.yml | 8 ++++++++ .github/workflows/publish.yml | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca653bbe..672f16d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,14 @@ jobs: - uses: actions/checkout@v2 - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup gradle.properties + run: | + mkdir -p ~/.gradle/ + echo "GRADLE_USER_HOME=$HOME/.gradle" >> $GITHUB_ENV + echo "ghUser=${GITHUB_ACTOR}" >> ~/.gradle/gradle.properties + echo "ghPass=${GITHUB_TOKEN}" >> ~/.gradle/gradle.properties + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build with Gradle run: ./gradlew build - name: Install dependencies for coverage reporter (java 11 only) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0f57403b..b0324af0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,6 +22,14 @@ jobs: persist-credentials: false - name: Echo branch name run: echo ${GITHUB_REF##*/} + - name: Setup gradle.properties + run: | + mkdir -p ~/.gradle/ + echo "GRADLE_USER_HOME=$HOME/.gradle" >> $GITHUB_ENV + echo "ghUser=${GITHUB_ACTOR}" >> ~/.gradle/gradle.properties + echo "ghPass=${GITHUB_TOKEN}" >> ~/.gradle/gradle.properties + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build docs run: | ./gradlew javadoc diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a5724fbe..12df168c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,6 +16,14 @@ jobs: run: echo ${GITHUB_REF##*/} - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup gradle.properties + run: | + mkdir -p ~/.gradle/ + echo "GRADLE_USER_HOME=$HOME/.gradle" >> $GITHUB_ENV + echo "ghUser=${GITHUB_ACTOR}" >> ~/.gradle/gradle.properties + echo "ghPass=${GITHUB_TOKEN}" >> ~/.gradle/gradle.properties + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Publish with Gradle run: ./gradlew -Pversion=${GITHUB_REF##*/} publish env: From c81e69cec5d3267b31edc8fc2d915d0d9171c9c0 Mon Sep 17 00:00:00 2001 From: Andrew Katz Date: Sun, 6 Dec 2020 10:48:02 -0700 Subject: [PATCH 3/4] unbrick javadoc --- .../dumbdogdiner/stickyapi/bukkit/util/SoundUtil.java | 2 +- .../bungeecord/packet/PacketRegistration.java | 2 +- .../stickyapi/bungeecord/util/SoundUtil.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dumbdogdiner/stickyapi/bukkit/util/SoundUtil.java b/src/main/java/com/dumbdogdiner/stickyapi/bukkit/util/SoundUtil.java index 4c842be7..e7296247 100644 --- a/src/main/java/com/dumbdogdiner/stickyapi/bukkit/util/SoundUtil.java +++ b/src/main/java/com/dumbdogdiner/stickyapi/bukkit/util/SoundUtil.java @@ -94,7 +94,7 @@ public static void sendSuccess(@NotNull Player player) { * the sound was played. * * @param sender {@link org.bukkit.command.CommandSender} The sender - * @param type {@link com.dumbdogdiner.stickyapi.bukkit.util.NotificationType} + * @param type {@link NotificationType} * The type of sound * @return {@link java.lang.Boolean} */ diff --git a/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/packet/PacketRegistration.java b/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/packet/PacketRegistration.java index 0fd861c1..8835356d 100644 --- a/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/packet/PacketRegistration.java +++ b/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/packet/PacketRegistration.java @@ -38,7 +38,7 @@ private static void processReflection() { /** * Register a packet with BungeeCord * - * @param clazz that extends {@link DefinedPacket} + * @param clazz that extends {@link net.md_5.bungee.protocol.DefinedPacket} * @param id the protocol ID for the packet (see: https://wiki.vg/Protocol) */ public static void registerPacket(Class clazz, Integer id) { diff --git a/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/util/SoundUtil.java b/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/util/SoundUtil.java index cc7b2629..468bf470 100644 --- a/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/util/SoundUtil.java +++ b/src/main/java/com/dumbdogdiner/stickyapi/bungeecord/util/SoundUtil.java @@ -54,7 +54,7 @@ public static void queueSound(@NotNull ProxiedPlayer player, @NotNull Sound soun /** * Send an info notification to the target player. * - * @param player {@link org.bukkit.entity.ProxiedPlayer} The target player + * @param player {@link ProxiedPlayer} The target player */ public static void sendInfo(@NotNull ProxiedPlayer player) { queueSound(player, Sound.BLOCK_NOTE_BLOCK_PLING, 1f, 1f, 0L); // note pling @@ -64,7 +64,7 @@ public static void sendInfo(@NotNull ProxiedPlayer player) { /** * Send a quiet notification to the target player. * - * @param player {@link org.bukkit.entity.ProxiedPlayer} The target player + * @param player {@link ProxiedPlayer} The target player */ public static void sendQuiet(@NotNull ProxiedPlayer player) { queueSound(player, Sound.BLOCK_NOTE_BLOCK_PLING, 1f, 1f, 0L); // note harp @@ -75,7 +75,7 @@ public static void sendQuiet(@NotNull ProxiedPlayer player) { /** * Send an error notification to the target player. * - * @param player {@link org.bukkit.entity.ProxiedPlayer} The target player + * @param player {@link ProxiedPlayer} The target player */ public static void sendError(@NotNull ProxiedPlayer player) { queueSound(player, Sound.BLOCK_NOTE_BLOCK_BASS, 1f, 0.944f, 0L); @@ -86,7 +86,7 @@ public static void sendError(@NotNull ProxiedPlayer player) { /** * Send a success notification to the target player. * - * @param player {@link org.bukkit.entity.ProxiedPlayer} The target player + * @param player {@link ProxiedPlayer} The target player */ public static void sendSuccess(@NotNull ProxiedPlayer player) { queueSound(player, Sound.ENTITY_PLAYER_LEVELUP, 1f, 2f, 0L); @@ -98,7 +98,7 @@ public static void sendSuccess(@NotNull ProxiedPlayer player) { * the sound was played. * * @param sender {@link org.bukkit.command.CommandSender} The sender - * @param type {@link com.dumbdogdiner.stickyapi.bukkit.util.NotificationType} + * @param type {@link NotificationType} * The type of sound * @return {@link java.lang.Boolean} */ From 8fdc82b8a75986d27f0245f983dccd10d3f3169c Mon Sep 17 00:00:00 2001 From: Andrew Katz Date: Sun, 6 Dec 2020 10:56:56 -0700 Subject: [PATCH 4/4] re-add lombok --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 49783cda..e47675a0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'maven-publish' id 'jacoco' - //id "io.freefair.lombok" version "5.3.0" + id "io.freefair.lombok" version "5.3.0" id "com.github.hierynomus.license" version "0.15.0" }