Skip to content

Commit 25df50c

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 69de13a commit 25df50c

6 files changed

Lines changed: 39 additions & 15 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-i18n.git"
28+
"repositoryUrl": "https://github.com/ParsekDev/parsek-plugin-i18n.git"
2929
}

build.gradle.kts

Lines changed: 31 additions & 4 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
}
@@ -26,8 +28,8 @@ dependencies {
2628
compileOnly(project(mapOf("path" to ":Parsek")))
2729
compileOnly(project(mapOf("path" to ":plugins:parsek-plugin-auth")))
2830
} else {
29-
compileOnly("com.github.StatuParsek:Parsek:main-SNAPSHOT")
30-
compileOnly("com.github.StatuParsek:parsek-plugin-auth:2.0.0")
31+
compileOnly("com.github.parsekdev:parsek:v1.0.0-beta.7")
32+
compileOnly("com.github.parsekdev:parsek-plugin-auth:v1.0.0-dev.1")
3133
}
3234

3335
compileOnly(kotlin("stdlib-jdk8"))
@@ -115,4 +117,29 @@ publishing {
115117
}
116118
}
117119
}
120+
}
121+
122+
java {
123+
withJavadocJar()
124+
withSourcesJar()
125+
126+
// Use Java 21 for compilation
127+
toolchain {
128+
languageVersion.set(JavaLanguageVersion.of(21))
129+
}
130+
}
131+
132+
kotlin {
133+
jvmToolchain(21) // Ensure Kotlin uses the Java 21 toolchain
134+
}
135+
136+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
137+
compilerOptions {
138+
jvmTarget.set(JvmTarget.JVM_1_8)
139+
}
140+
}
141+
142+
tasks.withType<JavaCompile> {
143+
sourceCompatibility = "1.8"
144+
targetCompatibility = "1.8"
118145
}

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/i18n/config/migration/ConfigMigration1to2.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package co.statu.rule.plugins.i18n.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

7+
@Migration
68
class ConfigMigration1to2(
7-
override val FROM_VERSION: Int = 1,
8-
override val VERSION: Int = 2,
9-
override val VERSION_INFO: String = "Add hookAuthPlugin config"
10-
) : PluginConfigMigration() {
9+
) : PluginConfigMigration(1, 2, "Add hookAuthPlugin config") {
1110
override fun migrate(config: JsonObject) {
1211
config.put("hookAuthPlugin", true)
1312
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import co.statu.rule.auth.AuthFieldManager
1010
import co.statu.rule.plugins.i18n.I18nConfig
1111
import co.statu.rule.plugins.i18n.I18nPlugin
1212
import co.statu.rule.plugins.i18n.I18nSystem
13-
import co.statu.rule.plugins.i18n.config.migration.ConfigMigration1to2
1413
import io.vertx.core.Vertx
1514
import org.slf4j.Logger
1615

@@ -20,11 +19,8 @@ class CoreEventHandler(private val i18nPlugin: I18nPlugin, private val vertx: Ve
2019

2120
override suspend fun onConfigManagerReady(configManager: ConfigManager) {
2221
val pluginConfigManager = PluginConfigManager(
23-
configManager,
2422
i18nPlugin,
25-
I18nConfig::class.java,
26-
listOf(ConfigMigration1to2()),
27-
listOf("i18n")
23+
I18nConfig::class.java
2824
)
2925

3026
i18nPlugin.pluginBeanContext.beanFactory.registerSingleton(

0 commit comments

Comments
 (0)