Merge pull request #3 from LikeTheSalad/release/2.1.0

Release/2.1.0

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.1.0
+---
+
+* Updating android gradle plugin tool.
+
 Version 2.0.2
 ---
 

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

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) {

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

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

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

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

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

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

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 {