build: 3.0 release

.github/workflows/build-release-candidate.yml

@@ -62,4 +62,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: ${{ env.repository_name }} - Android APK
-        path: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-release.apk
+        path: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk

.github/workflows/continuous-delivery.yml

@@ -51,4 +51,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.repository_name }} - Android APK - ${{ steps.date.outputs.date }}
-          path: ${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-debug.apk
+          path: ${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk

.github/workflows/continuous-integration.yml

@@ -90,4 +90,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.repository_name }} - Android APK
-          path: ${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-debug.apk
+          path: ${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk

.github/workflows/deploy-release.yml

@@ -64,7 +64,7 @@ jobs:
       with:
         serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
         packageName: com.dhis2
-        releaseFiles: ${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhisPlayServices-release.apk
+        releaseFiles: ${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk
         track: alpha
         whatsNewDirectory: whatsnew
 
@@ -78,15 +78,15 @@ jobs:
         generateReleaseNotes: true
         name: "Android Capture App for DHIS 2 (v${{ inputs.release_tag_name }}) - Patch version"
         tag: ${{ inputs.release_tag_name }}
-        artifacts: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-release.apk,${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhisPlayServices-release.apk,${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-debug.apk
+        artifacts: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk,${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk,${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
 
     - name: Github New Release
       if: ${{ (inputs.github_release == true) && (inputs.is_patch == false) }}
       uses: ncipollo/release-action@v1
       with:
         allowUpdates: true
         draft: true
-        generateReleaseNotes: true
+        bodyFile: "RELEASE.md"
         name: "Android Capture App for DHIS 2 (v${{ inputs.release_tag_name }})"
         tag: ${{ inputs.release_tag_name }}
-        artifacts: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-release.apk,${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhisPlayServices-release.apk,${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-debug.apk
+        artifacts: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk,${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk,${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.api.variant.impl.VariantOutputImpl
+import com.android.build.gradle.internal.scope.ProjectInfo.Companion.getBaseName
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -36,10 +38,10 @@ android {
     }
 
     signingConfigs {
-        create("release"){
+        create("release") {
             keyAlias = System.getenv("SIGNING_KEY_ALIAS")
             keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
-            System.getenv("SIGNING_KEYSTORE_PATH")?.let {path->
+            System.getenv("SIGNING_KEYSTORE_PATH")?.let { path ->
                 storeFile = file(path)
             }
             storePassword = System.getenv("SIGNING_STORE_PASSWORD")
@@ -227,6 +229,25 @@ android {
         abortOnError = false
         checkReleaseBuilds = false
     }
+
+    androidComponents {
+        onVariants { variant ->
+            val buildType = variant.buildType
+            val flavorName = variant.flavorName
+            variant.outputs.forEach { output ->
+                if (output is VariantOutputImpl) {
+                    val suffix = when {
+                        buildType == "debug" && flavorName == "dhis" -> "-training"
+                        buildType == "release" && flavorName == "dhisPlayServices" -> "-googlePlay"
+                        else -> ""
+                    }
+
+                    output.outputFileName = "dhis2-v${libs.versions.vName.get()}$suffix.apk"
+                }
+            }
+
+        }
+    }
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 ndk = "21.4.7075529"
 sdk = "34"
 minSdk = "21"
-vCode = "132"
+vCode = "133"
 vName = "3.0"
 kotlinCompilerExtensionVersion = "1.5.6"
 gradle = "8.2.2"

whatsnew/whatsnew-en-US

@@ -1,8 +1,11 @@
-This is a patch version that fixes:
-- ANDROAPP-5749 Incorrect behavior when tapping on Next on sections that are too long
-- ANDROAPP-5885 Data set indicators don't update until the user moves to a different cell
-- ANDROAPP-5741 [Local Analytics] App crashes if charts are empty
-- ANDROAPP-5604	App crashes when one attempts to synchronise TEI and events imported via QR code
-- ANDROAPP-5872 Search in stock management is not updating the list
-
-You can find all the details on Jira and Github.
+- Event and enrollment label can be customized via the Maintenance App.
+- Supports multiselect data elements.
+- Support for custom icons.
+- Event/enrollment details are now more accessible within forms.
+- Improved search flow and dashboard layout.
+- Redesigned input fields.
+- Support line listing analytics.
+- Custom map layers can be used.
+- Export/import databases for troubleshooting.
+- Better feedback for configuration errors.
+- Better navigation for many TEIs