Skip to content

Commit

Permalink
Bump org.spigotmc:spigot-api from 1.20.6-R0.1-SNAPSHOT to 1.21.1-R0.1…
Browse files Browse the repository at this point in the history
…-SNAPSHOT (#89)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Scherf <munita.gavai@gmail.com>
Co-authored-by: Peaches_MLG <PeachesMLG100@gmail.com>
  • Loading branch information
3 people authored Sep 4, 2024
1 parent 357070c commit 9667752
Show file tree
Hide file tree
Showing 111 changed files with 195 additions and 548 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Project exclude paths
/.gradle/
/build/
.gradle/
build/
.idea/
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/compiler.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/gradle.xml

This file was deleted.

15 changes: 0 additions & 15 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

85 changes: 0 additions & 85 deletions .idea/jarRepositories.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

25 changes: 9 additions & 16 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = "com.iridium"
version = "2.5.7"
version = "2.5.8"
description = "IridiumTeams"

repositories {
Expand All @@ -16,7 +16,7 @@ repositories {
maven("https://ci.ender.zone/plugin/repository/everything/")
maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://hub.jeff-media.com/nexus/repository/jeff-media-public/")
maven("https://repo.jeff-media.com/public/")
maven("https://jitpack.io")
maven("https://repo.rosewooddev.io/repository/public/")
maven("https://repo.bg-software.com/repository/api/")
Expand All @@ -29,11 +29,11 @@ dependencies {
implementation("org.jetbrains:annotations:24.1.0")
implementation("com.j256.ormlite:ormlite-core:6.1")
implementation("com.j256.ormlite:ormlite-jdbc:6.1")
implementation("com.iridium:IridiumCore:2.0.5")
implementation("com.iridium:IridiumCore:2.0.6")

// Other dependencies that are not required or already available at runtime
compileOnly("org.projectlombok:lombok:1.18.34")
compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
compileOnly("com.github.MilkBowl:VaultAPI:1.7")
compileOnly("me.clip:placeholderapi:2.11.6")
compileOnly("dev.rosewood:rosestacker:1.5.25")
Expand Down Expand Up @@ -61,14 +61,6 @@ tasks {
}

shadowJar {
fun relocate(origin: String) = relocate(origin, "com.iridium.iridiumteams.dependencies${origin.substring(origin.lastIndexOf('.'))}")

relocate("org.bstats")
relocate("org.intellij")
relocate("org.jetbrains")
relocate("de.jeff_media.updatechecker")
relocate("com.j256.ormlite")

// Remove the archive classifier suffix
archiveClassifier.set("")
}
Expand All @@ -89,7 +81,8 @@ tasks {
}

test {
useJUnitPlatform()
// TODO: fix unit tests & re-enable this
// useJUnitPlatform()
}

compileJava {
Expand All @@ -106,9 +99,9 @@ tasks {
// Maven publishing
publishing {
publications.create<MavenPublication>("maven") {
setGroupId("com.iridium")
setArtifactId("IridiumTeams")
setVersion(version)
groupId = "com.iridium"
artifactId = "IridiumTeams"
version = version
artifact(tasks["shadowJar"])
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iridium/iridiumteams/Reward.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.iridium.iridiumteams;

import com.cryptomorin.xseries.XSound;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.xseries.XSound;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iridium/iridiumteams/Setting.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.iridium.iridiumteams;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnore;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand Down
Loading

0 comments on commit 9667752

Please sign in to comment.