diff --git a/.github/actions/app-distribution/action.yml b/.github/actions/app-distribution/action.yml index 71783040..39fad6d0 100644 --- a/.github/actions/app-distribution/action.yml +++ b/.github/actions/app-distribution/action.yml @@ -7,9 +7,9 @@ inputs: description: Indicates if short Git SHA should be appended to the version name required: false default: 'false' - application-id: - description: Application ID - required: false + variant: + description: Variant + required: true firebase-token: description: Firebase token required: true @@ -34,7 +34,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 -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=release -PapplicationId=${{ inputs.application-id }} -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace + ./gradlew :app:appDistributionUpload -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=${{ inputs.variant }} -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace env: GITHUB_TOKEN: ${{ inputs.github-token }} FIREBASE_TOKEN: ${{ inputs.firebase-token }} diff --git a/.github/workflows/app-distribution-review.yml b/.github/workflows/app-distribution-alpha.yml similarity index 90% rename from .github/workflows/app-distribution-review.yml rename to .github/workflows/app-distribution-alpha.yml index 53e8d545..4b00eb78 100644 --- a/.github/workflows/app-distribution-review.yml +++ b/.github/workflows/app-distribution-alpha.yml @@ -1,4 +1,4 @@ -name: app-distribution-review +name: app-distribution-alpha on: workflow_dispatch: @@ -10,7 +10,7 @@ on: - unlabeled jobs: - app-distribution-review: + app-distribution-alpha: runs-on: ubuntu-latest if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'tokenator-update-tokens-')) steps: @@ -44,11 +44,11 @@ jobs: uses: ./.github/actions/app-distribution with: append-git-sha-to-version-name: 'true' - application-id: 'com.orange.ouds.review.app' + variant: 'alphaRelease' firebase-token: ${{ secrets.FIREBASE_TOKEN }} - git-tag-prefix: 'ci/review-app' + git-tag-prefix: 'ci/alpha-app' github-token: ${{ secrets.GITHUB_TOKEN }} - group: 'ouds-android-review' + group: 'ouds-android-alpha' - name: Publish Firebase App Distribution QR code run: ./gradlew publishAppDistributionQrCode diff --git a/.github/workflows/app-distribution-daily.yml b/.github/workflows/app-distribution-beta.yml similarity index 84% rename from .github/workflows/app-distribution-daily.yml rename to .github/workflows/app-distribution-beta.yml index ea34b623..9a44a841 100644 --- a/.github/workflows/app-distribution-daily.yml +++ b/.github/workflows/app-distribution-beta.yml @@ -1,4 +1,4 @@ -name: app-distribution-daily +name: app-distribution-beta on: schedule: @@ -6,7 +6,7 @@ on: workflow_dispatch: jobs: - app-distribution-daily: + app-distribution-beta: runs-on: ubuntu-latest if: github.repository == 'Orange-OpenSource/ouds-android' steps: @@ -33,8 +33,8 @@ jobs: uses: ./.github/actions/app-distribution with: append-git-sha-to-version-name: 'true' - application-id: 'com.orange.ouds.test.app' + variant: 'betaRelease' firebase-token: ${{ secrets.FIREBASE_TOKEN }} - git-tag-prefix: 'ci/daily-app' + git-tag-prefix: 'ci/beta-app' github-token: ${{ secrets.GITHUB_TOKEN }} - group: 'ouds-android-test' + group: 'ouds-android-beta' diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 83d006eb..db92d5e1 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 - name: Build docs using Writerside Docker builder - uses: JetBrains/writerside-github-action@v5 + uses: JetBrains/writerside-github-action@v4 with: instance: ${{ env.INSTANCE }} artifact: ${{ env.ARTIFACT }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ad30d15..2fb70fd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: run: ./gradlew :core:verifyPaparazziDebug - name: Run Android Linter - run: ./gradlew lint + run: ./gradlew lintProdDebug lintProdRelease - name: Build run: | @@ -61,7 +61,7 @@ jobs: # This value is unset if workflow has not been triggered by a pull request, use GITHUB_SHA instead BRANCH_SHA=${{ github.event.pull_request.head.sha }} COMMIT_SHA=${BRANCH_SHA:-$GITHUB_SHA} - ./gradlew assemble -PversionNameSuffix="-${COMMIT_SHA::7}" -PversionCode=$GITHUB_RUN_NUMBER --stacktrace + ./gradlew assembleProd -PversionNameSuffix="-${COMMIT_SHA::7}" -PversionCode=$GITHUB_RUN_NUMBER --stacktrace - name: Store tests artifacts if: always() @@ -78,7 +78,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: app - path: app/build/outputs/apk/*/*.apk + path: app/build/outputs/apk/*/*/*.apk - name: Store core artifacts uses: actions/upload-artifact@v4 diff --git a/NOTICE.txt b/NOTICE.txt index 2fea88f9..687ec212 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -8,6 +8,10 @@ in whole or part of, in any medium, except as required for reasonable and custom and reproducing the content of the NOTICE and DOCUMENTATION files. Any use or displaying shall constitute an infringement under intellectual property laws of France and international conventions. +app/src/alpha/res/drawable-v24/ic_launcher_background.xml +app/src/alpha/res/drawable/ic_launcher_foreground.xml +app/src/beta/res/drawable-v24/ic_launcher_background.xml +app/src/beta/res/drawable/ic_launcher_foreground.xml app/src/main/res/drawable/ic_border.xml app/src/main/res/drawable/ic_chevron_down.xml app/src/main/res/drawable/ic_component_atom.xml @@ -54,6 +58,8 @@ app/src/main/res/drawable-night-xxhdpi/il_tokens_grid_min_width.png app/src/main/res/drawable-night-xxxhdpi/il_tokens_grid_column_margin.png app/src/main/res/drawable-night-xxxhdpi/il_tokens_grid_max_width.png app/src/main/res/drawable-night-xxxhdpi/il_tokens_grid_min_width.png +app/src/prod/res/drawable/ic_launcher_background.xml +app/src/prod/res/drawable/ic_launcher_foreground.xml docs/images/favicon-16x16.png docs/images/orange-logo.svg diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 36e68b48..d11a926f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,7 +32,6 @@ android { compileSdk = libs.versions.androidCompileSdk.get().toInt() defaultConfig { - applicationId = project.findTypedProperty("applicationId") ?: "com.orange.ouds.app" minSdk = libs.versions.androidMinSdk.get().toInt() targetSdk = libs.versions.androidTargetSdk.get().toInt() versionCode = project.findTypedProperty("versionCode")?.toInt() ?: 1 @@ -78,6 +77,23 @@ android { } } + val versionFlavorDimension = "version" + flavorDimensions.add(versionFlavorDimension) + productFlavors { + create("alpha") { + dimension = versionFlavorDimension + applicationId = "com.orange.ouds.alpha.app" + } + create("beta") { + dimension = versionFlavorDimension + applicationId = "com.orange.ouds.beta.app" + } + create("prod") { + dimension = versionFlavorDimension + applicationId = "com.orange.ouds.app" + } + } + kotlin { jvmToolchain(17) compilerOptions { diff --git a/app/google-services.json b/app/google-services.json index 5398d5eb..04294573 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -5,6 +5,25 @@ "storage_bucket": "ouds-f91d8.appspot.com" }, "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:756919609448:android:22744c13139c261a54f3dd", + "android_client_info": { + "package_name": "com.orange.ouds.alpha.app" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCAqxL90WNlSvstZOmrIZIMwS68GunWRDE" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:756919609448:android:635d277f6d88a44154f3dd", @@ -24,6 +43,25 @@ } } }, + { + "client_info": { + "mobilesdk_app_id": "1:756919609448:android:ceefd1e4efd5d68654f3dd", + "android_client_info": { + "package_name": "com.orange.ouds.beta.app" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCAqxL90WNlSvstZOmrIZIMwS68GunWRDE" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:756919609448:android:08045c141d8ea56d54f3dd", diff --git a/app/src/alpha/res/drawable-v24/ic_launcher_background.xml b/app/src/alpha/res/drawable-v24/ic_launcher_background.xml new file mode 100644 index 00000000..1438fe7c --- /dev/null +++ b/app/src/alpha/res/drawable-v24/ic_launcher_background.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/alpha/res/drawable/ic_launcher_foreground.xml b/app/src/alpha/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..19056d88 --- /dev/null +++ b/app/src/alpha/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/alpha/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/alpha/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/alpha/res/mipmap-hdpi/ic_launcher.webp b/app/src/alpha/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..7aa6995b Binary files /dev/null and b/app/src/alpha/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/alpha/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/alpha/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..08eb5b6b Binary files /dev/null and b/app/src/alpha/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/alpha/res/mipmap-mdpi/ic_launcher.webp b/app/src/alpha/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..49933768 Binary files /dev/null and b/app/src/alpha/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/alpha/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/alpha/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..dc69ec27 Binary files /dev/null and b/app/src/alpha/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/alpha/res/mipmap-xhdpi/ic_launcher.webp b/app/src/alpha/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..5e450f1c Binary files /dev/null and b/app/src/alpha/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/alpha/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/alpha/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..d0dd3ee5 Binary files /dev/null and b/app/src/alpha/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/alpha/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..23f7c253 Binary files /dev/null and b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..0ee1c3c7 Binary files /dev/null and b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..e5751a89 Binary files /dev/null and b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..4b55b760 Binary files /dev/null and b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/beta/res/drawable-v24/ic_launcher_background.xml b/app/src/beta/res/drawable-v24/ic_launcher_background.xml new file mode 100644 index 00000000..1438fe7c --- /dev/null +++ b/app/src/beta/res/drawable-v24/ic_launcher_background.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/beta/res/drawable/ic_launcher_foreground.xml b/app/src/beta/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..dfa70133 --- /dev/null +++ b/app/src/beta/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..34520ab9 --- /dev/null +++ b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..34520ab9 --- /dev/null +++ b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/beta/res/mipmap-hdpi/ic_launcher.webp b/app/src/beta/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..6e8dafc9 Binary files /dev/null and b/app/src/beta/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..422bf7ce Binary files /dev/null and b/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/beta/res/mipmap-mdpi/ic_launcher.webp b/app/src/beta/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..3c18be9b Binary files /dev/null and b/app/src/beta/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..a93d2477 Binary files /dev/null and b/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp b/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..183d28b9 Binary files /dev/null and b/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..8735a642 Binary files /dev/null and b/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..627abeee Binary files /dev/null and b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..0b39d074 Binary files /dev/null and b/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..f0567569 Binary files /dev/null and b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..4d71adcb Binary files /dev/null and b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..12a24b88 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9c..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d11..00000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78e..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f508..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/prod/res/drawable/ic_launcher_background.xml b/app/src/prod/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..a08a893b --- /dev/null +++ b/app/src/prod/res/drawable/ic_launcher_background.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/app/src/prod/res/drawable/ic_launcher_foreground.xml b/app/src/prod/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..1d17eff7 --- /dev/null +++ b/app/src/prod/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/app/src/prod/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/prod/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..34520ab9 --- /dev/null +++ b/app/src/prod/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/prod/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/prod/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..34520ab9 --- /dev/null +++ b/app/src/prod/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/prod/res/mipmap-hdpi/ic_launcher.webp b/app/src/prod/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..4c7ec9c0 Binary files /dev/null and b/app/src/prod/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/prod/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/prod/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..60550e8b Binary files /dev/null and b/app/src/prod/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/prod/res/mipmap-mdpi/ic_launcher.webp b/app/src/prod/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..8494755c Binary files /dev/null and b/app/src/prod/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/prod/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/prod/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..33e4944b Binary files /dev/null and b/app/src/prod/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/prod/res/mipmap-xhdpi/ic_launcher.webp b/app/src/prod/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..b05d1dfb Binary files /dev/null and b/app/src/prod/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/prod/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/prod/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..37d78d4a Binary files /dev/null and b/app/src/prod/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/prod/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/prod/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..0680a943 Binary files /dev/null and b/app/src/prod/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/prod/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/prod/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..2afb9c55 Binary files /dev/null and b/app/src/prod/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/prod/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/prod/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..ef7a2a66 Binary files /dev/null and b/app/src/prod/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/prod/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/prod/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..974d951c Binary files /dev/null and b/app/src/prod/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/build.gradle.kts b/build.gradle.kts index 0ba96bb1..bba0574d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,8 +24,4 @@ plugins { checkNotice { additionalResourcePaths += "$rootDir/docs/images" - excludedResourcePaths += listOf( - "$rootDir/app/src/main/res/drawable/ic_launcher_foreground.xml", - "$rootDir/app/src/main/res/drawable/ic_launcher_background.xml" - ) } diff --git a/buildSrc/src/main/kotlin/check-notice.gradle.kts b/buildSrc/src/main/kotlin/check-notice.gradle.kts index 5d08553c..61086e3d 100644 --- a/buildSrc/src/main/kotlin/check-notice.gradle.kts +++ b/buildSrc/src/main/kotlin/check-notice.gradle.kts @@ -70,17 +70,32 @@ tasks.register("checkNotice") { } // Check if resources listed in NOTICE.txt exist - noticeResources.forEach { noticeResource -> - if (!noticeResource.exists()) { - throw GradleException("File ${noticeResource.path.removePrefix("${rootDir.path}/")} is listed in NOTICE.txt but does not exist.") - } - } + val surplusResources = noticeResources.filter { !it.exists() } // Check if resources are missing in NOTICE.txt - resources.forEach { resource -> - if (!noticeResources.contains(resource)) { - throw GradleException("File ${resource.path.removePrefix("${rootDir.path}/")} is not listed in NOTICE.txt.") + val missingResources = resources.filter { !noticeResources.contains(it) } + + if (surplusResources.isNotEmpty() || missingResources.isNotEmpty()) { + val message = buildString { + if (surplusResources.isNotEmpty()) { + appendLine( + """ + |One or more files are listed in NOTICE.txt but do not exist: + |${surplusResources.joinToString("\n") { " ${it.path.removePrefix("${rootDir.path}/")}" }} + """.trimMargin() + ) + } + if (missingResources.isNotEmpty()) { + appendLine( + """ + |One or more files are not listed in NOTICE.txt: + |${missingResources.joinToString("\n") { " ${it.path.removePrefix("${rootDir.path}/")}" }} + """.trimMargin() + ) + } } + + throw GradleException(message) } logger.lifecycle("NOTICE.txt is up to date.") diff --git a/buildSrc/src/main/kotlin/com/orange/ouds/gradle/MavenCentralPublishPluginExtension.kt b/buildSrc/src/main/kotlin/com/orange/ouds/gradle/MavenCentralPublishPluginExtension.kt index 61f8d7c4..fde5af92 100644 --- a/buildSrc/src/main/kotlin/com/orange/ouds/gradle/MavenCentralPublishPluginExtension.kt +++ b/buildSrc/src/main/kotlin/com/orange/ouds/gradle/MavenCentralPublishPluginExtension.kt @@ -16,7 +16,7 @@ abstract class MavenCentralPublishPluginExtension { companion object { const val NAME = "mavenCentralPublish" - const val VARIANT = "release" + const val VARIANT = "prodRelease" } var artifactId: String? = null diff --git a/buildSrc/src/main/kotlin/release.gradle.kts b/buildSrc/src/main/kotlin/release.gradle.kts index a209e13e..b6e52573 100644 --- a/buildSrc/src/main/kotlin/release.gradle.kts +++ b/buildSrc/src/main/kotlin/release.gradle.kts @@ -71,7 +71,7 @@ fun updateChangelog(version: String) { val gitChangelogApi = createGitChangelogApi() .withUntaggedName(version) // Group unreleased commits under the new version tag - .withIgnoreTagsIfNameMatches("^refs/tags/ci/(daily|review)-.*") // Ignore ci/daily and ci/review tags + .withIgnoreTagsIfNameMatches("^refs/tags/ci/.*") // Ignore CI tags .withTemplatePath("CHANGELOG.mustache") // Use a Mustache template to generate changelog .withHandlebarsHelper("commitDescriptionWithPullRequestUrl", Helper { commit, options -> // This Handlebars helper returns an enriched commit description