Skip to content

Commit

Permalink
Merge branch 'master' into clear-data-command
Browse files Browse the repository at this point in the history
  • Loading branch information
sh0inx authored Nov 20, 2024
2 parents a0f8e2c + 8d47cab commit 5903cdb
Show file tree
Hide file tree
Showing 10 changed files with 225 additions and 184 deletions.
12 changes: 0 additions & 12 deletions .github/dependabot.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"automerge": true,
"autoApprove": true
}
29 changes: 0 additions & 29 deletions .github/workflows/dependabot-approve.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.commits[0].message, '[ci-skip]')"
steps:
- uses: actions/checkout@v3.0.0
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v3
- name: Set up JDK 17
uses: actions/setup-java@v3.0.0
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Build with Gradle
run: ./gradlew build
- name: Upload artifacts
uses: "actions/upload-artifact@v2.2.3"
uses: actions/upload-artifact@v4
with:
name: "IridiumSkyblock"
path: "build/libs/IridiumSkyblock-*.jar"
path: "build/libs/IridiumSkyblock-*.jar"
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.0.0
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4.2.1
- uses: gradle/wrapper-validation-action@v3
- name: Set up JDK 17
uses: actions/setup-java@v3.0.0
uses: actions/setup-java@v4.4.0
with:
distribution: temurin
java-version: 17
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Build with Gradle
run: ./gradlew build
- name: Upload artifacts
uses: "actions/upload-artifact@v2.2.3"
uses: "actions/upload-artifact@v4.4.1"
with:
name: "IridiumSkyblock"
path: "build/libs/IridiumSkyblock-*.jar"
Expand All @@ -35,12 +35,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Downloading artifact
uses: actions/checkout@v2
uses: actions/checkout@v4
- uses: thecodemonkey/action-get-gradle-version@master
id: version
with:
file: "build.gradle.kts"
- uses: actions/download-artifact@v3.0.2
- uses: actions/download-artifact@v4.1.8
with:
name: "IridiumSkyblock"
path: "./"
Expand All @@ -55,12 +55,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Downloading artifact
uses: actions/checkout@v2
uses: actions/checkout@v4
- uses: thecodemonkey/action-get-gradle-version@master
id: version
with:
file: "build.gradle.kts"
- uses: actions/download-artifact@v3.0.2
- uses: actions/download-artifact@v4.1.8
with:
name: "IridiumSkyblock"
path: "./"
Expand Down Expand Up @@ -117,12 +117,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Downloading artifact
uses: actions/checkout@v2
uses: actions/checkout@v4
- uses: thecodemonkey/action-get-gradle-version@master
id: version
with:
file: "build.gradle.kts"
- uses: actions/download-artifact@v3.0.2
- uses: actions/download-artifact@v4.1.8
with:
name: "IridiumSkyblock"
path: "./"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ repositories {

dependencies {
// Dependencies that we want to shade in
implementation("org.jetbrains:annotations:24.1.0")
implementation("org.jetbrains:annotations:25.0.0")
implementation("com.j256.ormlite:ormlite-core:6.1")
implementation("com.j256.ormlite:ormlite-jdbc:6.1")
implementation("com.iridium:IridiumTeams:2.5.8")
implementation("com.iridium:IridiumTeams:2.5.9")
implementation("commons-lang:commons-lang:2.6")

// Other dependencies that are not required or already available at runtime
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 5903cdb

Please sign in to comment.