Merge pull request #172 from adobe/dev

Dev -> Main

Author: siddique-adobe

android/aepsdk-gradle-plugin/aepsdk-gradle-plugin/build.gradle.kts

@@ -1,4 +1,4 @@
-val PLUGIN_VERSION = "3.4.2"
+val PLUGIN_VERSION = "3.4.3"
 // version and used for Maven local publishing
 version = PLUGIN_VERSION
 

android/aepsdk-gradle-plugin/aepsdk-gradle-plugin/src/main/kotlin/com/adobe/marketing/mobile/gradle/AEPLibraryPlugin.kt

@@ -297,12 +297,12 @@ class AEPLibraryPlugin : Plugin<Project> {
         val assemblePhone = project.tasks.named(BuildConstants.Tasks.ASSEMBLE_PHONE)
         val configureJReleaserVariables = project.tasks.named(BuildConstants.Tasks.CONFIGURE_JRELEASER_VARIABLES)
         if (extension.enablePlayConsoleVerification.getOrElse(false)) {
-            assemblePhone.configure{dependsOn((BuildConstants.Tasks.CONFIGURE_PLAY_CONSOLE_VERIFICATION))}
+            project.tasks.named(BuildConstants.Tasks.BUNDLE_PHONE_RELEASE_AAR).configure { dependsOn(BuildConstants.Tasks.CONFIGURE_PLAY_CONSOLE_VERIFICATION) }
         }
         project.tasks.named(BuildConstants.Tasks.PUBLISH).configure { dependsOn(assemblePhone) }
-        project.tasks.named(BuildConstants.Tasks.PUBLISH_MAVEN_LOCAL).configure { dependsOn(assemblePhone)}
-        project.tasks.named(BuildConstants.Tasks.PUBLISH_RELEASE_MAVEN_LOCAL).configure { dependsOn(assemblePhone)}
-        project.tasks.named(BuildConstants.Tasks.PUBLISH).configure { dependsOn(configureJReleaserVariables)}
+        project.tasks.named(BuildConstants.Tasks.PUBLISH_MAVEN_LOCAL).configure { dependsOn(assemblePhone) }
+        project.tasks.named(BuildConstants.Tasks.PUBLISH_RELEASE_MAVEN_LOCAL).configure { dependsOn(assemblePhone) }
+        project.tasks.named(BuildConstants.Tasks.PUBLISH).configure { dependsOn(configureJReleaserVariables) }
     }
 
     private fun configureSpotless(project: Project, extension: AEPLibraryExtension) {

android/aepsdk-gradle-plugin/aepsdk-gradle-plugin/src/main/kotlin/com/adobe/marketing/mobile/gradle/BuildConstants.kt

@@ -135,6 +135,7 @@ object BuildConstants {
         const val PUBLISH_RELEASE_MAVEN_LOCAL = "publishReleasePublicationToMavenLocal"
         const val SIGN_RELEASE = "signReleasePublication"
         const val CONFIGURE_JRELEASER_VARIABLES = "configureJReleaserVariables"
+        const val BUNDLE_PHONE_RELEASE_AAR = "bundlePhoneReleaseAar"
         const val FUNCTIONAL_TEST_COVERAGE_REPORT = "functionalTestsCoverageReport"
         const val CREATE_PHONE_DEBUG_COVERAGE_REPORT = "createPhoneDebugCoverageReport"
         const val UNIT_TEST_COVERAGE_REPORT = "unitTestCoverageReport"

android/aepsdk-gradle-plugin/aepsdk-gradle-plugin/src/main/kotlin/com/adobe/marketing/mobile/gradle/PublishPlugin.kt

@@ -32,7 +32,7 @@ class PublishPlugin : Plugin<Project> {
             // To cover all cases, depend on every PublishToMavenRepository task in the project.
             project.tasks
                 .withType(org.gradle.api.publish.maven.tasks.PublishToMavenRepository::class.java)
-                .configureEach { dependsOn(project.tasks.named("bundlePhoneReleaseAar")) }
+                .configureEach { dependsOn(project.tasks.named(BuildConstants.Tasks.BUNDLE_PHONE_RELEASE_AAR)) }
         }
     }