Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Android 15 #250

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 5 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ root = true
end_of_line = lf
insert_final_newline = true

[*.java]
[{*.java,*.gradle,*.kt,*.kts,*.json}]
charset = utf-8
indent_style = space
intent_size = 2
indent_size = 2
ij_continuation_indent_size = 2
trim_trailing_whitespace = true

[*.xml]
charset = utf-8
indent_style = space
intent_size = 2
indent_size = 2
ij_continuation_indent_size = 2
trim_trailing_whitespace = true
94 changes: 60 additions & 34 deletions .github/workflows/flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,77 @@ name: CI
on:
pull_request:
branches:
- master
- main
- development
push:
branches:
- master
- main
- development

concurrency:
group: build-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
JVM_OPTS: -Xmx3200m

jobs:
build:
check:
timeout-minutes: 30
runs-on: ubuntu-latest
env:
JVM_OPTS: -Xmx3200m
CC_TEST_REPORTER_ID: 4c45cf8b47a2ab0a5ae149b266e533747e8c3330aa3f5e7d2898d460c6d11562
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Static analysis
run: ./gradlew app:staticAnalysis app:collectSarifReports --continue --no-daemon

- name: Upload Report
uses: github/codeql-action/upload-sarif@v3
if: ${{ always() }}
with:
sarif_file: app/build/reports/sarif/
test:
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
java-version: 13
- name: Download Dependencies
run: ./gradlew androidDependencies
- name: Cache dependencies
uses: actions/cache@v2
persist-credentials: false

- name: Set up JDK
uses: actions/setup-java@v4
with:
path: |
~/.gradle
key: jars-{{ hashFiles('build.gradle') }}-{{ hashFiles('app/build.gradle') }}
- name: Lint
run: ./gradlew ktlint
- name: Setup Code Climate test-reporter
run: |
# download test reporter as a static binary
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Run Tests
run: |
./gradlew jacocoTestReport -PdisablePreDex --continue --stacktrace --no-daemon --max-workers 4
- name: Upload coverage
run: bash <(curl -s https://codecov.io/bash)
- name: Set jacoco.xml path for code climate
run: JACOCO_SOURCE_PATH=app/src/main/java ./cc-test-reporter format-coverage app/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml --input-type jacoco
- name: Upload code climate report
if: success()
run: ./cc-test-reporter upload-coverage -r $CC_TEST_REPORTER_ID
- uses: actions/upload-artifact@v2
run: ./gradlew koverXmlReport --continue --no-daemon

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
with:
files: ./app/build/reports/kover/project-xml/report.xml
token: ${{ secrets.CODECOV_TOKEN }}

- uses: actions/upload-artifact@v4
with:
name: test-results
path: app/build/test-results

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ gradle.properties
/app/google-services.json
hs_err_pid*.log
replay_pid*.log

.kotlin
80 changes: 0 additions & 80 deletions .travis.yml

This file was deleted.

Loading
Loading