From 272f50349419934f18e0a22eb096315c75021e80 Mon Sep 17 00:00:00 2001 From: zero88 Date: Mon, 13 May 2024 13:26:37 +0700 Subject: [PATCH] feat(gradle): enable typesafe project accessors --- core/build.gradle.kts | 3 +-- docs/asciidoc/build.gradle.kts | 4 ++-- docs/testing-asciidoc/build.gradle.kts | 8 ++++---- integtest/build.gradle.kts | 2 +- integtest/mysql/build.gradle.kts | 2 +- integtest/postgres/build.gradle.kts | 2 +- rsql/asciidoc/build.gradle.kts | 4 ++-- rsql/jooq/build.gradle.kts | 2 +- settings.gradle.kts | 1 + spi/build.gradle.kts | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b5a2dfc0..164778cd 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testImplementation(libs.sqlClientVertx) - testFixturesApi(project(":spi")) + testFixturesApi(projects.spi) testFixturesApi(libs.bundles.junit5) testFixturesApi(libs.junit5Vertx) testFixturesApi(libs.junit5Container) @@ -42,7 +42,6 @@ dependencies { testFixturesCompileOnly(libs.jetbrainsAnnotations) testFixturesCompileOnly(libs.agroalApi) testFixturesCompileOnly(libs.hikariCP) - testFixturesCompileOnly(libs.h2Jdbc) testFixturesCompileOnly(libs.jdbcVertx) testFixturesCompileOnly(libs.bundles.postgres) testFixturesCompileOnly(libs.bundles.mysql) diff --git a/docs/asciidoc/build.gradle.kts b/docs/asciidoc/build.gradle.kts index 54b9e3b1..053ea06a 100644 --- a/docs/asciidoc/build.gradle.kts +++ b/docs/asciidoc/build.gradle.kts @@ -14,8 +14,8 @@ plugins { } dependencies { - compileOnly(project(":spi")) - compileOnly(project(":integtest:postgres")) + compileOnly(projects.spi) + compileOnly(projects.integtest.postgres) compileOnly(libs.jooqMeta) compileOnly(libs.jdbcVertx) compileOnly(libs.postgresVertx) diff --git a/docs/testing-asciidoc/build.gradle.kts b/docs/testing-asciidoc/build.gradle.kts index cbbd1ebd..9d8258c1 100644 --- a/docs/testing-asciidoc/build.gradle.kts +++ b/docs/testing-asciidoc/build.gradle.kts @@ -9,10 +9,10 @@ plugins { } dependencies { - compileOnly(project(":spi")) - compileOnly(testFixtures(project(":jooqx"))) -// compileOnly(project(":rsql:jooq")) - compileOnly(project(":integtest:postgres")) + compileOnly(projects.spi) + compileOnly(testFixtures(projects.jooqx)) +// compileOnly(projects.rsql.jooq) + compileOnly(projects.integtest.postgres) compileOnly(libs.jdbcVertx) compileOnly(libs.postgresVertx) compileOnly(libs.mysqlVertx) diff --git a/integtest/build.gradle.kts b/integtest/build.gradle.kts index b469fb1c..135cc4c4 100644 --- a/integtest/build.gradle.kts +++ b/integtest/build.gradle.kts @@ -47,7 +47,7 @@ subprojects { dependencies { implementation(rootProject.libs.jooqMetaExt) // For generate model - testImplementation(testFixtures(project(":jooqx"))) + testImplementation(testFixtures(rootProject.projects.jooqx)) testImplementation(rootProject.libs.jooqMeta) testImplementation(rootProject.libs.hikariCP) testImplementation(rootProject.libs.bundles.agroal) diff --git a/integtest/mysql/build.gradle.kts b/integtest/mysql/build.gradle.kts index b5f19cc3..03aaef03 100644 --- a/integtest/mysql/build.gradle.kts +++ b/integtest/mysql/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { jooqGenerator(libs.mysqlJdbc) jooqGenerator(libs.mysqlContainer) jooqGenerator(libs.bundles.slf4jImpl) - jooqGenerator(testFixtures(project(":jooqx"))) + jooqGenerator(testFixtures(projects.jooqx)) testImplementation(libs.bundles.mysql) } diff --git a/integtest/postgres/build.gradle.kts b/integtest/postgres/build.gradle.kts index ddf60d74..ed2c4cd1 100644 --- a/integtest/postgres/build.gradle.kts +++ b/integtest/postgres/build.gradle.kts @@ -4,7 +4,7 @@ import org.jooq.meta.jaxb.ForcedType import org.jooq.meta.jaxb.Logging dependencies { - compileOnly(project(":spi")) // for customize generate + compileOnly(projects.spi) // for customize generate compileOnly(libs.postgresVertx) // for customize generate jooqGenerator(libs.jooqMetaExt) jooqGenerator(libs.bundles.slf4jImpl) diff --git a/rsql/asciidoc/build.gradle.kts b/rsql/asciidoc/build.gradle.kts index d7093332..7ed4395e 100644 --- a/rsql/asciidoc/build.gradle.kts +++ b/rsql/asciidoc/build.gradle.kts @@ -8,8 +8,8 @@ plugins { } dependencies { - compileOnly(project(":rsql:jooq")) - compileOnly(project(":integtest:postgres")) + compileOnly(projects.rsql.jooq) + compileOnly(projects.integtest.postgres) compileOnly(libs.jdbcVertx) compileOnly(libs.postgresVertx) compileOnly(libs.mysqlVertx) diff --git a/rsql/jooq/build.gradle.kts b/rsql/jooq/build.gradle.kts index 22f1b27f..70971a0a 100644 --- a/rsql/jooq/build.gradle.kts +++ b/rsql/jooq/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - api(project(":rsql:core")) + api(projects.rsql.core) api(libs.jooq) testImplementation(libs.h2Jdbc) diff --git a/settings.gradle.kts b/settings.gradle.kts index e07cba2f..83b4beb2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,6 +13,7 @@ pluginManagement { gradlePluginPortal() } } +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = "jooqx-parent" val profile: String by settings diff --git a/spi/build.gradle.kts b/spi/build.gradle.kts index db3ce5eb..d4a47f7c 100644 --- a/spi/build.gradle.kts +++ b/spi/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - api(project(":jooqx")) + api(projects.jooqx) // api(ZeroLibs.rql_jooq) compileOnly(libs.jdbcVertx) compileOnly(libs.postgresVertx) @@ -11,7 +11,7 @@ dependencies { compileOnly(libs.hsqlJdbc) compileOnly(libs.sqliteJdbc) - testImplementation(testFixtures(project(":jooqx"))) + testImplementation(testFixtures(projects.jooqx)) testImplementation(libs.jdbcVertx) testImplementation(libs.postgresVertx) testImplementation(libs.mysqlVertx)