Skip to content

Commit 54c6779

Browse files
committed
1.6.0: Update to Gradle 8.11 and Kotlin 2.0.20.
1 parent cc7f303 commit 54c6779

File tree

11 files changed

+24
-15
lines changed

11 files changed

+24
-15
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
This repository contains Gradle plugins intended for use with Kord Extensions.
44

5+
**All plugins require Gradle 8.11 or later.**
6+
57
# Contents
68

79
- `docker/` - Docker Gradle plugin for Dockerfile generation.

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
}
1111

1212
dependencies {
13-
implementation(kotlin("gradle-plugin", version = "1.9.23"))
14-
implementation(kotlin("serialization", version = "1.9.23"))
13+
implementation(kotlin("gradle-plugin", version = "2.0.20"))
14+
implementation(kotlin("serialization", version = "2.0.20"))
1515

1616
implementation("dev.yumi", "yumi-gradle-licenser", "1.2.0")
1717
implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.6")

changes/1.6.0.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Gradle Plugins 1.6.0
2+
3+
This version updates all Gradle plugins to Gradle 8.11 and Kotlin 2.0.20.
4+
5+
We no longer support older versions of Gradle.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kotlin.incremental=true
33
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m
44
org.gradle.parallel=true
55

6-
projectVersion=1.5.8
6+
projectVersion=1.6.0

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

kordex/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
`kotlin-dsl`
33
plugin
4+
45
val env = System.getenv()
56

67
if (env.contains("GITHUB_ACTIONS") && !env.contains("NO_SIGNING")) {

kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/KordExPlugin.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ import javax.inject.Inject
3737

3838
@Suppress("UnstableApiUsage")
3939
class KordExPlugin @Inject constructor(
40-
problems: Problems,
40+
val problems: Problems,
4141
val dependencies: DependencyFactory,
4242
val providers: ProviderFactory,
4343
) : Plugin<Project> {
44-
val problemReporter = problems.forNamespace("dev.kordex")
45-
4644
@Suppress("UnnecessaryParentheses")
4745
override fun apply(target: Project) {
4846
val extension = target.extensions.create<KordExExtension>("kordEx").apply {
@@ -55,7 +53,7 @@ class KordExPlugin @Inject constructor(
5553

5654
KspPluginHelper.apply(target)
5755

58-
target.checkTask(extension, versionsProvider, problemReporter)
56+
target.checkTask(extension, versionsProvider, problems.reporter)
5957

6058
target.configurations.all {
6159
dependencies.addAllLater(
@@ -120,15 +118,15 @@ class KordExPlugin @Inject constructor(
120118
val versions = versionsProvider.get()
121119

122120
if (extension.hasBot && extension.hasPlugin) {
123-
problemReporter.throwing {
121+
problems.reporter.throwing {
124122
withException(
125123
RuntimeException(
126124
"Project is both bot and plugin - if you need both in the same project, split them into " +
127125
"separate Gradle subprojects"
128126
)
129127
)
130128

131-
id("both-bot-and-plugin", "Project is both bot and plugin")
129+
id("dev.kordex.gradle.plugins.kordex.both-bot-and-plugin", "Project is both bot and plugin")
132130
details("Project ${target.name} cannot be both a bot and a plugin")
133131
solution("If you need both in the same project, split them into separate Gradle subprojects")
134132
severity(Severity.ERROR)

kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/functions/_CheckTask.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fun Project.checkTask(
8787
)
8888

8989
problemReporter.reporting {
90-
id("kotlin-version", "Incompatible Kotlin plugin found")
90+
id("dev.kordex.gradle.plugins.kordex.kotlin-version", "Incompatible Kotlin plugin found")
9191

9292
details(
9393
"Incompatible Kotlin plugin found - Kord Extensions version " +
@@ -106,7 +106,10 @@ fun Project.checkTask(
106106
)
107107
)
108108

109-
id("kotlin-version", "Incompatible Kotlin plugin version found")
109+
id(
110+
"dev.kordex.gradle.plugins.kordex.kotlin-version",
111+
"Incompatible Kotlin plugin version found"
112+
)
110113

111114
details(
112115
"Incompatible Kotlin plugin found - Kord Extensions version " +

testModule/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)