diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2391ba1f6..16bf9b016 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,9 @@ jobs: with: fetch-depth: 0 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - uses: actions/setup-java@v3 with: distribution: 'temurin' diff --git a/build.gradle b/build.gradle index d8ac4cb96..cf81bd37e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.cadixdev.licenser' version '0.6.1' apply false + alias(libs.plugins.licenser) apply false } defaultTasks 'licenseFormat', 'build' diff --git a/bukkit-legacy/build.gradle b/bukkit-legacy/build.gradle index 3e21ee1a6..2cbdccf4a 100644 --- a/bukkit-legacy/build.gradle +++ b/bukkit-legacy/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.shadow) } dependencies { diff --git a/bukkit-legacy/loader/build.gradle b/bukkit-legacy/loader/build.gradle index 65bab3fdd..92b9a4e1d 100644 --- a/bukkit-legacy/loader/build.gradle +++ b/bukkit-legacy/loader/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' + alias(libs.plugins.shadow) } repositories { diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 9569036d8..db57631ab 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.shadow) } repositories { diff --git a/bukkit/loader/build.gradle b/bukkit/loader/build.gradle index 31b83217c..c41f2a81c 100644 --- a/bukkit/loader/build.gradle +++ b/bukkit/loader/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' + alias(libs.plugins.shadow) } repositories { diff --git a/bungee/build.gradle b/bungee/build.gradle index 6ea4a7cb5..f46056304 100644 --- a/bungee/build.gradle +++ b/bungee/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.shadow) } dependencies { diff --git a/bungee/loader/build.gradle b/bungee/loader/build.gradle index 10de5e9e5..de0e40b1f 100644 --- a/bungee/loader/build.gradle +++ b/bungee/loader/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' + alias(libs.plugins.shadow) } dependencies { diff --git a/common/build.gradle b/common/build.gradle index d27b3139c..c6f318ff5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'java-library' + id("java-library") } test { diff --git a/fabric/build.gradle b/fabric/build.gradle index 461c88404..36e7c5f60 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,15 +1,14 @@ import net.fabricmc.loom.task.RemapJarTask plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'fabric-loom' version '1.2-SNAPSHOT' + alias(libs.plugins.shadow) + alias(libs.plugins.loom) } archivesBaseName = 'luckperms' repositories { maven { url 'https://maven.fabricmc.net/' } - mavenLocal() } dependencies { diff --git a/forge/build.gradle b/forge/build.gradle index 1d79b1370..b5d9f80e0 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'net.kyori.blossom' version '1.3.0' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + alias(libs.plugins.blossom) + alias(libs.plugins.shadow) + alias(libs.plugins.forgegradle) } sourceCompatibility = 1.8 diff --git a/forge/forge-api/build.gradle b/forge/forge-api/build.gradle index 71df388c5..cf210c2ea 100644 --- a/forge/forge-api/build.gradle +++ b/forge/forge-api/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + alias(libs.plugins.forgegradle) } sourceCompatibility = 1.8 diff --git a/forge/loader/build.gradle b/forge/loader/build.gradle index 85242c1bb..1b6f0040d 100644 --- a/forge/loader/build.gradle +++ b/forge/loader/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'java-library' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + alias(libs.plugins.shadow) + alias(libs.plugins.forgegradle) + id("java-library") } sourceCompatibility = 1.8 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..097413772 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,13 @@ +[versions] +shadow = "8.1.1" +blossom = "1.3.1" +forgegradle = "[6.0,6.2)" +loom = "1.2-SNAPSHOT" +licenser = "0.6.1" + +[plugins] +blossom = { id = "net.kyori.blossom", version.ref = "blossom" } +shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } +forgegradle = { id = "net.minecraftforge.gradle", version.ref = "forgegradle" } +loom = { id = "fabric-loom", version.ref = "loom" } +licenser = { id = "org.cadixdev.licenser", version.ref = "licenser" } \ No newline at end of file diff --git a/nukkit/build.gradle b/nukkit/build.gradle index 92c0233aa..a30745eb1 100644 --- a/nukkit/build.gradle +++ b/nukkit/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.shadow) } repositories { diff --git a/nukkit/loader/build.gradle b/nukkit/loader/build.gradle index 15d5c873b..8d0211ebd 100644 --- a/nukkit/loader/build.gradle +++ b/nukkit/loader/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' + alias(libs.plugins.shadow) } repositories { diff --git a/settings.gradle b/settings.gradle index 2f64daeb3..91cdf3aa2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ pluginManagement { repositories { maven { name = 'Fabric' - url 'https://maven.fabricmc.net/' + url = 'https://maven.fabricmc.net/' } maven { name = 'Forge' @@ -12,6 +12,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.5.0") +} + rootProject.name = 'luckperms' include ( 'api', diff --git a/sponge/build.gradle b/sponge/build.gradle index f618eaff3..37490efbc 100644 --- a/sponge/build.gradle +++ b/sponge/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.shadow) } repositories { diff --git a/sponge/loader/build.gradle b/sponge/loader/build.gradle index b7a89d919..14499ff80 100644 --- a/sponge/loader/build.gradle +++ b/sponge/loader/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' + alias(libs.plugins.shadow) } repositories { diff --git a/standalone/app/build.gradle b/standalone/app/build.gradle index cd9dd95f9..aa2ab7bb8 100644 --- a/standalone/app/build.gradle +++ b/standalone/app/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'net.kyori.blossom' version '1.3.0' - id 'java-library' + alias(libs.plugins.blossom) + id("java-library") } sourceCompatibility = 17 @@ -36,7 +36,7 @@ dependencies { exclude(module: 'adventure-bom') exclude(module: 'adventure-api') } - api('net.kyori:ansi:1.0.0-SNAPSHOT') + api('net.kyori:ansi:1.0.1') } blossom { diff --git a/standalone/build.gradle b/standalone/build.gradle index 4db3fbfa6..6713ddb9f 100644 --- a/standalone/build.gradle +++ b/standalone/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.shadow) } sourceCompatibility = 17 diff --git a/standalone/loader/build.gradle b/standalone/loader/build.gradle index c973a84ff..729ef4c31 100644 --- a/standalone/loader/build.gradle +++ b/standalone/loader/build.gradle @@ -1,8 +1,8 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer plugins { - id 'com.github.johnrengelman.shadow' - id 'application' + alias(libs.plugins.shadow) + id("application") } dependencies { diff --git a/velocity/build.gradle b/velocity/build.gradle index e255e729f..fb35079cd 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'net.kyori.blossom' version '1.3.0' - id 'com.github.johnrengelman.shadow' version '8.1.1' + alias(libs.plugins.blossom) + alias(libs.plugins.shadow) } repositories {