Skip to content

Commit

Permalink
Add Spotless Java linter
Browse files Browse the repository at this point in the history
  • Loading branch information
mezz committed Aug 21, 2021
1 parent 749f7b7 commit e974ed4
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 11 deletions.
19 changes: 15 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ plugins {
id 'java'
id 'eclipse'
id 'idea'
id "com.diffplug.spotless" version "5.14.3"
id 'com.matthewprenger.cursegradle' version '1.4.0'
id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '1.71.4'
}
Expand Down Expand Up @@ -70,9 +71,9 @@ repositories {

dependencies {
minecraft([
group : "${project.forgegroup}",
group : "${project.forge_group}",
name : 'forge',
version: "${project.mcversion}-${project.forgeversion}"
version: "${project.minecraft_version}-${project.forge_version}"
])
testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2"
Expand All @@ -81,7 +82,7 @@ dependencies {
}

minecraft {
mappings channel: 'official', version: project.mcversion
mappings channel: 'official', version: project.minecraft_version

accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

Expand Down Expand Up @@ -144,7 +145,7 @@ curseforge {
changelog = file('changelog.html')
changelogType = 'html'
releaseType = 'beta'
addGameVersion "${mcversion}"
addGameVersion "${minecraft_version}"
}
}

Expand Down Expand Up @@ -251,3 +252,13 @@ test {
include 'mezz/jei/**'
exclude 'mezz/jei/lib/**'
}

spotless {
java {
target 'src/*/java/mezz/jei/**/*.java'

endWithNewline()
trimTrailingWhitespace()
removeUnusedImports()
}
}
27 changes: 21 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mcversion=1.17.1
forgeversion=37.0.32
# Minecraft
minecraft_version=1.17.1
minecraft_version_range=[1.17.1, 1.18)

# Forge
forge_version=37.0.32
loader_version_range=[37,)
forge_version_range=[37.0.31,)
minecraft_version_range=[1.17.1, 1.18)
forgegroup=net.minecraftforge
curse_project_id=238222
forge_group=net.minecraftforge

# Dependencies
ftb_library_version=1605.3.0-build.64

# Publishing
curse_project_id=238222

# Version
version_major=8
version_minor=0
version_patch=0

# Workaround for Spotless bug
# https://github.com/diffplug/spotless/issues/834
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = "jei-${mcversion}"
rootProject.name = "jei-${minecraft_version}"

0 comments on commit e974ed4

Please sign in to comment.