Skip to content

Commit

Permalink
Almost there with shadowJar
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerS1066 committed Jun 16, 2024
1 parent da1944d commit 5b9ce49
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Please check the [Wiki](https://github.com/APDevTeam/Movecraft/wiki) and [FAQ](h
## Development Environment
Building Movecraft is as easy as downloading the source code and executing the following command:
```
./gradlew build
./gradlew clean build
```
Compiled jars can be found in the `modules/Movecraft/build/libs` directory.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ repositories {

group = "net.countercraft"
version = "8.0.0_beta-3"
java.sourceCompatibility = JavaVersion.VERSION_17

publishing {
publications.create<MavenPublication>("maven") {
Expand Down
10 changes: 6 additions & 4 deletions modules/Movecraft/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
plugins {
id("buildlogic.java-conventions")
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.github.goooler.shadow") version "8.1.7"
}

java.toolchain.languageVersion = JavaLanguageVersion.of(17)

repositories {
mavenCentral()
gradlePluginPortal()
Expand All @@ -26,9 +28,9 @@ tasks.shadowJar {
archiveVersion.set("")

dependencies {
include(dependency("net.countercraft:movecraft-v1_18"))
include(dependency("net.countercraft:movecraft-v1_20"))
include(dependency("net.countercraft:datapack"))
include(project(":movecraft-v1_18"))
include(project(":movecraft-v1_20"))
include(project(":movecraft-datapack"))
}

relocate("it.unimi", "net.countercraft.movecraft.libs.it.unimi")
Expand Down
2 changes: 2 additions & 0 deletions modules/api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {
id("buildlogic.java-conventions")
}

java.toolchain.languageVersion = JavaLanguageVersion.of(17)

dependencies {
api(libs.io.papermc.paper.paper.api)
api(libs.org.openjdk.jmh.jmh.core)
Expand Down
2 changes: 2 additions & 0 deletions modules/v1_18/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ plugins {
id("io.papermc.paperweight.userdev") version "1.7.1"
}

java.toolchain.languageVersion = JavaLanguageVersion.of(17)

dependencies {
api(project(":movecraft-api"))
paperweight.paperDevBundle("1.18.2-R0.1-SNAPSHOT")
Expand Down
5 changes: 1 addition & 4 deletions modules/v1_20/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ plugins {
id("io.papermc.paperweight.userdev") version "1.7.1"
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
java.toolchain.languageVersion = JavaLanguageVersion.of(21)

dependencies {
api(project(":movecraft-api"))
Expand Down

0 comments on commit 5b9ce49

Please sign in to comment.