Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mustafaozhan committed Oct 4, 2023
2 parents 1a61b3a + 8e167c2 commit 140b890
Show file tree
Hide file tree
Showing 75 changed files with 398 additions and 505 deletions.
63 changes: 27 additions & 36 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
steps:

- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0
with:
submodules: 'recursive'
fetch-depth: 0
Expand All @@ -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
uses: actions/setup-java@v3.13.0
with:
java-version: 17
distribution: 'temurin'

- name: Assemble
uses: gradle/gradle-build-action@v2.8.0
uses: gradle/gradle-build-action@v2.9.0
with:
arguments: assemble

- name: Upload Android Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
if: github.event_name == 'push'
with:
name: androidArtifacts
Expand All @@ -120,23 +120,23 @@ jobs:
steps:

- name: Clone Repo # Needed for reading commit message for Firebase App Distribution
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0

- name: Download Android Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v3.0.2
with:
name: androidArtifacts

- name: Firebase App Distribution Google
uses: wzieba/Firebase-Distribution-Github-Action@v1.5.1
uses: wzieba/Firebase-Distribution-Github-Action@v1.6.0
with:
appId: ${{secrets.ANDROID_GOOGLE_FIREBASE_APP_ID}}
token: ${{secrets.FIREBASE_CLI_TOKEN}}
groups: QA
file: google/release/app-google-release.apk

- name: Firebase App Distribution Huawei
uses: wzieba/Firebase-Distribution-Github-Action@v1.5.1
uses: wzieba/Firebase-Distribution-Github-Action@v1.6.0
with:
appId: ${{secrets.ANDROID_HUAWEI_FIREBASE_APP_ID}}
token: ${{secrets.FIREBASE_CLI_TOKEN}}
Expand All @@ -159,7 +159,7 @@ jobs:
steps:

- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0
with:
submodules: 'recursive'
fetch-depth: 0
Expand All @@ -184,25 +184,17 @@ 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
uses: actions/setup-java@v3.13.0
with:
java-version: 17
distribution: 'temurin'

- name: Generate Pods
uses: gradle/[email protected]
with:
arguments: :ios:provider:podGenIOS :client:core:res:podGenIOS --parallel

- name: Build
run: |
cd ios/CCC
pod install --repo-update
cd ..
fastlane build
working-directory: ios
run: fastlane build

- name: Upload iOS Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
if: github.event_name == 'push'
with:
name: iOSArtifacts
Expand All @@ -226,18 +218,17 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0

- name: Download iOS IPA
uses: actions/download-artifact@v3
uses: actions/download-artifact@v3.0.2
with:
name: iOSArtifacts
path: ios

- name: Distribute
run: |
cd ios
fastlane distribute
working-directory: ios
run: fastlane distribute

- name: Delete iOS IPA
uses: geekyeggo/[email protected]
Expand All @@ -255,23 +246,23 @@ jobs:
steps:

- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0
with:
submodules: 'recursive'

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v3.13.0
with:
java-version: 17
distribution: 'temurin'

- name: Run Quality Jobs
uses: gradle/gradle-build-action@v2.8.0
uses: gradle/gradle-build-action@v2.9.0
with:
arguments: check koverMergedXmlReport --parallel

- name: Upload Coverage Report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
with:
name: coverageReport
path: build/reports/kover/merged/xml/report.xml
Expand All @@ -291,10 +282,10 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Clone Repo # Codecov requires it
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0

- name: Download Coverage Report
uses: actions/download-artifact@v3
uses: actions/download-artifact@v3.0.2
with:
name: coverageReport
path: build
Expand All @@ -312,7 +303,7 @@ jobs:
coverage-reports: build/report.xml

- name: SonarCloud Scan
uses: sonarsource/[email protected].1
uses: sonarsource/[email protected].2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand All @@ -338,18 +329,18 @@ jobs:
steps:

- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0
with:
submodules: 'recursive'

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v3.13.0
with:
java-version: 17
distribution: 'temurin'

- name: Detekt
uses: gradle/gradle-build-action@v2.8.0
uses: gradle/gradle-build-action@v2.9.0
with:
arguments: detektAll

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: 'Add issue to project'
if: github.event_name == 'issues' && (github.event.action == 'opened' || github.event.action == 'reopened')
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
uses: leonsteinhaeuser/project-beta-automations@v2.2.1
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
Expand All @@ -29,7 +29,7 @@ jobs:

- 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/project-beta-automations@v2.1.0
uses: leonsteinhaeuser/project-beta-automations@v2.2.1
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
Expand All @@ -40,7 +40,7 @@ jobs:

- 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/project-beta-automations@v2.1.0
uses: leonsteinhaeuser/project-beta-automations@v2.2.1
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
Expand All @@ -51,7 +51,7 @@ jobs:

- name: 'Move Related Issue to "🚧 In Progress"'
if: github.event_name == 'pull_request' && github.event.action == 'converted_to_draft'
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
uses: leonsteinhaeuser/project-beta-automations@v2.2.1
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
Expand All @@ -62,7 +62,7 @@ jobs:

- name: 'Move Related Issue to "✅ Done"'
if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
uses: leonsteinhaeuser/project-beta-automations@v2.2.1
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
uses: marvinpinto/[email protected]
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: false

- name: Set Job Status
id: status
Expand Down
38 changes: 15 additions & 23 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
steps:

- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0
with:
submodules: 'recursive'
fetch-depth: 0
Expand All @@ -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@v3
uses: actions/setup-java@v3.13.0
with:
java-version: 17
distribution: 'temurin'

- name: Generate Artifacts
uses: gradle/gradle-build-action@v2.8.0
uses: gradle/gradle-build-action@v2.9.0
with:
arguments: :android:app:bundleRelease :backend:app:jar --parallel

- name: Upload Google App Bundle
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
with:
name: googleBundle
path: android/app/build/outputs/bundle/googleRelease/app-google-release.aab

- name: Upload Huawei App Bundle
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
with:
name: huaweiBundle
path: android/app/build/outputs/bundle/huaweiRelease/app-huawei-release.aab

- name: Upload Backend Jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
with:
name: backendJar
path: backend/app/build/libs/app-*.jar
Expand All @@ -119,7 +119,7 @@ jobs:
steps:

- name: Download App Bundle
uses: actions/download-artifact@v3
uses: actions/download-artifact@v3.0.2
with:
name: googleBundle

Expand All @@ -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].1
uses: r0adkll/[email protected].2
with:
serviceAccountJson: service_account.json
packageName: mustafaozhan.github.com.mycurrencies
Expand All @@ -154,7 +154,7 @@ jobs:
steps:

- name: Download App Bundle
uses: actions/download-artifact@v3
uses: actions/download-artifact@v3.0.2
with:
name: huaweiBundle

Expand Down Expand Up @@ -185,13 +185,13 @@ jobs:
steps:

- name: Download Backend Jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v3.0.2
with:
name: backendJar
path: artifact

- name: Deploy to Server
uses: easingthemes/[email protected].8
uses: easingthemes/[email protected].9
env:
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
Expand All @@ -214,13 +214,13 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Clone Repo
uses: actions/checkout@v3
uses: actions/checkout@v4.1.0
with:
submodules: 'recursive'
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v3.13.0
with:
java-version: 17
distribution: 'temurin'
Expand All @@ -234,17 +234,9 @@ jobs:
echo "${{ secrets.IOS_GPG_RELEASE_XCCONFIG }}" > Release.xcconfig.asc
gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release/Config.xcconfig
- name: Generate Pods
uses: gradle/[email protected]
with:
arguments: :ios:provider:podGenIOS :client:core:res:podGenIOS --parallel

- name: StoreBuild
run: |
cd ios/CCC
pod install --repo-update
cd ..
fastlane store_build
working-directory: ios
run: fastlane store_build

- name: Set Job Status
id: status
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@ secret.properties
# submodules
/submodule

# Pods files
client/core/res/res.podspec
ios/provider/provider.podspec

# iOS Project
ios/Pods/
ios/CCC/Resources/Release/
ios/CCC/Resources/GoogleService-Info.plist
ios/CCC/Resources/Config.xcconfig
Expand Down
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,7 @@ Open CCC folder with Android Studio and select `android:app` from configurations

### iOS

```shell
./gradlew :ios:provider:podspec :client:core:res:podspec --parallel &&
cd ios/CCC &&
pod install --repo-update
```

Then open `CCC/ios/CCC.xcworkspace` with XCode after the packages are resolved you can run the project, please not XCode version should be bigger than `13.2.1`
Open `CCC/ios/CCC.xcworkspace` with XCode after the packages are resolved you can run the project. Generally you should use the latest stable XCode version.

### Backend

Expand Down
Loading

0 comments on commit 140b890

Please sign in to comment.