Merge pull request #509 from Orange-OpenSource/develop

Release 0.12.0
Orange-OpenSource · Apr 6, 2023 · c146ddb · c146ddb
2 parents 837e89d + b15a4c8
commit c146ddb
Show file tree

Hide file tree

Showing 679 changed files with 9,880 additions and 3,234 deletions.
diff --git a/.github/actions/app-distribution/action.yml b/.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 demo:appDistributionUpload -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=release -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/actions/setup-signing/action.yml b/.github/actions/setup-signing/action.yml
@@ -24,7 +24,7 @@ runs:
       run: |
         SIGNING_STORE_FOLDER_PATH=${RUNNER_TEMP}/keystore
         echo "SIGNING_STORE_FOLDER_PATH=${SIGNING_STORE_FOLDER_PATH}" >> $GITHUB_ENV
-        echo "SIGNING_STORE_FILE_PATH=${SIGNING_STORE_FOLDER_PATH}/demo.keystore" >> $GITHUB_ENV
+        echo "SIGNING_STORE_FILE_PATH=${SIGNING_STORE_FOLDER_PATH}/app.keystore" >> $GITHUB_ENV
         echo "SIGNING_STORE_PASSWORD=${{ inputs.store-password }}" >> $GITHUB_ENV
         echo "SIGNING_KEY_ALIAS=${{ inputs.key-alias }}" >> $GITHUB_ENV
         echo "SIGNING_KEY_PASSWORD=${{ inputs.key-password }}" >> $GITHUB_ENV

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -48,11 +48,11 @@ jobs:
           COMMIT_SHA=${BRANCH_SHA:-$GITHUB_SHA}
           ./gradlew assemble -PversionNameSuffix="-${COMMIT_SHA::7}" -PversionCode=$GITHUB_RUN_NUMBER --stacktrace
 
-      - name: Store demo artifacts
+      - name: Store app artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: demo
-          path: demo/build/outputs/apk/*/*.apk
+          name: app
+          path: app/build/outputs/apk/*/*.apk
 
       - name: Store lib artifacts
         uses: actions/upload-artifact@v3
@@ -146,13 +146,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  app-distribution-release:
+  google-play-store-release:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     needs: build
     environment:
-      name: app-distribution-release
-      url: https://appdistribution.firebase.google.com/testerapps
+      name: google-play-store-release
+      url: https://play.google.com/store/apps
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -165,18 +165,13 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
-      - name: Set up signing configuration
-        uses: ./.github/actions/setup-signing
-        with:
-          keystore: ${{ secrets.SIGNING_KEYSTORE }}
-          store-password: ${{ secrets.SIGNING_STORE_PASSWORD }}
-          key-alias: ${{ secrets.SIGNING_KEY_ALIAS }}
-          key-password: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      - name: Build unsigned APK and bundle for Google Play Store
+        run: ./gradlew assembleRelease bundleRelease
 
-      - name: Upload APK to Firebase App Distribution
-        uses: ./.github/actions/app-distribution
+      - name: Store Google Play Store artifacts
+        uses: actions/upload-artifact@v3
         with:
-          git-tag-prefix: 'ci/release-demo'
-          group: 'ods-demo-android'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          firebase-token: ${{ secrets.FIREBASE_TOKEN }}
+          name: google-play-store
+          path: |
+            app/build/outputs/apk/*/*.apk
+            app/build/outputs/bundle/*/*.aab
diff --git a/.github/workflows/app-distribution-daily.yml b/.github/workflows/app-distribution-daily.yml
@@ -32,7 +32,7 @@ jobs:
         uses: ./.github/actions/app-distribution
         with:
           append-git-sha-to-version-name: 'true'
-          git-tag-prefix: 'ci/daily-demo'
+          git-tag-prefix: 'ci/daily-app'
           group: 'ods-android-internal-tests'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           firebase-token: ${{secrets.FIREBASE_TOKEN}}
diff --git a/DEVELOP.md b/DEVELOP.md
@@ -18,6 +18,19 @@ repositories {
 
 ```groovy
 dependencies {
-    implementation 'com.orange.ods.android:ods-lib:0.11.1'
+    implementation 'com.orange.ods.android:ods-lib:0.12.0'
 }
 ```
+
+## Documentation
+
+Execute the commands below to generate and run the documentation:
+
+1. `cd docs`
+2. `bundle config set --local path 'vendor/bundle'`
+3. `bundle install`
+4. `bundle exec jekyll serve --trace --watch --force_polling --livereload --livereload-port 4001`
+
+If you encounter errors during installation and your platform is not listed in the `PLATFORMS` section of `Gemfile.lock`, you can optionally run `bundle platform` to retrieve your platform, then `bundle lock --add-platform <your_platform>` to install specific dependencies for you platform.
+
+Finally, open your browser and go to http://127.0.0.1:4000/ods-android/