Skip to content

Commit

Permalink
Remove proguard (Fix #3)
Browse files Browse the repository at this point in the history
  • Loading branch information
DRSchlaubi committed Mar 25, 2024
1 parent 09bb7b3 commit 64360ec
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 74 deletions.
4 changes: 2 additions & 2 deletions client/build.gradle.kts
Expand Up @@ -19,8 +19,8 @@ kotlin {
api(projects.protocol)
api(libs.ktor.client.core)
api(libs.ktor.client.resources)
implementation(libs.ktor.client.content.negotiation)
implementation(libs.ktor.serialization.kotlinx.json)
api(libs.ktor.client.content.negotiation)
api(libs.ktor.serialization.kotlinx.json)
}
}

Expand Down
4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
Expand Up @@ -3,6 +3,7 @@ ktor = "2.3.9"
kotlin = "1.9.22"
lavalink-api = "4.0.3"
lavalink-server = "4.0.3"
coroutines = "1.8.0"


[libraries]
Expand All @@ -13,7 +14,8 @@ ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref =
ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }

kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version = "1.8.0" }
kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.3" }

lavaplayer = { group = "dev.arbjerg", name = "lavaplayer", version = "2.1.0" }
Expand Down
26 changes: 0 additions & 26 deletions lavalink/build.gradle.kts
Expand Up @@ -38,21 +38,10 @@ val proguard by tasks.registering(ProGuardTask::class)

tasks {
jar {
archiveClassifier = "fat"
exclude("org/intellij/**", "org/jetbrains/**", "org/slf4j/**", "kotlin/**", "kotlinx/serialization/**")
exclude("**/DebugProbesKt.bin")
exclude("**/_COROUTINE")
}

proguard {
libraryjars(configurations.compileClasspath)
injars(jar)
outjars(layout.buildDirectory.file("libs/lavalink-$version.jar"))
configuration(file("rules.pro"))

jmod("base")
jmod("net.http")
}
}

publishing {
Expand All @@ -64,19 +53,4 @@ publishing {
}
}
}

publications {
named<MavenPublication>("maven") {
artifact(proguard)
}
}
}

fun ProGuardTask.jmod(name: String) =
libraryjars(
mapOf(
"jarfilter" to "!**.jar",
"filter" to "!module-info.class"
),
"${System.getProperty("java.home")}/jmods/java.$name.jmod",
)
45 changes: 0 additions & 45 deletions lavalink/rules.pro

This file was deleted.

0 comments on commit 64360ec

Please sign in to comment.