Merge remote-tracking branch 'origin/develop'

Oztechan · Mar 25, 2024 · 237c35d · 237c35d
2 parents f490c28 + 694dcac
commit 237c35d
Show file tree

Hide file tree

Showing 47 changed files with 441 additions and 636 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,18 +84,18 @@ jobs:
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch agconnect-services.json.asc > android/app/src/release/agconnect-services.json
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'temurin'
 
       - name: Assemble
-        uses: gradle/gradle-build-action@v2.11.1
+        uses: gradle/gradle-build-action@v3.1.0
         with:
           arguments: assemble
 
       - name: Upload Android Artifacts
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         if: github.event_name == 'push'
         with:
           name: androidArtifacts
@@ -105,7 +105,7 @@ jobs:
 
       - name: Cancel other jobs if this fails
         if: failure()
-        uses: andymckay/cancel-action@0.3
+        uses: andymckay/cancel-action@0.4
 
       - name: Set Job Status
         id: status
@@ -123,7 +123,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Download Android Artifacts
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           name: androidArtifacts
 
@@ -144,7 +144,7 @@ jobs:
           file: huawei/release/app-huawei-release.apk
 
       - name: Delete Android Artifacts
-        uses: geekyeggo/delete-artifact@v4.0.0
+        uses: geekyeggo/delete-artifact@v4.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: androidArtifacts
@@ -185,7 +185,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release/Config.xcconfig
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'temurin'
@@ -195,7 +195,7 @@ jobs:
         run: fastlane build
 
       - name: Upload iOS Artifacts
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         if: github.event_name == 'push'
         with:
           name: iOSArtifacts
@@ -205,14 +205,14 @@ jobs:
 
       - name: Cancel other jobs if this fails
         if: failure()
-        uses: andymckay/cancel-action@0.3
+        uses: andymckay/cancel-action@0.4
 
       - name: Set Job Status
         id: status
         run: echo "status=success" >> $GITHUB_OUTPUT
 
   DistributeIOS:
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     needs: [ XCodeBuild ]
     if: github.event_name == 'push'
     outputs:
@@ -222,17 +222,20 @@ jobs:
         uses: actions/[email protected]
 
       - name: Download iOS IPA
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           name: iOSArtifacts
           path: ios
 
+      # was necessary to use chown to fix permission issues in linux machines
       - name: Distribute
         working-directory: ios
-        run: fastlane distribute
+        run: |
+          sudo chown -R $(whoami) /var/lib/gems/3.0.0
+          fastlane distribute
 
       - name: Delete iOS IPA
-        uses: geekyeggo/delete-artifact@v4.0.0
+        uses: geekyeggo/delete-artifact@v4.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: iOSArtifacts
@@ -253,25 +256,25 @@ jobs:
           submodules: 'recursive'
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'temurin'
 
       - name: Run Quality Jobs
-        uses: gradle/gradle-build-action@v2.11.1
+        uses: gradle/gradle-build-action@v3.1.0
         with:
           arguments: check koverMergedXmlReport --parallel
 
       - name: Upload Coverage Report
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: coverageReport
           path: build/reports/kover/merged/xml/report.xml
 
       - name: Cancel other jobs if this fails
         if: failure()
-        uses: andymckay/cancel-action@0.3
+        uses: andymckay/cancel-action@0.4
 
       - name: Set Job Status
         id: status
@@ -287,13 +290,13 @@ jobs:
         uses: actions/[email protected]
 
       - name: Download Coverage Report
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           name: coverageReport
           path: build
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v4.1.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: build/report.xml
@@ -316,7 +319,7 @@ jobs:
             -Dsonar.coverage.jacoco.xmlReportPaths=build/report.xml
 
       - name: Delete Coverage Report
-        uses: geekyeggo/delete-artifact@v4.0.0
+        uses: geekyeggo/delete-artifact@v4.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: coverageReport
@@ -337,13 +340,13 @@ jobs:
           submodules: 'recursive'
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'temurin'
 
       - name: Detekt
-        uses: gradle/gradle-build-action@v2.11.1
+        uses: gradle/gradle-build-action@v3.1.0
         with:
           arguments: detektAll
 
@@ -356,7 +359,7 @@ jobs:
 
       - name: Cancel other jobs if this fails
         if: failure()
-        uses: andymckay/cancel-action@0.3
+        uses: andymckay/cancel-action@0.4
 
       - name: Set Job Status
         id: status

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   ProjectAutomations:
-    uses: Oztechan/Global/.github/workflows/reusable-project.yml@a3db254980b0b8f7931b1f591676a3a9473bfcfb
+    uses: Oztechan/Global/.github/workflows/reusable-project.yml@v1.0.1
     with:
       project_id: 2
     secrets: inherit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,33 +8,7 @@ on:
 jobs:
 
   PublishRelease:
-    runs-on: ubuntu-latest
-    outputs:
-      status: ${{ steps.status.outputs.status }}
-    steps:
-
-      - name: PublishRelease
-        uses: marvinpinto/[email protected]
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          prerelease: false
-
-      - name: Set Job Status
-        id: status
-        run: echo "status=success" >> $GITHUB_OUTPUT
-
-  Notify:
-    runs-on: ubuntu-latest
-    needs: [ PublishRelease ]
-    if: always()
-    steps:
-
-      - name: Notify slack fail
-        if: false == (needs.PublishRelease.outputs.status == 'success')
-        uses: voxmedia/[email protected]
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-        with:
-          channel: ccc-github
-          status: FAILED
-          color: danger
+    uses: Oztechan/Global/.github/workflows/[email protected]
+    with:
+      slack_channel: "ccc-github"
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -79,30 +79,30 @@ jobs:
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch agconnect-services.json.asc > android/app/src/release/agconnect-services.json
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'temurin'
 
       - name: Generate Artifacts
-        uses: gradle/gradle-build-action@v2.11.1
+        uses: gradle/gradle-build-action@v3.1.0
         with:
           arguments: :android:app:bundleRelease :backend:app:jar --parallel
 
       - name: Upload Google App Bundle
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: googleBundle
           path: android/app/build/outputs/bundle/googleRelease/app-google-release.aab
 
       - name: Upload Huawei App Bundle
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: huaweiBundle
           path: android/app/build/outputs/bundle/huaweiRelease/app-huawei-release.aab
 
       - name: Upload Backend Jar
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: backendJar
           path: backend/app/build/libs/app-*.jar
@@ -119,7 +119,7 @@ jobs:
     steps:
 
       - name: Download App Bundle
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           name: googleBundle
 
@@ -129,7 +129,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch service_account.json.asc > service_account.json
 
       - name: Upload Artifact to Google Play Console
-        uses: r0adkll/[email protected].2
+        uses: r0adkll/[email protected].3
         with:
           serviceAccountJson: service_account.json
           packageName: mustafaozhan.github.com.mycurrencies
@@ -138,7 +138,7 @@ jobs:
           status: completed
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v4.0.0
+        uses: geekyeggo/delete-artifact@v4.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: googleBundle
@@ -155,7 +155,7 @@ jobs:
     steps:
 
       - name: Download App Bundle
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           name: huaweiBundle
 
@@ -170,7 +170,7 @@ jobs:
           file-name: "app-huawei-release"
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v4.0.0
+        uses: geekyeggo/delete-artifact@v4.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: huaweiBundle
@@ -187,13 +187,13 @@ jobs:
     steps:
 
       - name: Download Backend Jar
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           name: backendJar
           path: artifact
 
       - name: Deploy to Server
-        uses: easingthemes/[email protected].0
+        uses: easingthemes/[email protected].3
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
@@ -202,7 +202,7 @@ jobs:
           SOURCE: "artifact/"
 
       - name: Delete Backend Jar
-        uses: geekyeggo/delete-artifact@v4.0.0
+        uses: geekyeggo/delete-artifact@v4.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: backendJar
@@ -223,7 +223,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'temurin'

diff --git a/android/ui/mobile/src/main/res/navigation/main_graph.xml b/android/ui/mobile/src/main/res/navigation/main_graph.xml
@@ -4,8 +4,7 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_graph"
-    app:startDestination="@id/calculatorFragment">
+    android:id="@+id/main_graph">
 
     <fragment
         android:id="@+id/calculatorFragment"

diff --git a/...model/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModel.kt b/...model/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModel.kt
@@ -66,7 +66,9 @@ class WidgetViewModel(
         currencyDataSource.getActiveCurrencies()
             .filterNot { it.code == calculationStorage.currentBase }
             .onEach {
-                it.rate = conversion.getRateFromCode(it.code)?.getFormatted(calculationStorage.precision).orEmpty()
+                it.rate =
+                    conversion.getRateFromCode(it.code)?.getFormatted(calculationStorage.precision)
+                        .orEmpty()
             }
             .take(MAXIMUM_NUMBER_OF_CURRENCY)
             .let { currencyList ->