Skip to content

Commit 4248ad0

Browse files
committed
fix: Remove deprecated APIs usage
1 parent 462b581 commit 4248ad0

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

build.gradle.kts

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`kotlin-dsl`
33
`maven-publish`
44
groovy
5-
kotlin("plugin.serialization") version "1.5.21"
5+
kotlin("plugin.serialization") version "1.4.31"
66
id("com.gradle.plugin-publish") version "0.15.0"
77
id("com.github.ben-manes.versions") version "0.39.0"
88
}
@@ -21,14 +21,20 @@ tasks.test.configure {
2121
useJUnitPlatform()
2222
}
2323

24+
tasks.compileKotlin.configure {
25+
kotlinOptions {
26+
allWarningsAsErrors = true
27+
}
28+
}
29+
2430
repositories {
2531
mavenCentral()
2632
}
2733

2834
dependencies {
2935
implementation("de.undercouch:gradle-download-task:4.1.2")
30-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
31-
implementation("com.charleskorn.kaml:kaml:0.35.0")
36+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
37+
implementation("com.charleskorn.kaml:kaml:0.31.0")
3238
testImplementation("junit:junit:4.13")
3339
testImplementation(platform("org.spockframework:spock-bom:2.0-groovy-3.0"))
3440
testImplementation("org.spockframework:spock-core")

src/main/kotlin/BukkitExtension.kt

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package ru.endlesscode.bukkitgradle
22

3-
import groovy.lang.Closure
3+
import org.gradle.api.Action
44
import org.gradle.api.Project
55
import org.gradle.kotlin.dsl.getByType
6-
import org.gradle.util.ConfigureUtil
76
import org.slf4j.LoggerFactory
87
import ru.endlesscode.bukkitgradle.extensions.warnSyntaxChanged
98
import ru.endlesscode.bukkitgradle.meta.extension.PluginMetaImpl
@@ -31,25 +30,17 @@ public open class BukkitExtension(
3130
}
3231

3332
@Deprecated("Use 'server { ... }' instead", ReplaceWith("server(body)"))
34-
public fun run(body: Closure<out ServerConfigurationImpl>) {
33+
public fun run(body: Action<ServerConfigurationImpl>) {
3534
logger.warnSyntaxChanged("bukkit.run { ... }", "bukkit.server { ... }")
36-
ConfigureUtil.configure(body, server)
35+
server(body)
3736
}
3837

39-
public fun server(body: Closure<out ServerConfigurationImpl>) {
40-
ConfigureUtil.configure(body, server)
38+
public fun server(body: Action<ServerConfigurationImpl>) {
39+
body.execute(server)
4140
}
4241

43-
public fun server(body: ServerConfigurationImpl.() -> Unit) {
44-
server.run(body)
45-
}
46-
47-
public fun meta(body: Closure<out PluginMetaImpl>) {
48-
ConfigureUtil.configure(body, meta)
49-
}
50-
51-
public fun meta(body: PluginMetaImpl.() -> Unit) {
52-
meta.run(body)
42+
public fun meta(body: Action<PluginMetaImpl>) {
43+
body.execute(meta)
5344
}
5445

5546
@Deprecated("Use apiVersion instead of version.", ReplaceWith("apiVersion = version"))

src/main/kotlin/BukkitGradlePlugin.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ru.endlesscode.bukkitgradle
33
import org.gradle.api.JavaVersion
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
6-
import org.gradle.api.plugins.JavaPluginConvention
6+
import org.gradle.api.plugins.JavaPluginExtension
77
import org.gradle.api.tasks.compile.JavaCompile
88
import org.gradle.kotlin.dsl.*
99
import ru.endlesscode.bukkitgradle.dependencies.Dependencies
@@ -36,7 +36,7 @@ public class BukkitGradlePlugin : Plugin<Project> {
3636
apply<DevServerPlugin>()
3737
}
3838

39-
with(convention.getPlugin<JavaPluginConvention>()) {
39+
extensions.configure<JavaPluginExtension> {
4040
sourceCompatibility = JavaVersion.VERSION_1_8
4141
targetCompatibility = JavaVersion.VERSION_1_8
4242
}

src/main/kotlin/meta/PluginMetaPlugin.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import org.gradle.api.Plugin
77
import org.gradle.api.Project
88
import org.gradle.api.file.CopySpec
99
import org.gradle.api.file.DuplicatesStrategy
10-
import org.gradle.api.plugins.JavaPluginConvention
10+
import org.gradle.api.plugins.JavaPluginExtension
1111
import org.gradle.kotlin.dsl.get
12-
import org.gradle.kotlin.dsl.getPlugin
12+
import org.gradle.kotlin.dsl.getByType
1313
import org.gradle.kotlin.dsl.named
1414
import org.gradle.kotlin.dsl.register
1515
import ru.endlesscode.bukkitgradle.bukkit
@@ -54,8 +54,8 @@ public class PluginMetaPlugin : Plugin<Project> {
5454

5555
/** Finds and returns project metaFile if it exists. */
5656
private fun Project.findMetaFile(): File? {
57-
val javaPlugin = convention.getPlugin<JavaPluginConvention>()
58-
val mainSourceSet = javaPlugin.sourceSets["main"]
57+
val java = extensions.getByType<JavaPluginExtension>()
58+
val mainSourceSet = java.sourceSets["main"]
5959
val resourceDir = mainSourceSet.resources.srcDirs.first()
6060

6161
return File(resourceDir, FILE_NAME).takeIf { it.isFile }

0 commit comments

Comments
 (0)