Updating android gradle tools

LikeTheSalad · Aug 15, 2023 · 4e75836 · 4e75836
1 parent 5b340e0
commit 4e75836
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/...c/main/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinder.kt b/...c/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/...c/main/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTree.kt b/...c/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/...tor/src/main/java/com/likethesalad/tools/resource/collector/android/di/CollectorModule.kt b/...tor/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/...st/java/com/likethesalad/tools/resource/collector/android/data/resdir/ResDirFinderTest.kt b/...st/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/...st/java/com/likethesalad/tools/resource/collector/android/data/variant/VariantTreeTest.kt b/...st/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/...ools/resource/collector/android/source/providers/VariantTreeResourceSourceProviderTest.kt b/...ools/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/...main/java/com/likethesalad/tools/resource/locator/android/AndroidResourceLocatorPlugin.kt b/...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/...src/main/java/com/likethesalad/tools/resource/locator/android/di/ResourceLocatorModule.kt b/...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