From 15b1e686111d1be30f5038f982e021f0e0563026 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 5 May 2023 12:24:59 +0530
Subject: [PATCH] Revert "feat: add `gradle-dependencies-sort` plugin"

The lexer/parser on this is very sensitive to custom APIs being used in the
`dependencies {}` DSL.

This reverts commit 069c5a4389c7f57c6a5e60ce616a140ced46257f.
---
 build-logic/build.gradle.kts                                   | 1 -
 .../kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt     | 3 ---
 gradle/libs.versions.toml                                      | 1 -
 3 files changed, 5 deletions(-)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 67d11f93..8c394c16 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -77,7 +77,6 @@ gradlePlugin {
 dependencies {
   implementation(libs.build.agp)
   implementation(libs.build.cachefix)
-  implementation(libs.build.depsort)
   implementation(libs.build.kotlin.gradle)
   implementation(libs.build.semver)
   implementation(libs.build.sentry)
diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
index d0263576..65c74c60 100644
--- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
@@ -6,14 +6,12 @@
  */
 package dev.msfjarvis.claw.gradle
 
-import com.squareup.sort.SortDependenciesPlugin
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -28,7 +26,6 @@ class KotlinCommonPlugin : Plugin<Project> {
     } else if (project.name != "benchmark") {
       LintConfig.configureSubProject(project)
     }
-    project.pluginManager.apply(SortDependenciesPlugin::class)
     project.tasks.run {
       withType<JavaCompile>().configureEach {
         sourceCompatibility = JavaVersion.VERSION_11.toString()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c9c31d3c..5fe2f73f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -47,7 +47,6 @@ androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0-alpha03
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workmanager" }
 build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 build-cachefix = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:2.7.1"
-build-depsort = "com.squareup:sort-dependencies-gradle-plugin:0.2"
 build-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 build-semver = "com.vdurmont:semver4j:3.1.0"
 build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:3.5.0"