Skip to content

Commit 8687a8d

Browse files
authored
Merge pull request #13 from SecUSo/development
Update gradle, target sdk and dependencies
2 parents 0af5db3 + 351cbb4 commit 8687a8d

File tree

18 files changed

+140
-240
lines changed

18 files changed

+140
-240
lines changed

.github/workflows/android-test.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Android Emulator Tests
2+
on: [push, pull_request]
3+
4+
jobs:
5+
check-if-tests-exist:
6+
runs-on: ubuntu-latest
7+
outputs:
8+
status: ${{ steps.check-androidTest.outputs.NOT_EMPTY }}
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v3
12+
with:
13+
submodules: "recursive"
14+
- name: Check if androidTest folder is not empty
15+
run: |
16+
echo "NOT_EMPTY=$([ "$(ls -A BackupAPI/src/androidTest)" ] && echo 'true' || echo 'false')"
17+
echo "NOT_EMPTY=$([ "$(ls -A BackupAPI/src/androidTest)" ] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT
18+
id: check-androidTest
19+
test:
20+
needs: check-if-tests-exist
21+
if: needs.check-if-tests-exist.outputs.status == 'true'
22+
runs-on: macos-latest
23+
strategy:
24+
matrix:
25+
api-level: [29]
26+
target: [default]
27+
arch: [x86_64]
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v3
31+
with:
32+
submodules: "recursive"
33+
34+
- name: Set up JDK environment
35+
uses: actions/setup-java@v3
36+
with:
37+
distribution: "zulu"
38+
java-version: 17
39+
40+
- name: Gradle cache
41+
uses: gradle/gradle-build-action@v2
42+
43+
- name: Run connected tests
44+
uses: ReactiveCircus/android-emulator-runner@v2
45+
with:
46+
api-level: ${{ matrix.api-level }}
47+
target: ${{ matrix.target }}
48+
arch: ${{ matrix.arch }}
49+
profile: Nexus 6
50+
disable-animations: true
51+
script: bash ./gradlew :BackupAPI:connectedCheck --stacktrace

.github/workflows/changelog.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
- uses: rhysd/changelog-from-release/action@v3
1717
with:
1818
file: CHANGELOG.md
19-
pull_request: true
2019
github_token: ${{ secrets.GITHUB_TOKEN }}
2120
commit_summary_template: 'update changelog for %s changes'
2221
args: -l 2

.github/workflows/ci.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Continuous Integration
2+
on: [push, pull_request]
3+
4+
jobs:
5+
test:
6+
runs-on: ubuntu-20.04
7+
steps:
8+
- name: Checkout
9+
uses: actions/checkout@v3
10+
with:
11+
submodules: "recursive"
12+
13+
- name: Set up JDK environment
14+
uses: actions/setup-java@v3
15+
with:
16+
distribution: "zulu"
17+
java-version: 17
18+
19+
- name: Make gradlew executable
20+
run: chmod +x ./gradlew
21+
22+
- name: Setup Gradle
23+
uses: gradle/gradle-build-action@v2
24+
25+
- name: Run local unit tests
26+
run: bash ./gradlew test --stacktrace
27+
28+
build:
29+
runs-on: ubuntu-20.04
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v3
33+
with:
34+
submodules: "recursive"
35+
36+
- name: Set up JDK environment
37+
uses: actions/setup-java@v3
38+
with:
39+
distribution: "zulu"
40+
java-version: 17
41+
42+
- name: Make gradlew executable
43+
run: chmod +x ./gradlew
44+
45+
- name: Setup Gradle
46+
uses: gradle/gradle-build-action@v2
47+
48+
- name: Build the app
49+
run: bash ./gradlew build --stacktrace

.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
4+
.idea/
105
.DS_Store
116
/build
127
/captures

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 122 deletions
This file was deleted.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)