Skip to content

Commit 9708dc8

Browse files
superus8rsuperus8r
authored
Merge pull request #28 from superus8r/feature/DROID-10/AllowCustomBaudrate
DROID-10: Allow Custom Baudrate
2 parents 9d24a0a + e906678 commit 9708dc8

File tree

69 files changed

+3125
-731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3125
-731
lines changed

‎.aiexclude‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# Built application files
2+
*.apk
3+
*.ap_
4+
*.aab
5+
6+
# Files for the ART/Dalvik VM
7+
*.dex
8+
9+
# Java class files
10+
*.class
11+
12+
# Generated files
13+
bin/
14+
gen/
15+
out/
16+
# Uncomment the following line in case you need and you don't have the release build type files in your app
17+
# release/
18+
19+
# Gradle files
20+
.gradle/
21+
build/
22+
23+
# Local configuration file (sdk path, etc)
24+
local.properties
25+
26+
# Proguard folder generated by Eclipse
27+
proguard/
28+
29+
# Log Files
30+
*.log
31+
32+
# Android Studio Navigation editor temp files
33+
.navigation/
34+
35+
# Android Studio captures folder
36+
captures/
37+
38+
# IntelliJ
39+
*.iml
40+
.idea/*
41+
42+
# Keystore files
43+
# Uncomment the following lines if you do not want to check your keystore files in.
44+
#*.jks
45+
#*.keystore
46+
47+
# External native build folder generated in Android Studio 2.2 and later
48+
.externalNativeBuild
49+
50+
# Google Services (e.g. APIs or Firebase)
51+
# google-services.json
52+
53+
# Freeline
54+
freeline.py
55+
freeline/
56+
freeline_project_description.json
57+
58+
# fastlane
59+
fastlane/report.xml
60+
fastlane/Preview.html
61+
fastlane/screenshots
62+
fastlane/test_output
63+
fastlane/readme.md
64+
65+
# Version control
66+
vcs.xml
67+
68+
# lint
69+
lint/intermediates/
70+
lint/generated/
71+
lint/outputs/
72+
lint/tmp/
73+
# lint/reports/
74+
app/src/main/res/values/api_keys.xml
75+
.idea/compiler.xml
76+
.idea/compiler.xml
77+
.idea/compiler.xml
78+
.idea/jarRepositories.xml
79+
.idea/misc.xml
80+
app/build.gradle
81+
.idea/misc.xml
82+
.idea/misc.xml
83+
.idea/misc.xml
84+
.idea/misc.xml
85+
.idea/misc.xml
86+
.idea/.name
87+
.idea/codeStyles/Project.xml
88+
.idea/misc.xml
89+
.idea/misc.xml

‎.circleci/config.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ commands:
2525
executors:
2626
android-machine:
2727
machine:
28-
image: android:2022.12.1
28+
image: android:2024.01.1
2929
android-docker:
3030
docker:
31-
- image: cimg/android:2023.02
31+
- image: cimg/android:2024.01
3232

3333
jobs:
3434
android-test:
@@ -64,15 +64,35 @@ jobs:
6464
name: Prepare Fastlane
6565
command: sudo bundle update
6666
- run:
67-
name: Distribute to Firebase AppTester
67+
name: Distribute to Firebase AppTester Dev
6868
command: bundle exec fastlane distDev
6969
- store_artifacts:
7070
path: /home/circleci/project/app/build/outputs/apk/debug/app-debug.apk
7171
destination: fastlane-output-debug
7272

73+
distribute-internal-testing:
74+
executor: android-docker
75+
resource_class: large
76+
steps:
77+
- checkout
78+
- restore_gradle_cache
79+
- run:
80+
name: Prepare Fastlane
81+
command: sudo bundle update
82+
- run:
83+
name: Distribute to Google PlayStore Internal Testing
84+
command: bundle exec fastlane deploy
85+
- run:
86+
name: Distribute to Firebase AppTester Prod
87+
command: bundle exec fastlane distProd
88+
- store_artifacts:
89+
path: /home/circleci/project/app/build/outputs/bundle/release/app-release.aab
90+
destination: fastlane-output-release
91+
7392
workflows:
7493
workflow:
7594
jobs:
7695
- android-test:
7796
context: SonarCloud
7897
- distribute-dev
98+
- distribute-internal-testing

‎.github/workflows/android.yml‎

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
name: Android CI
22

3-
on: [push]
3+
on: [ push ]
44

55
jobs:
66

77
unit-test:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: ruby/setup-ruby@v1
12-
with:
13-
ruby-version: '3.0'
14-
bundler-cache: true
15-
- name: set up JDK 11
16-
uses: actions/setup-java@v1
17-
with:
18-
distribution: 'zulu'
19-
java-version: '11'
20-
- name: Cache Gradle wrapper
21-
uses: actions/cache@v3
22-
with:
23-
path: ~/.gradle/wrapper
24-
key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
25-
restore-keys: |
26-
${{ runner.OS }}-gradle-wrapper-cache-
27-
- name: Cache Gradle caches
28-
uses: actions/cache@v3
29-
with:
30-
path: ~/.gradle/caches
31-
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle') }}
32-
restore-keys: |
33-
${{ runner.OS }}-gradle-caches-cache-
34-
- name: generate ksProp file
35-
run: ./gradlew generateKsPropFile
36-
- name: generate google-services.json file
37-
run: ./gradlew generateGoogleServicesJson
38-
env:
39-
GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
40-
- name: setup fastlane
41-
run: bundle install
42-
- name: run unit tests
43-
run: bundle exec fastlane android run_unit_tests
44-
- name: Unit tests results
45-
uses: actions/upload-artifact@v1
46-
with:
47-
name: unit-test-results
48-
path: app/build/reports/tests/testDebugUnitTest/index.html
10+
- uses: actions/checkout@v3
11+
- uses: ruby/setup-ruby@v1
12+
with:
13+
ruby-version: '3.1'
14+
bundler-cache: true
15+
- name: set up JDK 17
16+
uses: actions/setup-java@v4
17+
with:
18+
distribution: 'zulu'
19+
java-version: '17'
20+
- name: Cache Gradle wrapper
21+
uses: actions/cache@v3
22+
with:
23+
path: ~/.gradle/wrapper
24+
key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
25+
restore-keys: |
26+
${{ runner.OS }}-gradle-wrapper-cache-
27+
- name: Cache Gradle caches
28+
uses: actions/cache@v3
29+
with:
30+
path: ~/.gradle/caches
31+
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle') }}
32+
restore-keys: |
33+
${{ runner.OS }}-gradle-caches-cache-
34+
- name: generate ksProp file
35+
run: ./gradlew generateKsPropFile
36+
- name: generate google-services.json file
37+
run: ./gradlew generateGoogleServicesJson
38+
env:
39+
GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
40+
- name: setup fastlane
41+
run: bundle install
42+
- name: run unit tests
43+
run: bundle exec fastlane android run_unit_tests
44+
- name: Unit tests results
45+
uses: actions/upload-artifact@v4
46+
with:
47+
name: unit-test-results
48+
path: app/build/reports/tests/testDebugUnitTest/index.html
4949

5050
lint:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- uses: actions/checkout@v1
54-
- name: set up JDK 11
54+
- name: set up JDK 17
5555
uses: actions/setup-java@v1
5656
with:
5757
distribution: 'zulu'
58-
java-version: '11'
58+
java-version: '17'
5959
- name: generate ksProp file
6060
run: ./gradlew generateKsPropFile
6161
- name: generate google-services.json file
@@ -65,27 +65,32 @@ jobs:
6565
- name: Lint
6666
run: bash ./gradlew lintDebug
6767
- name: Lint results
68-
uses: actions/upload-artifact@v1
68+
uses: actions/upload-artifact@v4
6969
with:
7070
name: app
7171
path: app/build/reports/lint-results-debug.html
7272

7373
ui-test:
74-
runs-on: macos-latest
74+
runs-on: ubuntu-latest
7575
steps:
7676
- name: checkout
7777
uses: actions/checkout@v2
78-
- name: set up JDK 11
79-
uses: actions/setup-java@v1
78+
- name: set up JDK 17
79+
uses: actions/setup-java@v4
8080
with:
8181
distribution: 'zulu'
82-
java-version: '11'
82+
java-version: '17'
8383
- name: generate ksProp file
8484
run: ./gradlew generateKsPropFile
8585
- name: generate google-services.json file
8686
run: ./gradlew generateGoogleServicesJson
8787
env:
8888
GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
89+
- name: Enable KVM group perms
90+
run: |
91+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
92+
sudo udevadm control --reload-rules
93+
sudo udevadm trigger --name-match=kvm
8994
- name: run tests
9095
uses: reactivecircus/android-emulator-runner@v2
9196
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,4 @@ app/build.gradle
8686
.idea/.name
8787
.idea/codeStyles/Project.xml
8888
.idea/misc.xml
89+
.idea/misc.xml

0 commit comments

Comments
 (0)