Merge pull request #3 from LikeTheSalad/release/1.5.0

Release/1.5.0
LikeTheSalad · Dec 5, 2023 · 1b5c210 · 1b5c210
2 parents 2d2a3d2 + 3fdf890
commit 1b5c210
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...lity-api/src/main/java/com/likethesalad/tools/agpcompat/api/AgpCompatibilityEntrypoint.kt b/...lity-api/src/main/java/com/likethesalad/tools/agpcompat/api/AgpCompatibilityEntrypoint.kt
@@ -33,12 +33,12 @@ abstract class AgpCompatibilityEntrypoint {
 
         private fun getCurrentAgpVersion(project: Project): AgpVersion? {
             return try {
-                val componentsExtensionType = Class.forName("com.android.build.api.variant.AndroidComponentsExtension")
-                val componentsExtension = project.extensions.findByType(componentsExtensionType)
-                val pluginVersionGetter = componentsExtensionType.getDeclaredMethod("getPluginVersion")
-                val currentVersion = pluginVersionGetter.invoke(componentsExtension)
-                androidPluginVersionToAgpVersion(currentVersion)
-            } catch (e: ClassNotFoundException) {
+                project.extensions.findByName("androidComponents")?.let { componentsExtension ->
+                    val pluginVersionGetter = componentsExtension.javaClass.getDeclaredMethod("getPluginVersion")
+                    val currentVersion = pluginVersionGetter.invoke(componentsExtension)
+                    androidPluginVersionToAgpVersion(currentVersion)
+                }
+            } catch (e: NoSuchMethodException) {
                 null
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ artifactPublisher {
 
 description = "Gradle plugin that extracts android plugin information"
 group = "com.likethesalad.tools"
-version = "1.4.0"
+version = "1.5.1"
 
 allprojects {
     repositories {