-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop'
- Loading branch information
Showing
29 changed files
with
351 additions
and
398 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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@v3.13.0 | ||
| uses: actions/setup-java@v4.0.0 | ||
| with: | ||
| java-version: 17 | ||
| distribution: 'temurin' | ||
|
|
||
| - name: Assemble | ||
| uses: gradle/gradle-build-action@v2.9.0 | ||
| uses: gradle/gradle-build-action@v2.11.1 | ||
| with: | ||
| arguments: assemble | ||
|
|
||
| - name: Upload Android Artifacts | ||
| uses: actions/upload-artifact@v3.1.3 | ||
| uses: actions/upload-artifact@v4.0.0 | ||
| if: github.event_name == 'push' | ||
| with: | ||
| name: androidArtifacts | ||
|
|
@@ -123,7 +123,7 @@ jobs: | |
| uses: actions/[email protected] | ||
|
|
||
| - name: Download Android Artifacts | ||
| uses: actions/download-artifact@v3.0.2 | ||
| uses: actions/download-artifact@v4.1.1 | ||
| with: | ||
| name: androidArtifacts | ||
|
|
||
|
|
@@ -144,8 +144,9 @@ jobs: | |
| file: huawei/release/app-huawei-release.apk | ||
|
|
||
| - name: Delete Android Artifacts | ||
| uses: geekyeggo/delete-artifact@v2.0.0 | ||
| uses: geekyeggo/delete-artifact@v4.0.0 | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| name: androidArtifacts | ||
|
|
||
| - name: Set Job Status | ||
|
|
@@ -184,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@v3.13.0 | ||
| uses: actions/setup-java@v4.0.0 | ||
| with: | ||
| java-version: 17 | ||
| distribution: 'temurin' | ||
|
|
@@ -194,7 +195,7 @@ jobs: | |
| run: fastlane build | ||
|
|
||
| - name: Upload iOS Artifacts | ||
| uses: actions/upload-artifact@v3.1.3 | ||
| uses: actions/upload-artifact@v4.0.0 | ||
| if: github.event_name == 'push' | ||
| with: | ||
| name: iOSArtifacts | ||
|
|
@@ -221,7 +222,7 @@ jobs: | |
| uses: actions/[email protected] | ||
|
|
||
| - name: Download iOS IPA | ||
| uses: actions/download-artifact@v3.0.2 | ||
| uses: actions/download-artifact@v4.1.1 | ||
| with: | ||
| name: iOSArtifacts | ||
| path: ios | ||
|
|
@@ -231,8 +232,9 @@ jobs: | |
| run: fastlane distribute | ||
|
|
||
| - name: Delete iOS IPA | ||
| uses: geekyeggo/delete-artifact@v2.0.0 | ||
| uses: geekyeggo/delete-artifact@v4.0.0 | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| name: iOSArtifacts | ||
|
|
||
| - name: Set Job Status | ||
|
|
@@ -251,18 +253,18 @@ jobs: | |
| submodules: 'recursive' | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3.13.0 | ||
| uses: actions/setup-java@v4.0.0 | ||
| with: | ||
| java-version: 17 | ||
| distribution: 'temurin' | ||
|
|
||
| - name: Run Quality Jobs | ||
| uses: gradle/gradle-build-action@v2.9.0 | ||
| uses: gradle/gradle-build-action@v2.11.1 | ||
| with: | ||
| arguments: check koverMergedXmlReport --parallel | ||
|
|
||
| - name: Upload Coverage Report | ||
| uses: actions/upload-artifact@v3.1.3 | ||
| uses: actions/upload-artifact@v4.0.0 | ||
| with: | ||
| name: coverageReport | ||
| path: build/reports/kover/merged/xml/report.xml | ||
|
|
@@ -285,7 +287,7 @@ jobs: | |
| uses: actions/[email protected] | ||
|
|
||
| - name: Download Coverage Report | ||
| uses: actions/download-artifact@v3.0.2 | ||
| uses: actions/download-artifact@v4.1.1 | ||
| with: | ||
| name: coverageReport | ||
| path: build | ||
|
|
@@ -303,7 +305,7 @@ jobs: | |
| coverage-reports: build/report.xml | ||
|
|
||
| - name: SonarCloud Scan | ||
| uses: sonarsource/sonarcloud-github-action@v2.0.2 | ||
| uses: sonarsource/sonarcloud-github-action@v2.1.1 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
|
|
@@ -314,8 +316,9 @@ jobs: | |
| -Dsonar.coverage.jacoco.xmlReportPaths=build/report.xml | ||
| - name: Delete Coverage Report | ||
| uses: geekyeggo/delete-artifact@v2.0.0 | ||
| uses: geekyeggo/delete-artifact@v4.0.0 | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| name: coverageReport | ||
|
|
||
| - name: Set Job Status | ||
|
|
@@ -334,13 +337,13 @@ jobs: | |
| submodules: 'recursive' | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3.13.0 | ||
| uses: actions/setup-java@v4.0.0 | ||
| with: | ||
| java-version: 17 | ||
| distribution: 'temurin' | ||
|
|
||
| - name: Detekt | ||
| uses: gradle/gradle-build-action@v2.9.0 | ||
| uses: gradle/gradle-build-action@v2.11.1 | ||
| with: | ||
| arguments: detektAll | ||
|
|
||
|
|
@@ -351,6 +354,10 @@ jobs: | |
| with: | ||
| args: --strict | ||
|
|
||
| - name: Cancel other jobs if this fails | ||
| if: failure() | ||
| uses: andymckay/[email protected] | ||
|
|
||
| - name: Set Job Status | ||
| id: status | ||
| run: echo "status=success" >> $GITHUB_OUTPUT | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,59 +14,7 @@ on: | |
|
|
||
| jobs: | ||
| ProjectAutomations: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: 'Add issue to project' | ||
| if: github.event_name == 'issues' && (github.event.action == 'opened' || github.event.action == 'reopened') | ||
| uses: leonsteinhaeuser/[email protected] | ||
| with: | ||
| gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
| organization: Oztechan | ||
| project_id: 2 | ||
| resource_node_id: ${{ github.event.issue.node_id }} | ||
| operation_mode: custom_field | ||
| custom_field_values: '[{\"name\": \"Iteration\",\"type\": \"iteration\",\"value\": \"@current\"}]' | ||
|
|
||
| - name: 'Move Related Issue to "🏗 PR Review"' | ||
| if: github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'ready_for_review' || github.event.action == 'reopened') | ||
| uses: leonsteinhaeuser/[email protected] | ||
| with: | ||
| gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
| organization: Oztechan | ||
| project_id: 2 | ||
| resource_node_id: ${{ github.event.pull_request.node_id }} | ||
| status_value: "🏗 PR Review" | ||
| move_related_issues: true | ||
|
|
||
| - name: 'Add Dependency PR by renovate to "🏗 PR Review"' | ||
| if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'renovate[bot]' && (github.event.action == 'opened' || github.event.action == 'ready_for_review' || github.event.action == 'reopened') | ||
| uses: leonsteinhaeuser/[email protected] | ||
| with: | ||
| gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
| organization: Oztechan | ||
| project_id: 2 | ||
| resource_node_id: ${{ github.event.pull_request.node_id }} | ||
| operation_mode: custom_field | ||
| custom_field_values: '[{\"name\": \"Iteration\",\"type\": \"iteration\",\"value\": \"@current\"}]' | ||
|
|
||
| - name: 'Move Related Issue to "🚧 In Progress"' | ||
| if: github.event_name == 'pull_request' && github.event.action == 'converted_to_draft' | ||
| uses: leonsteinhaeuser/[email protected] | ||
| with: | ||
| gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
| organization: Oztechan | ||
| project_id: 2 | ||
| resource_node_id: ${{ github.event.pull_request.node_id }} | ||
| status_value: "🚧 In Progress" | ||
| move_related_issues: true | ||
|
|
||
| - name: 'Move Related Issue to "✅ Done"' | ||
| if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true | ||
| uses: leonsteinhaeuser/[email protected] | ||
| with: | ||
| gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
| organization: Oztechan | ||
| project_id: 2 | ||
| resource_node_id: ${{ github.event.pull_request.node_id }} | ||
| status_value: "✅ Done" | ||
| move_related_issues: true | ||
| uses: Oztechan/Global/.github/workflows/reusable-project.yml@a3db254980b0b8f7931b1f591676a3a9473bfcfb | ||
| with: | ||
| project_id: 2 | ||
| secrets: inherit | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...ics/src/androidMain/kotlin/com/oztechan/ccc/client/core/analytics/AnalyticsManagerImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...fig/src/androidMain/kotlin/com/oztechan/ccc/client/core/remoteconfig/BaseConfigService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.