Skip to content

Commit

Permalink
Upgrade to Gradle 8.2 with kotlin DSL (#36)
Browse files Browse the repository at this point in the history
* Upgrade to gradle 8.2

* Set up jacoco.gradle and properties.gradle as buildSrc plugins

https://docs.gradle.org/8.2/userguide/custom_plugins.html#sec:precompiled_plugins

* Update spotless to 6.25.0

* Fix CI to use Java 17

* Fix package dependency typo

for com.google.dagger:hilt-android-compiler

* Fix gson serialization for java8 Date API

* Update failing tests that may be delayed

* Update ci github workflow

* Use fhir-common-utils 0.0.8-SNAPSHOT

* Update CI dataclerk workflow
  • Loading branch information
LZRS authored Mar 7, 2024
1 parent 9a8ea60 commit 1fd04c4
Show file tree
Hide file tree
Showing 940 changed files with 6,173 additions and 80,159 deletions.
81 changes: 0 additions & 81 deletions .github/workflows/anc-release.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/apk-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
with:
fetch-depth: 2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
52 changes: 43 additions & 9 deletions .github/workflows/ci-mwcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: CI MwCore

on:
push:
branches: [ mwcore-dev ]
branches: [mwcore-dev]
pull_request:
branches: [ mwcore-dev ]
branches: [mwcore-dev]

env:
FHIRCORE_USERNAME: ${{ secrets.FHIRCORE_USERNAME }}
FHIRCORE_ACCESS_TOKEN: ${{ secrets.FHIRCORE_ACCESS_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

jobs:
engine-tests:
dataclerk:
runs-on: macos-latest
steps:
- name: Cancel Previous workflow runs
Expand All @@ -25,15 +25,45 @@ jobs:
with:
fetch-depth: 2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Decode google-services.json
run: echo $ENCODED_GOOGLE_SERVICES_JSON | base64 -d > android/quest/google-services.json
run: echo $ENCODED_GOOGLE_SERVICES_JSON | base64 -d > android/dataclerk/google-services.json
env:
ENCODED_GOOGLE_SERVICES_JSON: ${{ secrets.MWCORE_GOOGLE_SERVICES_JSON }}
ENCODED_GOOGLE_SERVICES_JSON: ${{ secrets.DATACLERK_GOOGLE_SERVICES_JSON }}

- name: Grant execute permission for gradlew
run: chmod +x gradlew
working-directory: android

- name: Spotless check dataclerk module
run: ./gradlew :dataclerk:spotlessCheck
working-directory: android

- name: Builds
run: ./gradlew :dataclerk:assembleDebug
working-directory: android

engine-tests:
runs-on: macos-latest
steps:
- name: Cancel Previous workflow runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: Checkout 🛎️
uses: actions/checkout@v2
with:
fetch-depth: 2

- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down Expand Up @@ -65,10 +95,10 @@ jobs:
with:
fetch-depth: 2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Decode google-services.json
run: echo $ENCODED_GOOGLE_SERVICES_JSON | base64 -d > android/quest/google-services.json
Expand All @@ -83,6 +113,10 @@ jobs:
run: ./gradlew :quest:spotlessCheck
working-directory: android

- name: Builds
run: ./gradlew :quest:assembleMwcoreDevDebug
working-directory: android

# - name: Run Quest unit tests with Gradle
# run: ./gradlew :quest:clean && ./gradlew :quest:jacocoTestReportMwcoreDebug -x :quest:testMwcoreReleaseUnitTest --stacktrace
# working-directory: android
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
with:
fetch-depth: 2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand All @@ -58,10 +58,10 @@ jobs:
with:
fetch-depth: 2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dokka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout 🛎️
uses: actions/[email protected]

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
17 changes: 0 additions & 17 deletions android/anc/.gitignore

This file was deleted.

Loading

0 comments on commit 1fd04c4

Please sign in to comment.