From 0fe6a64e2904ac025e8f2b1ce8022b95042b2a11 Mon Sep 17 00:00:00 2001
From: Travis Wyatt <travis@juul.com>
Date: Fri, 8 Mar 2024 23:14:28 -0800
Subject: [PATCH] Simplify `binary-compatibility-validator` setup

---
 build.gradle.kts          |  2 +-
 gradle/libs.versions.toml |  2 +-
 settings.gradle.kts       | 14 --------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 49da8d8..3fe52a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlinter) apply false
-    alias(libs.plugins.validator)
+    alias(libs.plugins.api)
     alias(libs.plugins.dokka)
     alias(libs.plugins.maven.publish) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ac00198..f4c08fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,8 +17,8 @@ tuulbox-logging = { module = "com.juul.tuulbox:logging", version = "7.2.0" }
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinter = { id = "org.jmailen.kotlinter", version = "4.2.0" }
 maven-publish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }
-validator = { id = "binary-compatibility-validator", version = "0.14.0" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2823212..249bc2c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,20 +4,6 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
     }
-
-    resolutionStrategy {
-        eachPlugin {
-            when (requested.id.id) {
-                "binary-compatibility-validator" ->
-                    useModule("org.jetbrains.kotlinx:binary-compatibility-validator:${requested.version}")
-
-                else -> when (requested.id.namespace) {
-                    "com.android" ->
-                        useModule("com.android.tools.build:gradle:${requested.version}")
-                }
-            }
-        }
-    }
 }
 
 include(