From 5fb198144dc18f707ae704ad5bf9fb57d3d1032c Mon Sep 17 00:00:00 2001
From: Travis Wyatt <travis@juul.com>
Date: Mon, 11 Mar 2024 15:02:15 -0700
Subject: [PATCH] Simplify `binary-compatibility-validator` setup (#336)

---
 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 6ae3f873..a9ff4b1d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
     alias(libs.plugins.kotlinter) apply false
     alias(libs.plugins.dokka)
     alias(libs.plugins.maven.publish) apply false
-    alias(libs.plugins.validator)
+    alias(libs.plugins.api)
 }
 
 apiValidation {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ad873f65..25ba9631 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,9 +25,9 @@ robolectric = { module = "org.robolectric:robolectric", version = "4.11.1" }
 [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" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", 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 81eba3cb..b98f1e8d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,20 +6,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(