From f5ecb22b0669845f4ce8f35328c0d731d072b481 Mon Sep 17 00:00:00 2001 From: Adrian Date: Sun, 5 Feb 2023 18:23:19 -0500 Subject: [PATCH] build: Implement type safe project accessors --- build.gradle.kts | 4 ++-- common/build.gradle.kts | 2 +- paper/build.gradle.kts | 4 ++-- settings.gradle.kts | 3 +++ velocity/build.gradle.kts | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 14eea6e..753938f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,8 +25,8 @@ allprojects { dependencies { shadow(project(":authmevelocity-common", "shadow")) - shadow(project(":authmevelocity-api-paper")) - shadow(project(":authmevelocity-api-velocity")) + shadow(projects.authmevelocityApiPaper) + shadow(projects.authmevelocityApiVelocity) shadow(project(":authmevelocity-velocity", "shadow")) shadow(project(":authmevelocity-paper", "shadow")) } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index f20219b..5ac12b8 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,6 +1,6 @@ plugins { alias(libs.plugins.blossom) - // Required to shadow packages + // Required to relocate packages alias(libs.plugins.shadow) } diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 654de6c..1380f6b 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -10,8 +10,8 @@ repositories { } dependencies { - compileOnly(project(":authmevelocity-common")) - compileOnly(project(":authmevelocity-api-paper")) + compileOnly(projects.authmevelocityCommon) + compileOnly(projects.authmevelocityApiPaper) compileOnly(libs.paper) compileOnly(libs.authme) compileOnly(libs.miniplaceholders) diff --git a/settings.gradle.kts b/settings.gradle.kts index 3bc03c6..3bf25ea 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,6 @@ +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") +enableFeaturePreview("VERSION_CATALOGS") + rootProject.name = "authmevelocity-parent" listOf("common", "paper", "velocity").forEach { diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 1566edd..92c95a9 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -9,8 +9,8 @@ repositories { } dependencies { - compileOnly(project(":authmevelocity-common")) - compileOnly(project(":authmevelocity-api-velocity")) + compileOnly(projects.authmevelocityCommon) + compileOnly(projects.authmevelocityApiVelocity) compileOnly(libs.velocity) compileOnly(libs.miniplaceholders) compileOnly(libs.fastlogin.velocity)