From d2b27120ec82b71e4778abd3bb3c191022ae8d53 Mon Sep 17 00:00:00 2001
From: StefMa <StefMaDev@outlook.com>
Date: Sat, 19 Aug 2023 21:03:41 +0200
Subject: [PATCH] Upgrade Android Gradle Plugin

---
 plugin/gradle/libs.versions.toml                |  2 +-
 .../ktlint/android/AndroidPluginsApplier.kt     | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/plugin/gradle/libs.versions.toml b/plugin/gradle/libs.versions.toml
index ee855385..9632b546 100644
--- a/plugin/gradle/libs.versions.toml
+++ b/plugin/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.5.31"
 ktlint = "0.45.2" # last version prior to API changes. we can increase this more once we drop support for the old API.
-androidPlugin = "4.1.0"
+androidPlugin = "7.0.0"
 semver = "1.1.1"
 jgit = "5.6.0.201912101111-r"
 sl4fj = "1.7.30"
diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/android/AndroidPluginsApplier.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/android/AndroidPluginsApplier.kt
index 9e4b0072..a0085f5a 100644
--- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/android/AndroidPluginsApplier.kt
+++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/android/AndroidPluginsApplier.kt
@@ -1,14 +1,10 @@
 package org.jlleitschuh.gradle.ktlint.android
 
-import com.android.build.api.dsl.AndroidSourceSet
 import com.android.build.api.dsl.BuildFeatures
 import com.android.build.api.dsl.BuildType
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.DefaultConfig
 import com.android.build.api.dsl.ProductFlavor
-import com.android.build.api.dsl.SigningConfig
-import com.android.build.api.variant.Variant
-import com.android.build.api.variant.VariantProperties
 import com.android.build.gradle.internal.api.DefaultAndroidSourceDirectorySet
 import org.gradle.api.Plugin
 import org.gradle.api.file.FileCollection
@@ -43,17 +39,8 @@ internal fun KtlintPlugin.PluginHolder.applyKtLintToAndroid(): (Plugin<in Any>)
     }
 }
 
-@Suppress("UnstableApiUsage")
-private typealias AndroidCommonExtension = CommonExtension<
-    AndroidSourceSet,
-    BuildFeatures,
-    BuildType,
-    DefaultConfig,
-    ProductFlavor,
-    SigningConfig,
-    Variant<VariantProperties>,
-    VariantProperties
-    >
+private typealias AndroidCommonExtension =
+    CommonExtension<BuildFeatures, BuildType, DefaultConfig, ProductFlavor>
 
 /*
  * Variant manager returns all sources for variant,