Merge pull request #44 from LikeTheSalad/release/2.5.0

Release/2.5.0
LikeTheSalad · Aug 15, 2023 · ce0ce29 · ce0ce29
2 parents 48b2abf + 1b1edc4
commit ce0ce29
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.5.0 *(15-08-2023)*
+---
+
+* Fix #43 by adding support to AGP's 7.4.0+ APIs.
+
 Version 2.4.1 *(20-05-2023)*
 ---
 

diff --git a/build.gradle b/build.gradle
@@ -30,14 +30,14 @@ artifactPublisher {
 
 description = "This is a Gradle plugin for Android applications which resolves XML string references in other XML strings."
 group = 'com.likethesalad.android'
-version = "2.4.1"
+version = "2.5.0"
 
 ext {
     dagger_version = '2.39.1'
     androidBuild_version = '7.1.0'
     testingUtilities_version = '1.0.8'
-    resourceLocator_version = '2.0.2'
-    androidTools_version = "1.3.0"
+    resourceLocator_version = '2.1.0'
+    androidTools_version = "1.4.0"
     androidBuild_test_version = '7.1.0'
 }
 

diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt b/stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt
@@ -11,7 +11,7 @@ import com.likethesalad.stem.providers.ProjectDirsProvider
 import com.likethesalad.stem.providers.TaskContainerProvider
 import com.likethesalad.stem.providers.TaskProvider
 import com.likethesalad.stem.utils.PlaceholderTasksCreator
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.resource.locator.android.extension.AndroidResourceLocatorExtension
 import org.gradle.api.Action
 import org.gradle.api.Project

diff --git a/...rc/main/java/com/likethesalad/stem/modules/common/helpers/dirs/VariantBuildResolvedDir.kt b/...rc/main/java/com/likethesalad/stem/modules/common/helpers/dirs/VariantBuildResolvedDir.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.stem.modules.common.helpers.dirs
 
 import com.likethesalad.stem.providers.ProjectDirsProvider
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject

diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/models/TasksNamesModel.kt b/stem-plugin/src/main/java/com/likethesalad/stem/modules/common/models/TasksNamesModel.kt
@@ -2,7 +2,7 @@ package com.likethesalad.stem.modules.common.models
 
 import com.likethesalad.android.templates.common.tasks.identifier.TemplatesIdentifierTask
 import com.likethesalad.android.templates.common.utils.upperFirst
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject

diff --git a/stem-plugin/src/main/java/com/likethesalad/stem/providers/AndroidExtensionProvider.kt b/stem-plugin/src/main/java/com/likethesalad/stem/providers/AndroidExtensionProvider.kt
@@ -1,6 +1,6 @@
 package com.likethesalad.stem.providers
 
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 
 interface AndroidExtensionProvider {
 

diff --git a/stem-plugin/src/test/java/com/likethesalad/stem/data/helpers/AndroidVariantContextTest.kt b/stem-plugin/src/test/java/com/likethesalad/stem/data/helpers/AndroidVariantContextTest.kt
@@ -6,7 +6,7 @@ import com.likethesalad.stem.modules.common.helpers.dirs.VariantBuildResolvedDir
 import com.likethesalad.stem.modules.common.models.TasksNamesModel
 import com.likethesalad.stem.providers.ProjectDirsProvider
 import com.likethesalad.stem.providers.TaskProvider
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import com.likethesalad.tools.resource.collector.android.data.variant.VariantTree
 import com.likethesalad.tools.resource.serializer.ResourceSerializer
 import io.mockk.every

diff --git a/stem-plugin/src/test/java/com/likethesalad/stem/data/storage/VariantBuildResolvedDirTest.kt b/stem-plugin/src/test/java/com/likethesalad/stem/data/storage/VariantBuildResolvedDirTest.kt
@@ -3,7 +3,7 @@ package com.likethesalad.stem.data.storage
 import com.google.common.truth.Truth
 import com.likethesalad.stem.modules.common.helpers.dirs.VariantBuildResolvedDir
 import com.likethesalad.stem.providers.ProjectDirsProvider
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.Rule

diff --git a/...n/src/test/java/com/likethesalad/stem/locator/listener/TypeLocatorCreationListenerTest.kt b/...n/src/test/java/com/likethesalad/stem/locator/listener/TypeLocatorCreationListenerTest.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.stem.locator.listener
 
 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.collector.android.data.variant.VariantTree
 import com.likethesalad.tools.resource.locator.android.extension.configuration.data.ResourceLocatorInfo
 import com.likethesalad.tools.testing.BaseMockable

diff --git a/stem-plugin/src/test/java/com/likethesalad/stem/models/TasksNamesModelTest.kt b/stem-plugin/src/test/java/com/likethesalad/stem/models/TasksNamesModelTest.kt
@@ -2,7 +2,7 @@ package com.likethesalad.stem.models
 
 import com.google.common.truth.Truth
 import com.likethesalad.stem.modules.common.models.TasksNamesModel
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.Test

diff --git a/.../src/test/java/com/likethesalad/stem/modules/common/helpers/dirs/SourceSetsHandlerTest.kt b/.../src/test/java/com/likethesalad/stem/modules/common/helpers/dirs/SourceSetsHandlerTest.kt
@@ -1,7 +1,7 @@
 package com.likethesalad.stem.modules.common.helpers.dirs
 
 import com.likethesalad.stem.providers.AndroidExtensionProvider
-import com.likethesalad.tools.android.plugin.data.AndroidExtension
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidExtension
 import com.likethesalad.tools.testing.BaseMockable
 import io.mockk.Runs
 import io.mockk.every

diff --git a/.../likethesalad/android/templates/provider/locator/listener/TemplatesProviderTaskCreator.kt b/.../likethesalad/android/templates/provider/locator/listener/TemplatesProviderTaskCreator.kt
@@ -5,7 +5,7 @@ import com.likethesalad.android.templates.common.tasks.identifier.action.Templat
 import com.likethesalad.android.templates.common.utils.upperFirst
 import com.likethesalad.android.templates.provider.tasks.service.TemplatesServiceGeneratorTask
 import com.likethesalad.android.templates.provider.tasks.service.action.TemplatesServiceGeneratorAction
-import com.likethesalad.tools.android.plugin.data.AndroidVariantData
+import com.likethesalad.tools.agpcompat.api.bridges.AndroidVariantData
 import com.likethesalad.tools.resource.collector.android.data.variant.VariantTree
 import com.likethesalad.tools.resource.locator.android.extension.configuration.data.ResourceLocatorInfo
 import com.likethesalad.tools.resource.locator.android.extension.listener.ResourceLocatorCreationListener

diff --git a/...om/likethesalad/android/templates/provider/tasks/service/TemplatesServiceGeneratorTask.kt b/...om/likethesalad/android/templates/provider/tasks/service/TemplatesServiceGeneratorTask.kt
@@ -3,14 +3,14 @@ package com.likethesalad.android.templates.provider.tasks.service
 import com.likethesalad.android.templates.common.utils.CommonConstants
 import com.likethesalad.android.templates.common.utils.DirectoryUtils
 import com.likethesalad.android.templates.provider.tasks.service.action.TemplatesServiceGeneratorAction
-import com.likethesalad.tools.android.plugin.base.BaseJavaBytecodeGeneratorTask
+import com.likethesalad.tools.agpcompat.api.tasks.DirProducerTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.TaskAction
 import javax.inject.Inject
 
 @Suppress("UnstableApiUsage")
-open class TemplatesServiceGeneratorTask @Inject constructor(private val args: Args) : BaseJavaBytecodeGeneratorTask() {
+open class TemplatesServiceGeneratorTask @Inject constructor(private val args: Args) : DirProducerTask() {
 
     @InputFile
     val templateIdsFile: RegularFileProperty = project.objects.fileProperty()

diff --git a/tests.sh b/tests.sh
@@ -1,3 +1,4 @@
+set -e
 ./gradlew test
 ./gradlew functionalTest
 ./gradlew -p "stem-test" testDebugUnitTest -PagpTest_version=7.2.0