Skip to content

Fix CI and switch to using full paper build (for craftbukkit)#42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aakatz3 wants to merge 4 commits into from
Closed

Fix CI and switch to using full paper build (for craftbukkit) #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b3453d
Update gradle
aakatz3 Dec 6, 2020
aa2dbe1
fixup ci
aakatz3 Dec 6, 2020
c81e69c
unbrick javadoc
aakatz3 Dec 6, 2020
8fdc82b
re-add lombok
aakatz3 Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
43 changes: 37 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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') }
Expand All@@ -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'

@ZachyFoxxZachyFoxxDec 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refrain from using craftbukkit in the API, let's also make this a module, I want the core api to work across versions.

@aakatz3aakatz3Dec 6, 2020

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need it (badly) for books

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'
Comment on lines +69 to +76

@ZachyFoxxZachyFoxxDec 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we'd make a module system for these, since putting them in the core API seems like a bad idea, so let's discuss something like this at some point


// JUnit 5 Testing
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
Expand DownExpand Up@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dumbdogdiner/stickyapi/bukkit/util/SoundUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dumbdogdiner/stickyapi/bungeecord/packet/PacketRegistration.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/dumbdogdiner/stickyapi/bungeecord/util/SoundUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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);
Expand All@@ -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);
Expand All@@ -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}
*/
Expand Down