[#625] Add flavors

.github/actions/app-distribution/action.yml

@@ -31,7 +31,7 @@ runs:
         BRANCH_SHA=${{ github.event.pull_request.head.sha }}
         COMMIT_SHA=${BRANCH_SHA:-$GITHUB_SHA}
         [ ${{ inputs.append-git-sha-to-version-name }} == 'true' ] && VERSION_NAME_SUFFIX=-${COMMIT_SHA::7} || VERSION_NAME_SUFFIX=''
-        ./gradlew app:appDistributionUpload -PapplicationId=com.orange.ods.test.app -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=release -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace
+        ./gradlew app:appDistributionUpload -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=qualifRelease -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace
       env:
         GITHUB_TOKEN: ${{ inputs.github-token }}
         FIREBASE_TOKEN: ${{ inputs.firebase-token }}

.github/workflows/android-build.yml

@@ -52,7 +52,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: app
-          path: app/build/outputs/apk/*/*.apk
+          path: app/build/outputs/apk/*/*/*.apk
 
       - name: Store lib artifacts
         uses: actions/upload-artifact@v3
@@ -168,12 +168,12 @@ jobs:
       - name: Publish release to Google Play Store
         run: |
           ./gradlew assembleRelease bundleRelease
-          curl -F 'file=@app/build/outputs/bundle/release/app-release.aab' https://oma-portal.orange.fr/oma/api/v1/external/applications/${{ secrets.OMA_APP_ID }}/artifacts -H "apiKey:${{ secrets.OMA_APP_TOKEN }}"
+          curl -F 'file=@app/build/outputs/bundle/prodRelease/app-prod-release.aab' https://oma-portal.orange.fr/oma/api/v1/external/applications/${{ secrets.OMA_APP_ID }}/artifacts -H "apiKey:${{ secrets.OMA_APP_TOKEN }}"
 
       - name: Store Google Play Store artifacts
         uses: actions/upload-artifact@v3
         with:
           name: google-play-store
           path: |
-            app/build/outputs/apk/*/*.apk
+            app/build/outputs/apk/*/*/*.apk
             app/build/outputs/bundle/*/*.aab

app/build.gradle.kts

@@ -32,7 +32,6 @@ android {
     compileSdk = Versions.compileSdk
 
     defaultConfig {
-        applicationId = project.findTypedProperty<String>("applicationId") ?: "com.orange.ods.app"
         minSdk = Versions.minSdk
         targetSdk = Versions.targetSdk
         val versionCodeProperty = project.findTypedProperty<String>("versionCode")
@@ -76,6 +75,20 @@ android {
         }
     }
 
+    val versionFlavorDimension = "version"
+    flavorDimensions.add(versionFlavorDimension)
+    productFlavors {
+        create("qualif") {
+            dimension = versionFlavorDimension
+            applicationId = "com.orange.ods.test.app"
+        }
+
+        create("prod") {
+            dimension = versionFlavorDimension
+            applicationId = "com.orange.ods.app"
+        }
+    }
+
     firebaseAppDistribution {
         releaseNotesFile = Firebase_gradle.AppDistribution.releaseNotesFilePath
         groups = project.findTypedProperty("appDistributionGroup")

buildSrc/src/main/kotlin/com/orange/ods/gradle/MavenCentralPublishPluginExtension.kt

@@ -14,7 +14,7 @@ abstract class MavenCentralPublishPluginExtension {
 
     companion object {
         const val NAME = "mavenCentralPublish"
-        const val RELEASE_COMPONENT_NAME = "release"
+        const val VARIANT = "prodRelease"
     }
 
     var artifactId: String? = null

buildSrc/src/main/kotlin/library.gradle.kts

@@ -44,7 +44,7 @@ android {
     }
 
     publishing {
-        singleVariant(MavenCentralPublishPluginExtension.RELEASE_COMPONENT_NAME) {
+        singleVariant(MavenCentralPublishPluginExtension.VARIANT) {
             withSourcesJar()
             withJavadocJar()
         }

buildSrc/src/main/kotlin/maven-central-publish.gradle.kts

@@ -29,8 +29,8 @@ apply {
 afterEvaluate {
     publishing {
         publications {
-            create<MavenPublication>(MavenCentralPublishPluginExtension.RELEASE_COMPONENT_NAME) {
-                from(components[MavenCentralPublishPluginExtension.RELEASE_COMPONENT_NAME])
+            create<MavenPublication>(MavenCentralPublishPluginExtension.VARIANT) {
+                from(components["release"])
                 groupId = "com.orange.ods.android"
                 artifactId = pluginExtension?.artifactId ?: "ods-${project.name}"
                 this.version = version
@@ -86,6 +86,6 @@ afterEvaluate {
             "GNUPG_SIGNING_PASSWORD"
         )
         useInMemoryPgpKeys(signingKeyId, signingSecretKey, signingPassword)
-        sign(publishing.publications[MavenCentralPublishPluginExtension.RELEASE_COMPONENT_NAME])
+        sign(publishing.publications[MavenCentralPublishPluginExtension.VARIANT])
     }
 }