Skip to content

Commit

Permalink
Update build.gradle files to reference versioned jars
Browse files Browse the repository at this point in the history
  • Loading branch information
132ikl committed Nov 16, 2020
1 parent b488115 commit ac7163c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
8 changes: 4 additions & 4 deletions client/bukkit-1.7.10/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ configurations {

dependencies {
compileOnly files('./bukkit-1.4.7.jar')
embed files('../../core/message-library/build/libs/message-library.jar')
embed files('../../core/network-library/build/libs/network-library.jar')
embed files("../../core/common/build/libs/common.jar")
embed files('../client-base/build/libs/client-base.jar')
embed files("../../core/message-library/build/libs/message-library-${version}.jar")
embed files("../../core/network-library/build/libs/network-library-${version}.jar")
embed files("../../core/common/build/libs/common-${version}.jar")
embed files("../client-base/build/libs/client-base-${version}.jar")
embed "com.google.protobuf:protobuf-java:3.13.+"
embed "org.yaml:snakeyaml:1.+"
}
Expand Down
6 changes: 3 additions & 3 deletions client/client-base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ repositories {
}

dependencies {
compile files('../../core/message-library/build/libs/message-library.jar')
compile files('../../core/network-library/build/libs/network-library.jar')
compile files("../../core/common/build/libs/common.jar")
compile files("../../core/message-library/build/libs/message-library-${version}.jar")
compile files("../../core/network-library/build/libs/network-library-${version}.jar")
compile files("../../core/common/build/libs/common-${version}.jar")
compile "com.google.protobuf:protobuf-java:3.13.0"
compile "org.yaml:snakeyaml:1.+"
}
8 changes: 4 additions & 4 deletions client/forge-1.12.2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ dependencies {
minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2854'

// embed these into the jar
embed files('../../core/message-library/build/libs/message-library.jar')
embed files('../../core/network-library/build/libs/network-library.jar')
embed files("../../core/common/build/libs/common.jar")
embed files('../client-base/build/libs/client-base.jar')
embed files("../../core/message-library/build/libs/message-library-${version}.jar")
embed files("../../core/network-library/build/libs/network-library-${version}.jar")
embed files("../../core/common/build/libs/common-${version}.jar")
embed files("../client-base/build/libs/client-base-${version}.jar")
embed "com.google.protobuf:protobuf-java:3.13.0"
embed "org.yaml:snakeyaml:1.+"
}
Expand Down
10 changes: 5 additions & 5 deletions client/forge-1.16/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ dependencies {
// RUN THE jar COMMAND BEFORE FIRST BUILD AFTER UPGRADE
// OTHERWISE YOU WILL GET A BUNCH OF SCARY ERRORS
minecraft 'net.minecraftforge:forge:1.16.4-35.0.18'
compile files("../../core/message-library/build/libs/message-library.jar")
compile files("../../core/network-library/build/libs/network-library.jar")
compile files("../../core/common/build/libs/common.jar")
compile files("../client-base/build/libs/client-base.jar")
compile files("../../core/message-library/build/libs/message-library-${version}.jar")
compile files("../../core/network-library/build/libs/network-library-${version}.jar")
compile files("../../core/common/build/libs/common-${version}.jar")
compile files("../client-base/build/libs/client-base-${version}.jar")
compile "com.google.protobuf:protobuf-java:3.13.0"
compile "org.yaml:snakeyaml:1.+"
}
Expand Down Expand Up @@ -72,4 +72,4 @@ artifacts {
archives shadowJar
}

shadowJar.finalizedBy("reobfJar")
shadowJar.finalizedBy("reobfJar")
1 change: 1 addition & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
allprojects {
version = "2.0.0"
repositories {
jcenter()
mavenCentral()
Expand Down
6 changes: 3 additions & 3 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ dependencies {
embed 'net.dv8tion:JDA:4.2.0_188'
embed 'ch.qos.logback:logback-classic:1.2.3'
embed 'com.google.protobuf:protobuf-java:3.0.0'
embed files('../core/message-library/build/libs/message-library.jar')
embed files('../core/network-library/build/libs/network-library.jar')
embed files('../core/common/build/libs/common.jar')
embed files("../core/message-library/build/libs/message-library-${version}.jar")
embed files("../core/network-library/build/libs/network-library-${version}.jar")
embed files("../core/common/build/libs/common-${version}.jar")
}

jar {
Expand Down

0 comments on commit ac7163c

Please sign in to comment.