From 4e75836be4dc3c9e1e8dc84f06e0f755e05f2a33 Mon Sep 17 00:00:00 2001
From: Cesar Munoz <likethesalad@gmail.com>
Date: Tue, 15 Aug 2023 11:43:33 +0200
Subject: [PATCH 1/2] Updating android gradle tools

---
 .../resource/collector/android/data/resdir/ResDirFinder.kt    | 2 +-
 .../resource/collector/android/data/variant/VariantTree.kt    | 2 +-
 .../tools/resource/collector/android/di/CollectorModule.kt    | 2 +-
 .../collector/android/data/resdir/ResDirFinderTest.kt         | 2 +-
 .../collector/android/data/variant/VariantTreeTest.kt         | 2 +-
 .../source/providers/VariantTreeResourceSourceProviderTest.kt | 4 ++--
 .../resource/locator/android/AndroidResourceLocatorPlugin.kt  | 4 ++--
 .../resource/locator/android/di/ResourceLocatorModule.kt      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinder.kt b/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinder.kt
index ce6c8cf..60d1f59 100644
--- a/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinder.kt
+++ b/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinder.kt
@@ -1,6 +1,6 @@
 package com.likethesalad.tools.resource.collector.android.data.resdir
 
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.resource.api.android.environment.Variant
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTree.kt b/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTree.kt
index 3da0cbc..2972c0e 100644
--- a/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTree.kt
+++ b/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTree.kt
@@ -1,6 +1,6 @@
 package com.likethesalad.tools.resource.collector.android.data.variant
 
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import com.likethesalad.tools.resource.api.android.environment.Variant
 
 class VariantTree(val androidVariantData: AndroidVariantData) {
diff --git a/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/di/CollectorModule.kt b/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/di/CollectorModule.kt
index 6de611d..f75923f 100644
--- a/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/di/CollectorModule.kt
+++ b/android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/di/CollectorModule.kt
@@ -1,6 +1,6 @@
 package com.likethesalad.tools.resource.collector.android.di
 
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import dagger.Module
 import dagger.Provides
 import javax.xml.parsers.DocumentBuilderFactory
diff --git a/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinderTest.kt b/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinderTest.kt
index c5337f2..c24d267 100644
--- a/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinderTest.kt
+++ b/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinderTest.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.tools.resource.collector.android.data.resdir
 
 import com.google.common.truth.Truth
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.resource.api.android.environment.Variant
 import com.likethesalad.tools.testing.BaseMockable
 import io.mockk.every
diff --git a/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTreeTest.kt b/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTreeTest.kt
index 42a4974..2e7618a 100644
--- a/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTreeTest.kt
+++ b/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTreeTest.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.tools.resource.collector.android.data.variant
 
 import com.google.common.truth.Truth
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import com.likethesalad.tools.resource.api.android.environment.Variant
 import com.likethesalad.tools.testing.BaseMockable
 import io.mockk.every
diff --git a/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/source/providers/VariantTreeResourceSourceProviderTest.kt b/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/source/providers/VariantTreeResourceSourceProviderTest.kt
index 491a0c0..4b491b9 100644
--- a/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/source/providers/VariantTreeResourceSourceProviderTest.kt
+++ b/android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/source/providers/VariantTreeResourceSourceProviderTest.kt
@@ -1,11 +1,11 @@
 package com.likethesalad.tools.resource.collector.android.source.providers
 
 import com.google.common.truth.Truth
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.resource.api.Resource
-import com.likethesalad.tools.resource.api.android.impl.AndroidResourceScope
 import com.likethesalad.tools.resource.api.android.environment.Language
 import com.likethesalad.tools.resource.api.android.environment.Variant
+import com.likethesalad.tools.resource.api.android.impl.AndroidResourceScope
 import com.likethesalad.tools.resource.collector.android.data.AndroidXmlResDocument
 import com.likethesalad.tools.resource.collector.android.data.resdir.ResDirFinder
 import com.likethesalad.tools.resource.collector.android.data.valuedir.ValueDirFinder
diff --git a/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/AndroidResourceLocatorPlugin.kt b/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/AndroidResourceLocatorPlugin.kt
index 437b366..22a0436 100644
--- a/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/AndroidResourceLocatorPlugin.kt
+++ b/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/AndroidResourceLocatorPlugin.kt
@@ -1,9 +1,9 @@
 package com.likethesalad.tools.resource.locator.android
 
 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.data.AndroidExtension
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
 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
diff --git a/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorModule.kt b/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorModule.kt
index 7394d7c..6f34d88 100644
--- a/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorModule.kt
+++ b/android-resource-locator/src/main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorModule.kt
@@ -1,6 +1,6 @@
 package com.likethesalad.tools.resource.locator.android.di
 
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.resource.locator.android.AndroidResourceLocatorPlugin
 import com.likethesalad.tools.resource.locator.android.providers.InstancesProvider
 import com.likethesalad.tools.resource.locator.android.providers.TaskFinder

From c8e0888dd340b247ecf6a1c828004de0f4873e66 Mon Sep 17 00:00:00 2001
From: Cesar Munoz <likethesalad@gmail.com>
Date: Tue, 15 Aug 2023 14:11:20 +0200
Subject: [PATCH 2/2] Updating changelog

---
 CHANGELOG.md | 5 +++++
 build.gradle | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd8f15..81baee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.1.0
+---
+
+* Updating android gradle plugin tool.
+
 Version 2.0.2
 ---
 
diff --git a/build.gradle b/build.gradle
index 70ffdaa..e176773 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ ext {
     dagger_version = '2.39.1'
     gson_version = '2.8.7'
     testingUtilities_version = '1.0.5'
-    androidTools_version = '1.3.0'
+    androidTools_version = '1.4.0'
 }
 
 artifactPublisher {
@@ -32,7 +32,7 @@ artifactPublisher {
 }
 
 group 'com.likethesalad.tools.resources'
-version '2.0.2'
+version '2.1.0'
 description 'Plugin that gathers resources from Android projects for compilation purposes.'
 
 subprojects {