Skip to content

Commit

Permalink
chore(deps): bump slimjar to 1.6.1, fixing build problems
Browse files Browse the repository at this point in the history
Signed-off-by: Thatsmusic99 <25277367+thatsmusic99@users.noreply.github.com>
  • Loading branch information
Thatsmusic99 committed Aug 24, 2023
1 parent f2364e4 commit 084318e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 16 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
Expand Up @@ -97,10 +97,7 @@ jobs:
uses: gradle/gradle-build-action@v2

- name: Build with Gradle
run: ./gradlew slimJar

- name: Force JSON files because life is tough and I am a programmer so naturally I work around everything that should be handled head-on
run: zip -r -D -j build/advancedteleport-bukkit/libs/AdvancedTeleport-Bukkit-*-all.jar build/advancedteleport-bukkit/resources/slimjar/*.json
run: ./gradlew shadowJar

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/pullrequest.yml
Expand Up @@ -95,10 +95,7 @@ jobs:
uses: gradle/gradle-build-action@v2

- name: Build with Gradle
run: ./gradlew slimJar

- name: Force JSON files because life is tough and I am a programmer so naturally I work around everything that should be handled head-on
run: zip -r -D -j build/advancedteleport-bukkit/libs/AdvancedTeleport-Bukkit-*-all.jar build/advancedteleport-bukkit/resources/slimjar/*.json
run: ./gradlew shadowJar

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
Expand Down
8 changes: 3 additions & 5 deletions AdvancedTeleport-Bukkit/build.gradle.kts
Expand Up @@ -183,14 +183,12 @@ tasks {
}

this.slimJar {
dependsOn(shadowJar)
dependsOn(jar)
dependsOn(inspectClassesForKotlinIC)
}
}

tasks.shadowJar {
from(tasks.slimJar.get().outputDirectory)
shadowJar {
dependsOn(slimJar)
}
}

// Lead development use only.
Expand Down
3 changes: 1 addition & 2 deletions README.md
Expand Up @@ -24,7 +24,6 @@ Advanced Teleport is a rapidly growing plugin that is not only increasing sharpl
## Installation/Cloning
As of currently, Advanced Teleport uses Gradle to manage its dependencies.

The Gradle command used to build the plugin is `gradle slimJar` and is done under the AdvancedTeleport-Bukkit module.
The Gradle command used to build the plugin is `gradle shadowJar` and is done under the AdvancedTeleport-Bukkit module.

> NOTE: Due to a bug with SlimJar you should try building twice when updating dependencies or building for the first time, or necessary files will not be installed.

2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Expand Up @@ -19,7 +19,7 @@ squaremap = "1.1.3"
dynmap = "3.4"
playerParticles = "8.3"
hangar = "0.0.5"
slimjar = "1.5.4"
slimjar = "1.6.1"

[libraries]
paperlib = { module = "io.papermc:paperlib", version.ref = "paperlib" }
Expand Down

0 comments on commit 084318e

Please sign in to comment.