Skip to content

Commit

Permalink
build: update gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Apehum committed Nov 22, 2023
1 parent 91e316c commit b5e6f58
Show file tree
Hide file tree
Showing 7 changed files with 187 additions and 127 deletions.
9 changes: 5 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ subprojects {
apply(plugin = "kotlin-lombok")

if (properties.containsKey("snapshot")) {
version = "$version-SNAPSHOT"

if (!project.parent?.name.equals("api")) {
val gitCommitHash: String = ByteArrayOutputStream().use { outputStream ->
rootProject.exec {
Expand All @@ -42,7 +40,9 @@ subprojects {
}
outputStream.toString().trim()
}.substring(0, 7) // windows moment?
version = "$version.$gitCommitHash"
version = "$version+$gitCommitHash-SNAPSHOT"
} else {
version = "$version-SNAPSHOT"
}
}

Expand All @@ -56,7 +56,8 @@ subprojects {
compileOnly(rootProject.libs.gson)
compileOnly(rootProject.libs.guice)

api(rootProject.libs.slf4j)
compileOnly(rootProject.libs.slf4j)

api(rootProject.libs.annotations)
api(rootProject.libs.lombok)

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ group=su.plo.voice
version=2.1.0

# Gradle args
org.gradle.jvmargs=-Xmx2G
org.gradle.jvmargs=-Xmx4G -Dkotlin.daemon.jvm.options=-Xmx512M
org.gradle.workers.max=2
kotlin.stdlib.default.dependency=false
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ bungeecord = "1.19-R0.1-SNAPSHOT"
velocity = "3.1.1"
paper = "1.19.4-R0.1-SNAPSHOT"

opus-jni = "1.0.0"
opus-jni = "1.0.1"
opus-concentus = "acaadf2075"
rnnoise-jni = "1.0.0"
rnnoise-jni = "1.0.1"

shadow = "7.1.0"
idea-ext = "1.1.7"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b5e6f58

Please sign in to comment.