From dd08ecfb4a5009fd35e0004e6b32d47817657258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Segovia=20C=C3=B3rdoba?= Date: Wed, 7 Jun 2023 10:21:37 +0200 Subject: [PATCH] Add JavierSC Kotlin compiler dependencies in Kotlin Compiler feature --- CHANGELOG.md | 2 ++ gradle/hubdle.libs.versions.toml | 6 +++--- .../features/HubdleKotlinCompilerPluginFeatureExtension.kt | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 537468074f..7a01b8ab90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Added +- apply JavierSC Kotlin compiler dependencies in Kotlin Compiler feature + ### Changed ### Deprecated diff --git a/gradle/hubdle.libs.versions.toml b/gradle/hubdle.libs.versions.toml index 39a212aaf4..4b38886c2c 100644 --- a/gradle/hubdle.libs.versions.toml +++ b/gradle/hubdle.libs.versions.toml @@ -2,7 +2,7 @@ android = { strictly = "8.0.2" } hubdle = "0.5.0-alpha.26" javiersc-gradle-gradleExtensions = "1.0.0-alpha.32" -javiersc-kotlin-kotlinCompiler = "0.1.1-alpha.1" +javiersc-kotlin-kotlinCompilerExtensions = "0.1.1-alpha.1" javiersc-kotlin-kotlinStdlibAndTest = "0.1.0-alpha.15" javiersc-kotlinx-coroutinesRunBlocking = "0.1.0-rc.1" kotlin = { strictly = "1.8.21" } @@ -68,8 +68,8 @@ insert-koin-testJunit4 = { module = "io.insert-koin:koin-test-junit4", version = insert-koin-testJunit5 = { module = "io.insert-koin:koin-test-junit5", version = "3.4.1" } javiersc-gradle-gradleExtensions = { module = "com.javiersc.gradle:gradle-extensions", version.ref = "javiersc-gradle-gradleExtensions" } javiersc-gradle-gradleTestExtensions = { module = "com.javiersc.gradle:gradle-test-extensions", version.ref = "javiersc-gradle-gradleExtensions" } -javiersc-kotlin-kotlinCompilerExtensions = { module = "com.javiersc.kotlin:kotlin-compiler-extensions", version.ref = "javiersc-kotlin-kotlinCompiler" } -javiersc-kotlin-kotlinCompilerTest = { module = "com.javiersc.kotlin:kotlin-compiler-test", version.ref = "javiersc-kotlin-kotlinCompiler" } +javiersc-kotlin-kotlinCompilerExtensions = { module = "com.javiersc.kotlin:kotlin-compiler-extensions", version.ref = "javiersc-kotlin-kotlinCompilerExtensions" } +javiersc-kotlin-kotlinCompilerTestExtensions = { module = "com.javiersc.kotlin:kotlin-compiler-test-extensions", version.ref = "javiersc-kotlin-kotlinCompilerExtensions" } javiersc-kotlin-kotlinStdlib = { module = "com.javiersc.kotlin:kotlin-stdlib", version.ref = "javiersc-kotlin-kotlinStdlibAndTest" } javiersc-kotlin-kotlinTestJunit = { module = "com.javiersc.kotlin:kotlin-test-junit", version.ref = "javiersc-kotlin-kotlinStdlibAndTest" } javiersc-kotlin-kotlinTestJunit5 = { module = "com.javiersc.kotlin:kotlin-test-junit5", version.ref = "javiersc-kotlin-kotlinStdlibAndTest" } diff --git a/hubdle-gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/kotlin/jvm/features/HubdleKotlinCompilerPluginFeatureExtension.kt b/hubdle-gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/kotlin/jvm/features/HubdleKotlinCompilerPluginFeatureExtension.kt index a37f1bd909..1814a95cf8 100644 --- a/hubdle-gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/kotlin/jvm/features/HubdleKotlinCompilerPluginFeatureExtension.kt +++ b/hubdle-gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/kotlin/jvm/features/HubdleKotlinCompilerPluginFeatureExtension.kt @@ -12,6 +12,8 @@ import com.javiersc.hubdle.project.extensions.apis.BaseHubdleDelegateExtension import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension import com.javiersc.hubdle.project.extensions.apis.HubdleEnableableExtension import com.javiersc.hubdle.project.extensions.apis.enableAndExecute +import com.javiersc.hubdle.project.extensions.dependencies._internal.aliases.javiersc_kotlin_kotlinCompilerExtensions +import com.javiersc.hubdle.project.extensions.dependencies._internal.aliases.javiersc_kotlin_kotlinCompilerTestExtensions import com.javiersc.hubdle.project.extensions.dependencies._internal.aliases.jetbrains_kotlin_kotlinAnnotationsJvm import com.javiersc.hubdle.project.extensions.dependencies._internal.aliases.jetbrains_kotlin_kotlinCompiler import com.javiersc.hubdle.project.extensions.dependencies._internal.aliases.jetbrains_kotlin_kotlinCompilerInternalTestFramework @@ -133,11 +135,13 @@ constructor( sourceSets.named("main").configure { kotlinSourceSet -> kotlinSourceSet.dependencies { compileOnly(library(jetbrains_kotlin_kotlinCompiler)) + implementation(library(javiersc_kotlin_kotlinCompilerExtensions)) } } sourceSets.named("test").configure { kotlinSourceSet -> kotlinSourceSet.dependencies { + implementation(library(javiersc_kotlin_kotlinCompilerTestExtensions)) implementation(library(jetbrains_kotlin_kotlinCompiler)) implementation( library(jetbrains_kotlin_kotlinCompilerInternalTestFramework)