From a0aa8d180b1538ca62ef8503670625178ff7b6a4 Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Mon, 4 Nov 2024 20:17:46 +0100 Subject: [PATCH] Revert gradle plugin package change --- buildSrc/build.gradle.kts | 2 +- gradle-plugin/build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- renovate.json | 4 ++-- runtime/build.gradle.kts | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 71493775..afd73a29 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,7 +16,7 @@ repositories { dependencies { implementation(kotlin("gradle-plugin-api", libs.versions.kotlin.get())) implementation(kotlin("gradle-plugin", libs.versions.kotlin.get())) - implementation("dev.schlaubi.mikbot", "gradle-plugin", "1.0.0") + implementation("dev.schlaubi", "gradle-plugin", "1.0.0") implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", libs.versions.ksp.get()) implementation("org.jlleitschuh.gradle", "ktlint-gradle", "12.1.1") implementation("com.github.gmazzo", "gradle-buildconfig-plugin", "3.1.0") diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index 264d3d45..d1670fbd 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -8,7 +8,7 @@ plugins { alias(libs.plugins.buildconfig) } -group = "dev.schlaubi.mikbot" +group = "dev.schlaubi" version = libs.versions.api.get() repositories { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8364a889..972ca418 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ coroutines = "1.9.0" serialization = "1.7.3" ktor = "3.0.1" kord = "feature-user-apps-20241102.180018-12" -api = "4.0.2" +api = "4.0.3" ksp = "2.0.21-1.0.26" lavakord = "8.0.1" kordex-plugin = "1.5.5" diff --git a/renovate.json b/renovate.json index 303bf1ee..3644abb9 100644 --- a/renovate.json +++ b/renovate.json @@ -5,9 +5,9 @@ "prHourlyLimit": 6, "packageRules": [ { - "matchPackageNames": ["/mikbot/"], + "matchPackageNames": ["/mikbot/", "gradle-plugin"], "matchManagers": ["gradle"], "enabled": false } - ] + ], } diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index fb42737e..4d00f0bd 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -1,4 +1,3 @@ -import com.github.jk1.license.render.JsonReportRenderer import dev.schlaubi.mikbot.gradle.configureLicenseChecker import kotlin.io.path.writeText @@ -28,7 +27,7 @@ dependencies { implementation(libs.gson) implementation(libs.asm) // pf4j doesn't declare a real dep on it implementation(libs.koin) - implementation("dev.schlaubi.mikbot:gradle-plugin") { + implementation("dev.schlaubi:gradle-plugin") { // otherwise we would add entire Gradle in here isTransitive = false }