Merge pull request #24 from getyoti/YM-25986

[YM-25986] Add configurable app packages

Author: Pedro Martins

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## [1.3.3] - 2022-04-04
+### Changed
+- Add configurable app packages (automation fix)
+
 ## [1.3.2] - 2022-03-30
 ### Fixed
 - Fix crash when returning from Digital IDs Apps.

gradle.properties

@@ -56,9 +56,9 @@ easyIDScheme=easyid://
 pomId=yoti-button-sdk
 pomGroup=com.yoti.mobile.android.sdk
 pomPackaging=aar
-pomVersion=1.3.2
+pomVersion=1.3.3
 pomDescription=Button SDK that allows 3rd party to trigger Yoti as support app
-currentVersionCode=000012
+currentVersionCode=000013
 
 pomLicenseName=MIT
 pomLicenseUrl=https://github.com/getyoti/android-sdk-button/blob/master/LICENSE.md

yoti-sdk/build.gradle

@@ -17,8 +17,13 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        buildConfigField 'String', 'YOTI_APP_PACKAGE', "\"$yotiAppPackage\""
-        buildConfigField 'String', 'EASY_ID_APP_PACKAGE', "\"$easyIdAppPackage\""
+        def yotiAppPackageValue = "$yotiAppPackage"
+        def easyIdAppPackageValue = "$easyIdAppPackage"
+
+        manifestPlaceholders = [yotiAppPackage: yotiAppPackageValue, easyIdAppPackage: easyIdAppPackageValue]
+
+        buildConfigField 'String', 'YOTI_APP_PACKAGE', "\"${yotiAppPackageValue}\""
+        buildConfigField 'String', 'EASY_ID_APP_PACKAGE', "\"$easyIdAppPackageValue\""
         buildConfigField 'int', 'YOTI_APP_MIN_VERSION', yotiAppMinVersion
         buildConfigField 'String', 'YOTI_BACKEND_URL', "\"$yotiBackendUrl\""
         buildConfigField 'int', 'YOTI_BACKEND_PORT', "$yotiBackendPort"

yoti-sdk/src/main/AndroidManifest.xml

@@ -3,8 +3,8 @@
     package="com.yoti.mobile.android.sdk">
 
     <queries>
-        <package android:name="com.yoti.mobile.android.live" />
-        <package android:name="com.postofficeid.mobile.android.live" />
+        <package android:name="${yotiAppPackage}" />
+        <package android:name="${easyIdAppPackage}" />
     </queries>
 
     <application