diff --git a/.circleci/config.yml b/.circleci/config.yml index f9479bd008..b66ac53c71 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,8 +4,8 @@ version: 2.1 # Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects. orbs: - android: circleci/android@1.0.3 - codecov: codecov/codecov@1.2.0 + android: circleci/android@2.3.0 + codecov: codecov/codecov@3.2.4 jobs: # Below is the definition of your job to build and test your app, you can rename and customize it as you want. @@ -13,22 +13,26 @@ jobs: # These next lines define the Android machine image executor: https://circleci.com/docs/2.0/executor-types/ executor: name: android/android-machine + resource-class: large + tag: 2023.07.1 steps: - # Checkout the code as the first step. - checkout - # The next step will run the unit tests + - android/change-java-version: + java-version: 17 + + - android/start-emulator-and-run-tests: + system-image: system-images;android-29;google_apis;x86 + # Compile while the emulator starts to use the time. + post-emulator-launch-assemble-command: ./gradlew compileFullDebugUnitTestSources compileFullDebugAndroidTestSources + test-command: ./gradlew connectedFullDebugAndroidTest + - android/run-tests: test-command: ./gradlew testFullDebugUnitTest - android/run-tests: - test-command: ./gradlew jacocoAllDebugReport - - # Then start the emulator and run the Instrumentation tests! - # - android/start-emulator-and-run-tests: - # test-command: ./gradlew connectedDebugAndroidTest - # system-image: system-images;android-25;google_apis;x86 + test-command: ./gradlew --stacktrace jacocoAllDebugReport # And finally run the release build # - run: @@ -45,4 +49,4 @@ workflows: # For more details on extending your workflow, see the configuration docs: https://circleci.com/docs/2.0/configuration-reference/#workflows dotests: jobs: - - build-and-test \ No newline at end of file + - build-and-test diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md index 665cb66fba..9f30207094 100644 --- a/.github/ISSUE_TEMPLATE/custom.md +++ b/.github/ISSUE_TEMPLATE/custom.md @@ -15,5 +15,5 @@ Reporting bugs upper-right corner). - Obtain the app's log files, which can be found on the phone in _/storage/emulated/0/Android/data/info.nightscout.androidaps/_ - See https://androidaps.readthedocs.io/en/latest/Usage/Accessing-logfiles.html + See https://wiki.aaps.app/en/latest/Usage/Accessing-logfiles.html - Open an issue at https://github.com/nightscout/AndroidAPS/issues/new diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index a9c3d0e4d9..bf41126f8b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -4,8 +4,6 @@