Skip to content

Commit e9710a6

Browse files
Tigerpanzer02version-bump[github-action]
and
version-bump[github-action]
authored
#minor Running on java 8+ (#66)
* Bump version from 1.3.17 to 1.3.17-SNAPSHOT0 * Fixed scoreboard on FUll Game is showing waiting stage instead of starting * Bump version from 1.3.17-SNAPSHOT0 to 1.3.17-SNAPSHOT1 * Fixed leaving while full game stopped the game * Bump version from 1.3.17-SNAPSHOT1 to 1.3.17-SNAPSHOT2 * Attempt to switch to java 8 * Attempt to switch to java 8 * Attempt to switch to java 8 * Bump version from 1.3.17-SNAPSHOT2 to 1.3.17-SNAPSHOT3 * Attempt to switch to maven * Attempt to switch to maven * Bump version from 1.3.17-SNAPSHOT3 to 1.3.17-SNAPSHOT4 * Revert "Bump version from 1.3.17-SNAPSHOT3 to 1.3.17-SNAPSHOT4" This reverts commit cf631d6. * Revert "Attempt to switch to maven" This reverts commit 60fa68d. * Revert "Attempt to switch to maven" This reverts commit 17cd823. * Revert "Bump version from 1.3.17-SNAPSHOT2 to 1.3.17-SNAPSHOT3" This reverts commit 839f6d9. * Revert "Attempt to switch to java 8" This reverts commit 9fa28a8. * Revert "Attempt to switch to java 8" This reverts commit 087accd. * Revert "Attempt to switch to java 8" This reverts commit 327153f. * Bump version from 1.3.17-SNAPSHOT2 to 1.3.17-SNAPSHOT3 * Removed usage of org.apache.commons.lang * Fixed config saving on FileStats which caused player names to be empty * Bump version from 1.3.17-SNAPSHOT3 to 1.3.17-SNAPSHOT4 * Switch from gradle to maven attempt 2 * Switch from gradle to maven attempt 2 * Bump version from 1.3.17-SNAPSHOT4 to 1.3.17-SNAPSHOT5 * Switch from gradle to maven attempt 2 * Bump version from 1.3.17-SNAPSHOT5 to 1.3.17-SNAPSHOT6 * Switch from gradle to maven attempt 2 * Bump version from 1.3.17-SNAPSHOT6 to 1.3.17-SNAPSHOT7 * Use newer deploy plugin * Bump version from 1.3.17-SNAPSHOT7 to 1.3.17-SNAPSHOT8 * Fixed papi repo * Bump version from 1.3.17-SNAPSHOT8 to 1.3.17-SNAPSHOT9 * Updated deploy-master.yml to match maven building * Bump version from 1.3.17-SNAPSHOT9 to 1.3.17-SNAPSHOT10 * Updated deploy-master.yml to match maven building * Bump version from 1.3.17-SNAPSHOT10 to 1.3.17-SNAPSHOT11 * Updated poms to save some bytes on build * Bump version from 1.3.17-SNAPSHOT11 to 1.3.17-SNAPSHOT12 * Updated CHANGELOG.md * Bump version from 1.3.17-SNAPSHOT12 to 1.3.17-SNAPSHOT13 --------- Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
1 parent 7433cb8 commit e9710a6

File tree

42 files changed

+878
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+878
-95
lines changed

.github/CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
### 1.3.16 Release (04.03.2025)
1+
### 1.4.0 Release (13.03.2025)
2+
* Fixed scoreboard on FUll Game is showing waiting stage instead of starting
3+
* Fixed leaving while full game stopped the game
4+
* Changed java compatibility backport to 1.8
5+
6+
### 1.3.17 Release (04.03.2025)
27
* Changed Scoreboard API (now paket based) (Thanks MrMicky-FR FastBoard)
38
* Changed Scoreboard on lower 1.12.2 now supports 30 chars
49
* Changed Scoreboard on 1.13+ now supports unlimited chars
@@ -9,7 +14,7 @@
914
* Fixed Progress must be between 0 and 1
1015
* Fixed ItemBuilder.glowEffect
1116

12-
### (1.3.11-)1.3.15 Release (17.02.2025)
17+
### (1.3.11-)1.3.16 Release (17.02.2025)
1318
* Added 1.21.1-4 support
1419
* Added (3) new ConfigOptions for ArmorStands (BLOCK_IN_GAME_ARMOR_STAND_DESTROY, BLOCK_IN_GAME_ARMOR_STAND_CHECK, BLOCK_IN_GAME_ARMOR_STAND_INTERACT)
1520
* Fixed arena start time divider did not match from config.yml

.github/maven/api/pom.xml renamed to .github/building/api/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3.1-java8</version>
26+
<version>1.3.17-SNAPSHOT4</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -53,8 +53,8 @@
5353
<url>https://maven.plugily.xyz/releases</url>
5454
</repository>
5555
<repository>
56-
<id>papi-repo</id>
57-
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
56+
<id>placeholderapi</id>
57+
<url>https://repo.extendedclip.com/releases/</url>
5858
</repository>
5959
</repositories>
6060

@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-javadoc-plugin</artifactId>
83-
<version>3.4.0</version>
83+
<version>3.11.2</version>
8484
<configuration>
8585
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
8686
<description>Library box with massive content that could be seen as minigames core.</description>
@@ -93,7 +93,7 @@
9393
<extension>
9494
<groupId>org.apache.maven.wagon</groupId>
9595
<artifactId>wagon-ssh</artifactId>
96-
<version>3.5.2</version>
96+
<version>3.5.3</version>
9797
</extension>
9898
</extensions>
9999
</build>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
//CHECKSTYLE:OFF
2+
import org.gradle.util.GradleVersion;
3+
import org.gradle.groovy.scripts.BasicScript;
4+
import org.gradle.groovy.scripts.ScriptSource;
5+
import org.gradle.groovy.scripts.TextResourceScriptSource;
6+
import org.gradle.internal.resource.StringTextResource;
7+
/**
8+
* Precompiled plugily.projects.java-conventions script plugin.
9+
**/
10+
@SuppressWarnings("DefaultPackage")
11+
public class PlugilyProjectsJavaConventionsPlugin implements org.gradle.api.Plugin<org.gradle.api.internal.project.ProjectInternal> {
12+
private static final String MIN_SUPPORTED_GRADLE_VERSION = "5.0";
13+
@Override
14+
public void apply(org.gradle.api.internal.project.ProjectInternal target) {
15+
assertSupportedByCurrentGradleVersion();
16+
try {
17+
Class<? extends BasicScript> pluginsBlockClass = Class.forName("cp_precompiled_PlugilyProjectsJavaConventions").asSubclass(BasicScript.class);
18+
BasicScript pluginsBlockScript = pluginsBlockClass.getDeclaredConstructor().newInstance();
19+
pluginsBlockScript.setScriptSource(scriptSource(pluginsBlockClass));
20+
pluginsBlockScript.init(target, target.getServices());
21+
pluginsBlockScript.run();
22+
target.getPluginManager().apply("java-library");
23+
target.getPluginManager().apply("signing");
24+
target.getPluginManager().apply("maven-publish");
25+
26+
27+
Class<? extends BasicScript> precompiledScriptClass = Class.forName("precompiled_PlugilyProjectsJavaConventions").asSubclass(BasicScript.class);
28+
BasicScript script = precompiledScriptClass.getDeclaredConstructor().newInstance();
29+
script.setScriptSource(scriptSource(precompiledScriptClass));
30+
script.init(target, target.getServices());
31+
script.run();
32+
} catch (Exception e) {
33+
throw new RuntimeException(e);
34+
}
35+
}
36+
private static ScriptSource scriptSource(Class<?> scriptClass) {
37+
return new TextResourceScriptSource(new StringTextResource(scriptClass.getSimpleName(), ""));
38+
}
39+
private static void assertSupportedByCurrentGradleVersion() {
40+
if (GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version(MIN_SUPPORTED_GRADLE_VERSION)) < 0) {
41+
throw new RuntimeException("Precompiled Groovy script plugins require Gradle "+MIN_SUPPORTED_GRADLE_VERSION+" or higher");
42+
}
43+
}
44+
}
45+
//CHECKSTYLE:ON
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
implementation-class=PlugilyProjectsJavaConventionsPlugin
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
implementation-class=PlugilyProjectsJavaConventionsPlugin
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Manifest-Version: 1.0
2+

MiniGamesBox Classic/build.gradle.kts renamed to .github/building/classic/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
implementation("org.openjdk.nashorn:nashorn-core:15.4")
4040
implementation("org.ow2.asm:asm:9.6")
4141
compileOnly("com.viaversion:viaversion-api:5.2.1")
42-
compileOnly("com.mojang:authlib:3.13.56")
4342
compileOnly("de.simonsator:DevelopmentPAFSpigot:1.0.67")
4443
compileOnly("de.simonsator:Party-and-Friends-MySQL-Edition-Spigot-API:1.5.4-RELEASE")
4544
compileOnly("de.simonsator:Spigot-Party-API-For-RedisBungee:1.0.3-SNAPSHOT")

.github/maven/classic/pom.xml renamed to .github/building/classic/pom.xml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3.1-java8</version>
26+
<version>1.3.17-SNAPSHOT4</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -51,8 +51,8 @@
5151
<url>https://maven.plugily.xyz/releases</url>
5252
</repository>
5353
<repository>
54-
<id>papi-repo</id>
55-
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
54+
<id>placeholderapi</id>
55+
<url>https://repo.extendedclip.com/releases/</url>
5656
</repository>
5757
<repository>
5858
<id>via-version</id>
@@ -65,12 +65,6 @@
6565
</repositories>
6666

6767
<dependencies>
68-
<dependency>
69-
<groupId>com.mojang</groupId>
70-
<artifactId>authlib</artifactId>
71-
<version>2.3.31</version>
72-
<scope>provided</scope>
73-
</dependency>
7468
<dependency>
7569
<groupId>fr.mrmicky</groupId>
7670
<artifactId>fastboard</artifactId>
@@ -155,7 +149,7 @@
155149
<dependency>
156150
<groupId>me.clip</groupId>
157151
<artifactId>placeholderapi</artifactId>
158-
<version>2.11.2</version>
152+
<version>2.11.6</version>
159153
<scope>provided</scope>
160154
<exclusions>
161155
<exclusion>
@@ -184,12 +178,12 @@
184178
<plugin>
185179
<groupId>org.apache.maven.plugins</groupId>
186180
<artifactId>maven-jar-plugin</artifactId>
187-
<version>3.2.2</version>
181+
<version>3.4.2</version>
188182
</plugin>
189183
<plugin>
190184
<groupId>org.apache.maven.plugins</groupId>
191185
<artifactId>maven-javadoc-plugin</artifactId>
192-
<version>3.4.0</version>
186+
<version>3.11.2</version>
193187
<configuration>
194188
<windowtitle>MiniGamesBox Classic API docs for v${project.version}</windowtitle>
195189
<description>Library box with massive content that could be seen as minigames core.</description>
@@ -200,7 +194,7 @@
200194
<plugin>
201195
<groupId>org.apache.maven.plugins</groupId>
202196
<artifactId>maven-shade-plugin</artifactId>
203-
<version>3.3.0</version>
197+
<version>3.6.0</version>
204198
<configuration>
205199
<relocations>
206200
<relocation>
@@ -244,7 +238,7 @@
244238
<extension>
245239
<groupId>org.apache.maven.wagon</groupId>
246240
<artifactId>wagon-ssh</artifactId>
247-
<version>3.5.2</version>
241+
<version>3.5.3</version>
248242
</extension>
249243
</extensions>
250244
</build>

.github/maven/database/pom.xml renamed to .github/building/database/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3.1-java8</version>
26+
<version>1.3.17-SNAPSHOT4</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.zaxxer</groupId>
4343
<artifactId>HikariCP</artifactId>
44-
<version>4.0.3</version>
44+
<version>5.0.1</version>
4545
</dependency>
4646

4747
</dependencies>
@@ -51,20 +51,18 @@
5151
<plugin>
5252
<groupId>org.apache.maven.plugins</groupId>
5353
<artifactId>maven-javadoc-plugin</artifactId>
54-
<version>3.4.0</version>
54+
<version>3.11.2</version>
5555
<configuration>
56-
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
56+
<windowtitle>MiniGamesBox Database API docs for v${project.version}</windowtitle>
5757
<description>Library box with massive content that could be seen as minigames core.</description>
58-
<destDir>minecraft/minigamesbox/inventory</destDir>
59-
<isOffline>false</isOffline>
6058
</configuration>
6159
</plugin>
6260
</plugins>
6361
<extensions>
6462
<extension>
6563
<groupId>org.apache.maven.wagon</groupId>
6664
<artifactId>wagon-ssh</artifactId>
67-
<version>3.5.2</version>
65+
<version>3.5.3</version>
6866
</extension>
6967
</extensions>
7068
</build>

gradle.properties renamed to .github/building/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
#
1818
group=plugily.projects
19-
version=1.3.17
19+
version=1.3.17-SNAPSHOT4
File renamed without changes.
File renamed without changes.

.github/maven/inventory/pom.xml renamed to .github/building/inventory/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3.1-java8</version>
26+
<version>1.3.17-SNAPSHOT4</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -54,7 +54,7 @@
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-javadoc-plugin</artifactId>
57-
<version>3.4.0</version>
57+
<version>3.11.2</version>
5858
<configuration>
5959
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
6060
<description>Library box with massive content that could be seen as minigames core.</description>
@@ -65,7 +65,7 @@
6565
<plugin>
6666
<groupId>org.apache.maven.plugins</groupId>
6767
<artifactId>maven-shade-plugin</artifactId>
68-
<version>3.3.0</version>
68+
<version>3.6.0</version>
6969
<configuration>
7070
<relocations>
7171
<relocation>
@@ -89,7 +89,7 @@
8989
<extension>
9090
<groupId>org.apache.maven.wagon</groupId>
9191
<artifactId>wagon-ssh</artifactId>
92-
<version>3.5.2</version>
92+
<version>3.5.3</version>
9393
</extension>
9494
</extensions>
9595
</build>

.github/maven/pom.xml renamed to .github/building/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<groupId>plugily.projects</groupId>
2626
<artifactId>minigamesbox</artifactId>
27-
<version>1.3.3.1-java8</version>
27+
<version>1.3.17-SNAPSHOT4</version>
2828
<packaging>pom</packaging>
2929

3030
<modules>
File renamed without changes.

.github/maven/utils/pom.xml renamed to .github/building/utils/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3.1-java8</version>
26+
<version>1.3.17-SNAPSHOT4</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

@@ -38,7 +38,7 @@
3838
<plugin>
3939
<groupId>org.apache.maven.plugins</groupId>
4040
<artifactId>maven-javadoc-plugin</artifactId>
41-
<version>3.4.0</version>
41+
<version>3.11.2</version>
4242
<configuration>
4343
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
4444
<description>Library box with massive content that could be seen as minigames core.</description>
@@ -51,7 +51,7 @@
5151
<extension>
5252
<groupId>org.apache.maven.wagon</groupId>
5353
<artifactId>wagon-ssh</artifactId>
54-
<version>3.5.2</version>
54+
<version>3.5.3</version>
5555
</extension>
5656
</extensions>
5757
</build>

.github/workflows/deploy-development.yml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ jobs:
1010
steps:
1111
- name: Checkout Latest Commit
1212
uses: actions/[email protected]
13-
- name: Grant execute permission for gradlew
14-
run: chmod +x gradlew
1513
- name: Bump Version
1614
id: bump
17-
uses: Plugily-Projects/version-bump-action@v8
15+
uses: Plugily-Projects/version-bump-action@v10
1816
with:
1917
github-token: ${{ secrets.github_token }}
2018
auto-version-bump: true
@@ -34,10 +32,23 @@ jobs:
3432
distribution: 'temurin'
3533
java-version: '21'
3634
java-package: jdk
37-
- name: Grant execute permission for gradlew
38-
run: chmod +x gradlew
39-
- name: Publish with Gradle
40-
run: ./gradlew publishMavenPublicationToSnapshotsRepository --info
41-
env:
42-
MAVEN_USERNAME: ${{ secrets.SNAPSHOTSUSERNAME }}
43-
MAVEN_PASSWORD: ${{ secrets.SNAPSHOTSPASSWORD }}
35+
- name: Set up Maven
36+
uses: stCarolas/setup-maven@v5
37+
with:
38+
maven-version: 3.8.2
39+
- name: Cache
40+
uses: actions/[email protected]
41+
with:
42+
path: ~/.m2/repository
43+
key: maven-${{ hashFiles('**/pom.xml') }}
44+
restore-keys: maven-
45+
- name: Publish with Maven
46+
47+
with:
48+
servers: |
49+
[{
50+
"id": "Snapshot",
51+
"username": "${{ secrets.SNAPSHOTSUSERNAME }}",
52+
"password": "${{ secrets.SNAPSHOTSPASSWORD }}"
53+
}]
54+
- run: mvn clean verify compile package site:site javadoc:javadoc javadoc:jar deploy -DaltDeploymentRepository=Snapshot::https://maven.plugily.xyz/snapshots -f pom.xml

0 commit comments

Comments
 (0)