Skip to content

Commit e2689bb

Browse files
Bump dependencies, update github ci, gradle and copyright headers and fix eshot collisions, closes #10
1 parent 98ec06d commit e2689bb

40 files changed

+475
-415
lines changed

.github/workflows/gradle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [ 16 ]
12+
java: [ 21 ]
1313
fail-fast: true
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: JDK ${{ matrix.java }}
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
java-version: ${{ matrix.java }}
2020
cache: 'gradle'

build.gradle.kts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
22
java
3-
id("com.github.johnrengelman.shadow").version("8.1.1")
3+
id("io.github.goooler.shadow").version("8.1.8")
44
}
55

66
group = "me.moros"
7-
version = "1.7.2"
7+
version = "1.7.3"
88

99
java {
1010
toolchain {
11-
languageVersion.set(JavaLanguageVersion.of(16))
11+
languageVersion.set(JavaLanguageVersion.of(21))
1212
}
1313
}
1414

@@ -20,8 +20,8 @@ repositories {
2020

2121
dependencies {
2222
implementation("org.bstats", "bstats-bukkit", "3.0.2")
23-
compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
24-
compileOnly("com.github.ProjectKorra:ProjectKorra:v1.11.1")
23+
compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
24+
compileOnly("com.github.ProjectKorra:ProjectKorra:v1.11.2")
2525
}
2626

2727
tasks {
@@ -35,6 +35,10 @@ tasks {
3535
build {
3636
dependsOn(shadowJar)
3737
}
38+
withType<JavaCompile> {
39+
options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation"))
40+
options.encoding = "UTF-8"
41+
}
3842
withType<AbstractArchiveTask> {
3943
isPreserveFileTimestamps = false
4044
isReproducibleFileOrder = true

gradle/wrapper/gradle-wrapper.jar

2.48 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/me/moros/hyperion/Hyperion.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*
2-
* Copyright 2016, 2017, 2020 Moros <https://github.com/PrimordialMoros>
2+
* Copyright 2016-2024 Moros
33
*
4-
* This file is part of Hyperion.
4+
* This file is part of Hyperion.
55
*
6-
* Hyperion is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* Hyperion is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
1010
*
11-
* Hyperion is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
11+
* Hyperion is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
1515
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
16+
* You should have received a copy of the GNU General Public License
17+
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

2020
package me.moros.hyperion;

src/main/java/me/moros/hyperion/PersistentDataLayer.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* Copyright 2016-2024 Moros
3+
*
4+
* This file is part of Hyperion.
5+
*
6+
* Hyperion is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Hyperion is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
18+
*/
19+
120
package me.moros.hyperion;
221

322
import org.bukkit.NamespacedKey;

src/main/java/me/moros/hyperion/abilities/airbending/Evade.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*
2-
* Copyright 2016, 2017, 2020 Moros <https://github.com/PrimordialMoros>
2+
* Copyright 2016-2024 Moros
33
*
4-
* This file is part of Hyperion.
4+
* This file is part of Hyperion.
55
*
6-
* Hyperion is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* Hyperion is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
1010
*
11-
* Hyperion is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
11+
* Hyperion is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
1515
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
16+
* You should have received a copy of the GNU General Public License
17+
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

2020
package me.moros.hyperion.abilities.airbending;

src/main/java/me/moros/hyperion/abilities/airbending/combo/AirWheel.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*
2-
* Copyright 2016, 2017, 2020 Moros <https://github.com/PrimordialMoros>
2+
* Copyright 2016-2024 Moros
33
*
4-
* This file is part of Hyperion.
4+
* This file is part of Hyperion.
55
*
6-
* Hyperion is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
6+
* Hyperion is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
1010
*
11-
* Hyperion is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
11+
* Hyperion is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
1515
*
16-
* You should have received a copy of the GNU General Public License
17-
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
16+
* You should have received a copy of the GNU General Public License
17+
* along with Hyperion. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

2020
package me.moros.hyperion.abilities.airbending.combo;

0 commit comments

Comments
 (0)