From 69585ee87dcd5e5ea734138d0d338d7361235738 Mon Sep 17 00:00:00 2001
From: cmathew <chris.w.mathew@gmail.com>
Date: Wed, 24 Apr 2024 11:09:11 -0700
Subject: [PATCH] don't use version catalog for project level plugin mgmt to
 avoid confusing issues

---
 build.gradle                       | 20 +++++++++++++++-----
 buildSrc/build.gradle              |  3 ++-
 buildSrc/src/main/java/Plugins.kt  | 10 ++++++++++
 buildSrc/src/main/java/Versions.kt |  4 ++++
 gradle/libs.versions.toml          |  8 +-------
 5 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 buildSrc/src/main/java/Plugins.kt

diff --git a/build.gradle b/build.gradle
index bad3a330..8a266af7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-plugins {
-  alias(libs.plugins.kotlin.gradle).apply(false)
-  alias(libs.plugins.kotlinter.gradle).apply(false)
-  alias(libs.plugins.kotlin.allopen).apply(false)
-  alias(libs.plugins.detekt)
+buildscript {
+  repositories {
+    jcenter()
+    mavenCentral()
+    maven {url "https://plugins.gradle.org/m2/"}
+    google()
+  }
+  dependencies {
+    classpath(Plugins.kotlinGradle)
+    classpath(Plugins.kotlinterGradle)
+    classpath(Plugins.kotlinAllOpen)
+    classpath(Plugins.detekt)
+  }
 }
 
+apply plugin: 'io.gitlab.arturbosch.detekt'
+
 allprojects {
   apply from: "$rootDir/gradle/static-analysis.gradle"
   apply plugin: "kotlin-allopen"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 80aa1401..973c210d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.8.21'
+  id 'org.jetbrains.kotlin.jvm' version '1.8.22'
 }
 
 repositories {
@@ -10,6 +10,7 @@ repositories {
 
 dependencies {
   implementation 'com.android.tools.build:gradle:8.1.2'
+  implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
 }
 
 compileKotlin {
diff --git a/buildSrc/src/main/java/Plugins.kt b/buildSrc/src/main/java/Plugins.kt
new file mode 100644
index 00000000..89498479
--- /dev/null
+++ b/buildSrc/src/main/java/Plugins.kt
@@ -0,0 +1,10 @@
+import Versions.detektVersion
+import Versions.kotlinVersion
+import Versions.kotlinterVersion
+
+object Plugins {
+  const val kotlinGradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+  const val kotlinterGradle = "org.jmailen.gradle:kotlinter-gradle:$kotlinterVersion"
+  const val kotlinAllOpen = "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
+  const val detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index 0eddaac1..f37be961 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -1,4 +1,8 @@
 object Versions {
+  const val kotlinVersion = "1.8.22"
+  const val kotlinterVersion = "3.9.0"
+  const val detektVersion = "1.19.0"
+
   const val compileSdkVersion = 34
   const val minSdkVersion = 21
   const val targetSdkVersion = 30
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3e69e4b7..a7a24d86 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -101,10 +101,4 @@ lintApi = { group = "com.android.tools.lint", name = "lint-api", version.ref = "
 lintChecks = { group = "com.android.tools.lint", name = "lint-checks", version.ref = "lint" }
 lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" }
 lintTests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "lint" }
-testUtils = { group = "com.android.tools", name = "testutils", version.ref = "lint" }
-
-[plugins]
-kotlin-gradle = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlinter-gradle = { id = "org.jmailen.kotlinter", version.ref = "kotlinter" }
-kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
\ No newline at end of file
+testUtils = { group = "com.android.tools", name = "testutils", version.ref = "lint" }
\ No newline at end of file