From 678375f2e137d41a0c4f3ce4e4a8b6f459a669c0 Mon Sep 17 00:00:00 2001
From: "niccolo.piazzesi" <niccolo.piazzesi@guardsquare.com>
Date: Wed, 14 Jan 2026 00:22:16 +0100
Subject: [PATCH] Remove the plugin instead

---
 base/build.gradle |  1 -
 build.gradle      | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/base/build.gradle b/base/build.gradle
index d98c14c6..769be5bd 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'java-library'
-    id 'java-test-fixtures'
     id 'maven-publish'
     id "org.jetbrains.kotlin.jvm"
     id 'com.adarshr.test-logger' version '4.0.0'
diff --git a/build.gradle b/build.gradle
index 5f43574c..af6d04dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,19 +115,8 @@ allprojects { Project project ->
                 }
                 publishing {
                     publications {
-                        named(project.name) {
-                            def javaComponent = components.java as AdhocComponentWithVariants
-                            // java-test-fixtures creates issues ans self-references in pom files.
-                            // See https://github.com/gradle/gradle/issues/14936.
-                            from(javaComponent)
-                            if (pluginManager.hasPlugin("java-test-fixtures")) {
-                                javaComponent.withVariantsFromConfiguration(configurations.testFixturesApiElements) {
-                                    skip()
-                                }
-                                javaComponent.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) {
-                                    skip()
-                                }
-                            }
+                        getByName(project.name) {
+                            from(components.java)
                         }
                     }
                 }