From a300abae412a289722f5ffeb857aa74b835faaa4 Mon Sep 17 00:00:00 2001 From: N0tMyFaultOG Date: Thu, 21 Jan 2021 13:21:54 +0100 Subject: [PATCH] Properly define WorldGuard version --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/CommonConfig.kt | 3 +-- settings.gradle.kts | 2 +- worldedit-bukkit/build.gradle.kts | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index dcdddf2dd..cfd11d66a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -26,7 +26,7 @@ repositories { name = "EngineHub Repository" url = uri("https://maven.enginehub.org/repo/") content { - includeGroup("com.sk89q") + includeGroupByRegex("com.sk89q.*") } } } diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 422b075d6..eac58d136 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -20,9 +20,8 @@ fun Project.applyCommonConfiguration() { name = "EngineHub Repository" url = uri("https://maven.enginehub.org/repo/") content { - includeGroup("com.sk89q") - includeGroup("com.sk89q.lib") includeGroupByRegex("org.enginehub.*") + includeGroupByRegex("com.sk89q.*") } } maven { diff --git a/settings.gradle.kts b/settings.gradle.kts index cf43a5552..5ec69b404 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { name = "EngineHub Repository" url = uri("https://maven.enginehub.org/repo/") content { - includeGroup("com.sk89q") + includeGroupByRegex("com.sk89q.*") } } } diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 267570e2c..bf99fee79 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -28,7 +28,7 @@ repositories { name = "EngineHub Repository" url = uri("https://maven.enginehub.org/repo/") content { - includeGroup("com.sk89q") + includeGroupByRegex("com.sk89q.*") } } maven { @@ -101,7 +101,7 @@ dependencies { } implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") testImplementation("org.mockito:mockito-core:1.9.0-rc1") - compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.+") { + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.4") { exclude("com.sk89q.worldedit", "worldedit-bukkit") exclude("com.sk89q.worldedit", "worldedit-core") exclude("com.sk89q.worldedit.worldedit-libs", "bukkit")