Skip to content

Commit

Permalink
build: relocate kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
Apehum committed Apr 6, 2023
1 parent 733100c commit a576b09
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 9 deletions.
8 changes: 3 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group = "su.plo"
version = "1.0.2"
version = "1.0.3"

allprojects {
repositories {
Expand All @@ -21,7 +21,7 @@ subprojects {

dependencies {
compileOnly("su.plo.config:config:1.0.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
}

tasks {
Expand All @@ -36,8 +36,6 @@ subprojects {

tasks {
jar {
dependsOn(project(":jar").tasks.build)

from(project(":jar").sourceSets.main.get().output)
enabled = false
}
}
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- fixed an exception on paper shutdown
- relocate kotlin to support Plasmo Voice 2.0.3
25 changes: 24 additions & 1 deletion jar/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ val plasmoVoiceVersion: String by rootProject

plugins {
id("su.plo.crowdin.plugin") version("1.0.0")
id("su.plo.voice.plugin") version("1.0.0")
id("su.plo.voice.plugin") version("1.0.1")
}

dependencies {
Expand Down Expand Up @@ -39,3 +39,26 @@ plasmoCrowdin {
resourceDir = "groups/languages"
createList = true
}

tasks {
jar {
archiveClassifier.set("dev")
}

shadowJar {
configurations = listOf(project.configurations.shadow.get())

archiveBaseName.set("${rootProject.name}-${rootProject.version}")
archiveClassifier.set("")
archiveAppendix.set("")
}

build {
dependsOn(shadowJar)

doLast {
shadowJar.get().archiveFile.get().asFile
.copyTo(rootProject.buildDir.resolve("libs/${shadowJar.get().archiveFile.get().asFile.name}"), true)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import su.plo.voice.api.proxy.event.config.VoiceProxyConfigReloadedEvent
import su.plo.voice.groups.GroupsAddon
import su.plo.voice.groups.proxy.command.ProxyCommandHandler

@Addon(id = "pv-addon-groups", scope = AddonLoaderScope.PROXY, version = "1.0.2", authors = ["KPidS"])
@Addon(id = "pv-addon-groups", scope = AddonLoaderScope.PROXY, version = "1.0.3", authors = ["KPidS"])
class ProxyGroupsAddon : GroupsAddon() {

init {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import su.plo.voice.api.event.EventSubscribe
import su.plo.voice.api.server.event.config.VoiceServerConfigReloadedEvent
import su.plo.voice.groups.GroupsAddon

@Addon(id = "pv-addon-groups", scope = AddonLoaderScope.SERVER, version = "1.0.2", authors = ["KPidS"])
@Addon(id = "pv-addon-groups", scope = AddonLoaderScope.SERVER, version = "1.0.3", authors = ["KPidS"])
class ServerGroupsAddon : GroupsAddon() {

init {
Expand Down

0 comments on commit a576b09

Please sign in to comment.