From f41137dcc539259f565651b9bd038fe7508dd55f Mon Sep 17 00:00:00 2001 From: Ahoo Wang Date: Fri, 3 Feb 2023 10:03:49 +0800 Subject: [PATCH] Refactor: pluginManagement --- build.gradle.kts | 6 +++--- cosec-gateway-server/build.gradle.kts | 4 ++-- cosec-spring-boot-starter/build.gradle.kts | 2 +- gradle.properties | 2 +- settings.gradle.kts | 15 ++++++++------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 534a1684..99fc8c96 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin plugins { id("io.github.gradle-nexus.publish-plugin") - id("io.gitlab.arturbosch.detekt").version("1.22.0") - kotlin("jvm") version "1.8.10" - id("org.jetbrains.dokka") version "1.7.20" + id("io.gitlab.arturbosch.detekt") + kotlin("jvm") + id("org.jetbrains.dokka") id("me.champeau.jmh") jacoco } diff --git a/cosec-gateway-server/build.gradle.kts b/cosec-gateway-server/build.gradle.kts index c7293237..9b0f3fa6 100644 --- a/cosec-gateway-server/build.gradle.kts +++ b/cosec-gateway-server/build.gradle.kts @@ -13,8 +13,8 @@ plugins { application - kotlin("jvm") version "1.8.10" - kotlin("plugin.spring") version "1.8.10" + kotlin("jvm") + kotlin("plugin.spring") kotlin("kapt") } diff --git a/cosec-spring-boot-starter/build.gradle.kts b/cosec-spring-boot-starter/build.gradle.kts index 8a4ee975..0d78cbaa 100644 --- a/cosec-spring-boot-starter/build.gradle.kts +++ b/cosec-spring-boot-starter/build.gradle.kts @@ -11,7 +11,7 @@ * limitations under the License. */ plugins { - kotlin("plugin.spring") version "1.8.10" + kotlin("plugin.spring") kotlin("kapt") } java { diff --git a/gradle.properties b/gradle.properties index a8c609ed..4c0e31a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ # limitations under the License. # group=me.ahoo.cosec -version=1.10.5 +version=1.10.6 description=RBAC-based And Policy-based Multi-Tenant Reactive Security Framework website=https://github.com/Ahoo-Wang/CoSec issues=https://github.com/Ahoo-Wang/CoSec/issues diff --git a/settings.gradle.kts b/settings.gradle.kts index ce080319..4aabc5e5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,12 +28,13 @@ include(":cosec-gateway-server") include(":cosec-opentelemetry") include(":cosec-ip2region") -buildscript { - repositories { - gradlePluginPortal() - } - dependencies { - classpath("me.champeau.jmh:jmh-gradle-plugin:0.6.8") - classpath("io.github.gradle-nexus:publish-plugin:1.1.0") +pluginManagement { + plugins { + id("io.gitlab.arturbosch.detekt") version "1.22.0" apply false + kotlin("jvm") version "1.8.10" apply false + kotlin("plugin.spring") version "1.8.10" apply false + id("org.jetbrains.dokka") version "1.7.20" apply false + id("me.champeau.jmh") version "0.6.8" apply false + id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false } }