Skip to content

Commit ee580ef

Browse files
committed
fix: support new parsek core changes about plugin config manager
BREAKING CHANGE: This version requires Parsek v1.0.0-beta.7+.
1 parent bc7ddc6 commit ee580ef

7 files changed

Lines changed: 40 additions & 19 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- uses: actions/setup-java@v3
6161
with:
6262
distribution: temurin
63-
java-version: 8
63+
java-version: 21
6464

6565
- name: Build with Gradle
6666
uses: gradle/actions/setup-gradle@v3

.releaserc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
}
2626
]
2727
],
28-
"repositoryUrl": "https://github.com/StatuParsek/parsek-plugin-balance.git"
28+
"repositoryUrl": "https://github.com/ParsekDev/parsek-plugin-balance.git"
2929
}

build.gradle.kts

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
2-
kotlin("jvm") version "1.9.20"
3-
kotlin("kapt") version "1.9.20"
4+
kotlin("jvm") version "2.0.21"
5+
kotlin("kapt") version "2.0.21"
46
id("com.github.johnrengelman.shadow") version "8.1.1"
57
`maven-publish`
68
}
@@ -30,10 +32,10 @@ dependencies {
3032
compileOnly(project(mapOf("path" to ":plugins:parsek-plugin-auth")))
3133
compileOnly(project(mapOf("path" to ":plugins:parsek-plugin-payment")))
3234
} else {
33-
compileOnly("com.github.StatuParsek:Parsek:v2.3.0")
34-
compileOnly("com.github.StatuParsek:parsek-plugin-database:v1.2.1")
35-
compileOnly("com.github.StatuParsek:parsek-plugin-auth:v2.4.2")
36-
compileOnly("com.github.StatuParsek:parsek-plugin-payment:v1.1.1")
35+
compileOnly("com.github.parsekdev:Parsek:v1.0.0-beta.7")
36+
compileOnly("com.github.parsekdev:parsek-plugin-database:v1.0.0-dev.1")
37+
compileOnly("com.github.parsekdev:parsek-plugin-auth:v1.0.0-dev.1")
38+
compileOnly("com.github.parsekdev:parsek-plugin-payment:v1.0.0-dev.1")
3739
}
3840

3941
compileOnly(kotlin("stdlib-jdk8"))
@@ -124,4 +126,29 @@ publishing {
124126
}
125127
}
126128
}
129+
}
130+
131+
java {
132+
withJavadocJar()
133+
withSourcesJar()
134+
135+
// Use Java 21 for compilation
136+
toolchain {
137+
languageVersion.set(JavaLanguageVersion.of(21))
138+
}
139+
}
140+
141+
kotlin {
142+
jvmToolchain(21) // Ensure Kotlin uses the Java 21 toolchain
143+
}
144+
145+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
146+
compilerOptions {
147+
jvmTarget.set(JvmTarget.JVM_1_8)
148+
}
149+
}
150+
151+
tasks.withType<JavaCompile> {
152+
sourceCompatibility = "1.8"
153+
targetCompatibility = "1.8"
127154
}

jitpack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jdk:
2+
- openjdk21

src/main/kotlin/co/statu/rule/plugins/balance/config/migration/ConfigMigration1to2.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package co.statu.rule.plugins.balance.config.migration
22

3+
import co.statu.parsek.annotation.Migration
34
import co.statu.parsek.api.config.PluginConfigMigration
45
import io.vertx.core.json.JsonObject
56

6-
class ConfigMigration1to2(
7-
override val FROM_VERSION: Int = 1,
8-
override val VERSION: Int = 2,
9-
override val VERSION_INFO: String = "Add registerGiftAmount"
10-
) : PluginConfigMigration() {
7+
@Migration
8+
class ConfigMigration1to2 : PluginConfigMigration(1, 2, "Add registerGiftAmount") {
119
override fun migrate(config: JsonObject) {
1210
config.put("registerGiftAmount", 10.0)
1311
}

src/main/kotlin/co/statu/rule/plugins/balance/event/CoreEventHandler.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@ import co.statu.parsek.api.event.CoreEventListener
66
import co.statu.parsek.config.ConfigManager
77
import co.statu.rule.plugins.balance.BalanceConfig
88
import co.statu.rule.plugins.balance.BalancePlugin
9-
import co.statu.rule.plugins.balance.config.migration.ConfigMigration1to2
109
import org.slf4j.Logger
1110

1211
@EventListener
1312
class CoreEventHandler(private val balancePlugin: BalancePlugin, private val logger: Logger) : CoreEventListener {
1413
override suspend fun onConfigManagerReady(configManager: ConfigManager) {
1514
val pluginConfigManager = PluginConfigManager(
16-
configManager,
1715
balancePlugin,
1816
BalanceConfig::class.java,
19-
listOf(ConfigMigration1to2()),
20-
listOf("balance")
2117
)
2218

2319
balancePlugin.pluginBeanContext.beanFactory.registerSingleton(

src/main/kotlin/co/statu/rule/plugins/balance/event/DatabaseEventHandler.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import co.statu.rule.plugins.balance.BalancePlugin
88
@EventListener
99
class DatabaseEventHandler(private val balancePlugin: BalancePlugin) : DatabaseEventListener {
1010
override suspend fun onReady(databaseManager: DatabaseManager) {
11-
databaseManager.migrateNewPluginId("balance", balancePlugin.pluginId, balancePlugin)
12-
1311
databaseManager.initialize(balancePlugin, balancePlugin)
1412
}
1513
}

0 commit comments

Comments
 (0)