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 Nov 6, 2021
2 parents 8b3d4e6 + b09f27c commit 57675dc
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 8 deletions.
40 changes: 36 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ env:
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
BASE_URL_BACKEND: ${{ secrets.BASE_URL_BACKEND }}
BASE_URL_API: ${{ secrets.BASE_URL_API }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

jobs:

GradleBuild:
runs-on: macos-latest
runs-on: ubuntu-latest
outputs:
status: ${{ steps.status.outputs.status }}
steps:
Expand Down Expand Up @@ -121,14 +122,45 @@ jobs:
id: status
run: echo "::set-output name=status::success"

Kover:
runs-on: ubuntu-latest
outputs:
status: ${{ steps.status.outputs.status }}
steps:

- name: Clone Repo
uses: actions/checkout@v2

- name: Checkout submodules
run: git submodule update --init --recursive

- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11

- name: Run Kover
run: |
./gradlew koverCollectReports --parallel
- name: Upload to Codecov
uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: client/build/reports/kover/report.xml, common/build/reports/kover/report.xml, scopemob/build/reports/kover/report.xml, parsermob/build/reports/kover/report.xml

- name: Set Job Status
id: status
run: echo "::set-output name=status::success"

Notify:
runs-on: ubuntu-latest
needs: [ GradleBuild, XCodeBuild ]
needs: [ GradleBuild, XCodeBuild, Kover ]
if: always()
steps:

- name: Notify slack success
if: needs.GradleBuild.outputs.status == 'success' && needs.XCodeBuild.outputs.status == 'success'
if: needs.GradleBuild.outputs.status == 'success' && needs.XCodeBuild.outputs.status == 'success' && needs.Kover.outputs.status == 'success'
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: voxmedia/github-action-slack-notify-build@v1
Expand All @@ -138,7 +170,7 @@ jobs:
color: good

- name: Notify slack fail
if: false == (needs.GradleBuild.outputs.status == 'success') || false == (needs.XCodeBuild.outputs.status == 'success')
if: false == (needs.GradleBuild.outputs.status == 'success') || false == (needs.XCodeBuild.outputs.status == 'success') || false == (needs.Kover.outputs.status == 'success')
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: voxmedia/github-action-slack-notify-build@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:

GenerateArtifacts:
runs-on: macos-latest
runs-on: ubuntu-latest
outputs:
status: ${{ steps.status.outputs.status }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<p align="center">A currency converter application for most of the currencies used in the world.</p>
<p align="center">You can quickly convert and make mathematical operations between currencies.</p>
<p align="center"><a href="https://play.google.com/store/apps/details?id=mustafaozhan.github.com.mycurrencies"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="300px"></a></p>
<p align="center"><a href="https://www.codacy.com/gh/CurrencyConverterCalculator/CCC?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CurrencyConverterCalculator/CCC&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/2196f4447c32431b80d582a21ad749db"/></a> <img src="https://github.com/CurrencyConverterCalculator/CCC/workflows/CCC%20CI/badge.svg"> <img src="https://img.shields.io/github/last-commit/CurrencyConverterCalculator/CCC.svg"> <img src="https://img.shields.io/github/issues/CurrencyConverterCalculator/CCC.svg"> <img src="https://img.shields.io/github/issues-closed/CurrencyConverterCalculator/CCC.svg">
<p align="center"><a href="https://www.codacy.com/gh/CurrencyConverterCalculator/CCC?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CurrencyConverterCalculator/CCC&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/2196f4447c32431b80d582a21ad749db"/></a> <img src="https://codecov.io/gh/Oztechan/CCC/branch/develop/graph/badge.svg?token=Lenq2MZgM7"/> <img src="https://github.com/CurrencyConverterCalculator/CCC/workflows/CCC%20CI/badge.svg"> <img src="https://img.shields.io/github/last-commit/CurrencyConverterCalculator/CCC.svg"> <img src="https://img.shields.io/github/issues/CurrencyConverterCalculator/CCC.svg"> <img src="https://img.shields.io/github/issues-closed/CurrencyConverterCalculator/CCC.svg">
<p align="center"><a href='https://ko-fi.com/B0B2TZMH' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a></p>

## Included Currencies
Expand Down
8 changes: 6 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask

plugins {
id(Plugins.DEPENDENCY_UPDATES) version Versions.DEPENDENCY_UPDATES
id(Plugins.BUILD_HEALTH) version Versions.BUILD_HEALTH
with(Plugins) {
id(DEPENDENCY_UPDATES) version Versions.DEPENDENCY_UPDATES
id(BUILD_HEALTH) version Versions.BUILD_HEALTH
id(KOVER) version Versions.KOVER
}
}

buildscript {
Expand All @@ -25,6 +28,7 @@ buildscript {
classpath(SQL_DELIGHT)
classpath(MOKO_RESOURCES)
classpath(BUILD_KONFIG)
classpath(KOVER)
}
}
}
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/ClassPaths.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ object ClassPaths {
const val MOKO_RESOURCES = "dev.icerock.moko:resources-generator:${Versions.MOKO_RESOURCES}"
const val BUILD_KONFIG =
"com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:${Versions.BUILD_KONFIG}"
const val KOVER = "org.jetbrains.kotlinx:kover:${Versions.KOVER}"
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Plugins.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ object Plugins {
const val MOKO_RESOURCES = "dev.icerock.mobile.multiplatform-resources"
const val DEPENDENCY_UPDATES = "com.github.ben-manes.versions"
const val BUILD_HEALTH = "com.autonomousapps.dependency-analysis"
const val KOVER = "org.jetbrains.kotlinx.kover"
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ object Versions {
const val BUILD_KONFIG = "0.11.0"
const val WORK_RUNTIME = "2.7.0"
const val SPLASH_SCREEN = "1.0.0-alpha02"
const val KOVER = "0.4.1"
}

0 comments on commit 57675dc

Please sign in to comment.