Skip to content

Commit

Permalink
Merge branch 'master' into android-companion-and-bonding
Browse files Browse the repository at this point in the history
  • Loading branch information
ened committed Apr 10, 2024
2 parents 65a9783 + 96e083a commit c6543c7
Show file tree
Hide file tree
Showing 20 changed files with 297 additions and 416 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
[*.{kt,kts}]
max_line_length=210
ktlint_standard_property-naming=disabled
11 changes: 6 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ jobs:
run: |
./bin/quality_checks.sh
- name: Android native tests
- name: Build Android app & run native tests
run: |
#!/bin/bash -ex
cd example/android && ls && ./gradlew detekt && ./gradlew testDebugUnitTest
cd example
flutter build apk --debug
- name: Build android app
run: |
cd example && flutter build apk --debug
cd android
./gradlew detekt
./gradlew testDebugUnitTest
- name: Build iOS app
run: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,5 @@ Flutter.podspec
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

pubspec_overrides.yaml
pubspec_overrides.yaml
.ruby-version
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

13 changes: 13 additions & 0 deletions example/android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
gradle-wrapper.jar
/.gradle
/captures/
/gradlew
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
key.properties
**/*.keystore
**/*.jks
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
}
Loading

0 comments on commit c6543c7

Please sign in to comment.