Skip to content
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.

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

Update build system and fix compiler issues #25

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
build/
debug/

# VS Code
# -------

.vscode/

# IntelliJ
# --------

Expand Down
35 changes: 22 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,28 @@ plugins {
id 'java'

// Generates the plugin.yml, allows easier access to common plugin libraries, and facilitates the test server tasks.
id 'kr.entree.spigradle' version '2.2.3'
id 'kr.entree.spigradle' version '2.4.2'

// Allows us to shade libraries into the build plugin.
id 'com.github.johnrengelman.shadow' version '5.2.0'
}

repositories {
jcenter()
mavenCentral()
jitpack()

spigot()
paper()
spigotmc()
sonatype()
papermc()
}

dependencies {
compileOnly spigot(project.property('mcVersion'))
compileOnly paper(project.property('mcVersion'))

implementation 'com.google.guava:guava:28.2-jre'

testImplementation platform('org.junit:junit-bom:5.7.0')
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation mockBukkit()
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.29.0'
}

test {
Expand All @@ -46,14 +45,22 @@ task cleanAll {
// Compilation variables / tasks
// ---------------------------------------------------------

targetCompatibility = 1.8
sourceCompatibility = 1.8
compileJava {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

// Shading
// ---------------------------------------------------------

tasks.build.dependsOn(shadowJar)
tasks.prepareSpigotPlugins.dependsOn(shadowJar)

shadowJar {
// This is required to prevent Spigradle from attempting to look for an incorrectly named file during debug.
classifier = ''

// relocate 'old.path.lib', "${project.property('group')}.lib"
}

// Plugin variables / tasks
Expand All @@ -73,6 +80,8 @@ spigot {
eula = true
buildVersion = project.property('mcVersion')
args = project.property('debugServerArgs').split(/(,\s*|\s+)/)
jvmArgs = project.property('debugServerJvmArgs').split(/(,\s*|\s+)/)

// This caused issues with the debugPaper task
// jvmArgs = project.property('debugServerJvmArgs').split(/(,\s*|\s+)/)
}
}
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
group = com.projectkorra
group = com.projectkorra.core
name = ProjectKorra-Core
authors = ProjectKorra
version = 0.0.1
description = This is a placeholder plugin description.
mcVersion = 1.16.3
apiVersion = 1.16
mcVersion = 1.19.2
apiVersion = 1.19
debugServerArgs = --nogui
debugServerJvmArgs =
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading