From 7e05d321a495114daba53ce02733ce3edc5f0bb8 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 2 Mar 2023 18:34:40 +0200 Subject: [PATCH] Remove org.unbroken-dome.test-sets plugin (#7951) Resolves https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7911 --- .../src/main/kotlin/otel.java-conventions.gradle.kts | 10 ---------- settings.gradle.kts | 1 - 2 files changed, 11 deletions(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index deb442f0068a..4a04f2e6c311 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -346,16 +346,6 @@ afterEvaluate { ) } } - - if (plugins.hasPlugin("org.unbroken-dome.test-sets") && configurations.findByName("latestDepTestRuntime") != null) { - doFirst { - val testArtifacts = configurations.testRuntimeClasspath.get().resolvedConfiguration.resolvedArtifacts - val latestTestArtifacts = configurations.getByName("latestDepTestRuntimeClasspath").resolvedConfiguration.resolvedArtifacts - if (testArtifacts == latestTestArtifacts) { - throw IllegalStateException("latestDepTest dependencies are identical to test") - } - } - } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 760a0d8ffc0e..dc07dd3fc59d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,6 @@ pluginManagement { id("com.gradle.plugin-publish") version "1.1.0" id("io.github.gradle-nexus.publish-plugin") version "1.2.0" id("org.jetbrains.kotlin.jvm") version "1.8.0" - id("org.unbroken-dome.test-sets") version "4.0.0" id("org.xbib.gradle.plugin.jflex") version "1.7.0" id("org.unbroken-dome.xjc") version "2.0.0" }