Migrating to android bridge tools

Author: LikeTheSalad

android-resource-collector/build.gradle

@@ -5,8 +5,8 @@ plugins {
 
 dependencies {
     api project(':resource-collector')
-    implementation "com.likethesalad.tools:android-tools-plugin:$androidTools_version"
     implementation project(':android-resource-api')
+    implementation libs.androidCompatApi
     embedded libs.dagger
     kapt libs.dagger.compiler
     testImplementation libs.unitTesting

android-resource-locator/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     api project(":android-resource-api")
     api project(":android-resource-collector")
     api project(':android-resource-serializer')
-    api "com.likethesalad.tools:android-tools-plugin:$androidTools_version"
+    api libs.pluginTools
     implementation libs.gson
     embedded libs.dagger
     kapt libs.dagger.compiler

android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/AndroidResourceLocatorPlugin.kt

@@ -1,10 +1,9 @@
 package com.likethesalad.tools.resource.locator.android
 
+import com.likethesalad.plugins.agpbrigde.base.AndroidBridgePluginConsumer
 import com.likethesalad.resource.serializer.android.AndroidResourceSerializer
 import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
-import com.likethesalad.tools.android.plugin.AndroidToolsPlugin
-import com.likethesalad.tools.android.plugin.extension.AndroidToolsPluginExtension
 import com.likethesalad.tools.resource.collector.android.AndroidResourceCollector
 import com.likethesalad.tools.resource.collector.android.data.variant.VariantTree
 import com.likethesalad.tools.resource.collector.android.di.CollectorComponent
@@ -23,42 +22,30 @@ import com.likethesalad.tools.resource.locator.android.extension.resources.DirLa
 import com.likethesalad.tools.resource.locator.android.providers.InstancesProvider
 import com.likethesalad.tools.resource.locator.android.providers.TaskFinder
 import com.likethesalad.tools.resource.locator.android.task.ResourceLocatorTask
-import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.provider.Provider
 import java.io.File
 import java.util.concurrent.Callable
 
-abstract class AndroidResourceLocatorPlugin : Plugin<Project>, TaskFinder, InstancesProvider {
+abstract class AndroidResourceLocatorPlugin : AndroidBridgePluginConsumer(), TaskFinder, InstancesProvider {
 
     private lateinit var project: Project
     private val serializer by lazy { AndroidResourceSerializer() }
     internal lateinit var androidExtension: AndroidExtension
 
     override fun apply(project: Project) {
         this.project = project
-        val androidToolsPluginExtension = findAndroidToolsPluginExtension()
-        androidExtension = androidToolsPluginExtension.androidExtension
+        androidExtension = androidBridge.androidExtension
         ResourceLocatorComponentProvider.init(this)
         val component = ResourceLocatorComponentProvider.getComponent()
         val resourceLocatorExtension = createExtension(project, component)
 
-        androidToolsPluginExtension.onVariant { variant ->
+        androidBridge.onVariant { variant ->
             createResourceLocatorTasksForVariant(variant, resourceLocatorExtension)
         }
     }
 
-    private fun findAndroidToolsPluginExtension(): AndroidToolsPluginExtension {
-        val toolsPluginExtension = project.extensions.findByType(AndroidToolsPluginExtension::class.java)
-        if (toolsPluginExtension == null) {
-            project.plugins.apply(AndroidToolsPlugin::class.java)
-            return project.extensions.getByType(AndroidToolsPluginExtension::class.java)
-        }
-
-        return toolsPluginExtension
-    }
-
     private fun createExtension(
         project: Project,
         component: ResourceLocatorComponent

gradle/libs.versions.toml

@@ -1,13 +1,14 @@
 [versions]
 dagger = "2.50"
-project-utilities = "3.0.2"
+project-utilities = "3.1.0"
 
 [libraries]
-androidToolsPlugin = "com.likethesalad.tools:android-tools-plugin:1.5.1"
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 gson = "com.google.code.gson:gson:2.8.7"
 unitTesting = { module = "com.likethesalad.tools:unit-testing", version.ref = "project-utilities" }
+androidCompatApi = { module = "com.likethesalad.tools:agp-compatibility-api", version.ref = "project-utilities" }
+pluginTools = { module = "com.likethesalad.tools:plugin-tools", version.ref = "project-utilities" }
 
 [plugins]
 java-library = { id = "com.likethesalad.tools.java-library", version.ref = "project-utilities" }