Skip to content

Commit

Permalink
Pull'd develop branch
Browse files Browse the repository at this point in the history
* Bump JDA version to 324 (#31)

Updates JDA (they forgot something with slash-commands, has been added now)

* Add spotless integration

This hopefully makes formatting more consistent. The Eclipse XML style
was chosen as it is understood by Eclipse, VSC (JDT), Spotless and
mostly by IntelliJ.

* Make gradelew executable

* Add "Remove unused imports" setting to spotless

Co-authored-by: Marko Radosavljević <marko@radosavljevic.dev>

* Remove unused imports to fix diffplug/spotless#834 (#35)

Co-authored-by: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Co-authored-by: Marko Radosavljević <marko@radosavljevic.dev>
Co-authored-by: Jonas <jnhrd254@gmail.com>
  • Loading branch information
4 people authored Sep 8, 2021
1 parent 7a05061 commit c487ea0
Show file tree
Hide file tree
Showing 3 changed files with 346 additions and 2 deletions.
11 changes: 9 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'java'
id "com.diffplug.spotless" version "5.15.0"
}

group 'org.togetherjava'
Expand All @@ -14,7 +15,7 @@ repositories {
}

dependencies {
implementation 'net.dv8tion:JDA:4.3.0_323'
implementation 'net.dv8tion:JDA:4.3.0_324'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1'
Expand All @@ -24,4 +25,10 @@ dependencies {

test {
useJUnitPlatform()
}
}

spotless {
java {
eclipse().configFile('meta/formatting/google-style-eclipse.xml')
}
}
Empty file modified gradlew
100644 → 100755
Empty file.
Loading

0 comments on commit c487ea0

Please sign in to comment.