Start using the project accessors plugin (#147)

ansman · Mar 29, 2024 · 34c2637 · 34c2637
1 parent 0b3d255
commit 34c2637
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -2,10 +2,12 @@ plugins {
     kotlin("jvm") version embeddedKotlinVersion
     `kotlin-dsl`
     `version-catalog`
+    alias(libs.plugins.projectAccessors)
 }
 
 dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+    implementation(libs.projectAccessors)
     api(libs.shadow)
     api(libs.android.gradlePlugin)
     api(libs.dokka.gradlePlugin)

diff --git a/gradle-plugin/src/main/kotlin/library.compiler.gradle.kts b/gradle-plugin/src/main/kotlin/library.compiler.gradle.kts
@@ -1,4 +1,5 @@
 
+import co.hinge.gradle.projectaccessors.copy
 import org.gradle.accessors.dm.LibrariesForLibs
 
 plugins {
@@ -16,7 +17,9 @@ tasks.withType<Test>().configureEach {
 }
 
 dependencies {
-    implementation(project(":compiler:common", configuration = "shadow"))
+    implementation(projects.compiler.common.copy(
+        targetConfiguration = "shadow"
+    ))
     implementation(libs.javapoet)
     implementation(libs.bundles.kotlinpoet)
     implementation(libs.dagger)
@@ -30,5 +33,5 @@ dependencies {
     implementation(libs.incap)
     kapt(libs.incap.compiler)
 
-    testImplementation(project(":compiler:common:test-utils"))
+    testImplementation(projects.compiler.common.testUtils)
 }
diff --git a/gradle-plugin/src/main/kotlin/library.publishing.gradle.kts b/gradle-plugin/src/main/kotlin/library.publishing.gradle.kts
@@ -205,5 +205,12 @@ afterEvaluate {
             dependsOn("classes")
             from(project.extensions.getByType<SourceSetContainer>().getByName("main").allSource)
         }
+        if (pluginManager.hasPlugin("java-test-fixture")) {
+            // Disables publishing test fixtures:
+            // https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants
+            val javaComponent = components["java"] as AdhocComponentWithVariants
+            javaComponent.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
+            javaComponent.withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }
+        }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,12 +12,14 @@ androidx-test = "1.5.0"
 kotlinpoet = "1.16.0"
 room = "2.6.1"
 retrofit = "2.11.0"
+projectAccessors = "1.1.0"
 
 [plugins]
 dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.14.0"
 mkdocs = "ru.vyarus.mkdocs:3.0.0"
+projectAccessors = { id = "co.hinge.gradle.project-accessors", version.ref = "projectAccessors" }
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -59,13 +61,13 @@ dagger-hilt-android-testing = { module = "com.google.dagger:hilt-android-testing
 dagger-hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "dagger" }
 dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
 
-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp"}
+ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 
 incap = { module = "net.ltgt.gradle.incap:incap", version.ref = "incap" }
 incap-compiler = { module = "net.ltgt.gradle.incap:incap-processor", version.ref = "incap" }
 
-compileTesting = { module ="dev.zacsweers.kctfork:core", version.ref = "compileTesting" }
-compileTesting-ksp = { module ="dev.zacsweers.kctfork:ksp", version.ref = "compileTesting" }
+compileTesting = { module = "dev.zacsweers.kctfork:core", version.ref = "compileTesting" }
+compileTesting-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "compileTesting" }
 
 junit = "junit:junit:4.13.2"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.10.2"
@@ -78,8 +80,10 @@ testLogger = "com.adarshr:gradle-test-logger-plugin:4.0.0"
 
 shadow = "com.github.johnrengelman:shadow:8.1.1"
 
-room = { module ="androidx.room:room-ktx", version.ref = "room" }
-room-compiler = { module ="androidx.room:room-compiler", version.ref = "room" }
+room = { module = "androidx.room:room-ktx", version.ref = "room" }
+room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
+
+projectAccessors = { module = "co.hinge.gradle.project-accessors:project-accessors", version.ref = "projectAccessors" }
 
 [bundles]
 compileTesting = ["compileTesting", "compileTesting-ksp"]