Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Gradle 8.2 with kotlin DSL #36

Merged
merged 14 commits into from
Mar 7, 2024
Merged

Upgrade to Gradle 8.2 with kotlin DSL #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
26e4a6b
Upgrade to gradle 8.2
LZRS Feb 8, 2024
6552973
Set up jacoco.gradle and properties.gradle as buildSrc plugins
LZRS Feb 23, 2024
21cf96f
Update spotless to 6.25.0
LZRS Feb 24, 2024
8613858
Fix CI to use Java 17
LZRS Feb 26, 2024
92c4440
Fix package dependency typo
LZRS Feb 26, 2024
6749a67
Fix gson serialization for java8 Date API
LZRS Feb 26, 2024
3e11dd3
Update failing tests that may be delayed
LZRS Feb 28, 2024
325371f
Merge remote-tracking branch 'd-tree-org/mwcore-dev' into mwcore-sdk-…
LZRS Feb 29, 2024
93ebb78
Merge remote-tracking branch 'd-tree-org/mwcore-dev' into mwcore-sdk-…
LZRS Mar 5, 2024
60f64c3
Merge remote-tracking branch 'd-tree-org/mwcore-dev' into mwcore-sdk-…
LZRS Mar 6, 2024
ca2eec6
Update ci github workflow
LZRS Mar 6, 2024
5cb8d75
Merge remote-tracking branch 'd-tree-org/mwcore-dev' into mwcore-sdk-…
LZRS Mar 6, 2024
1795034
Use fhir-common-utils 0.0.8-SNAPSHOT
LZRS Mar 6, 2024
713ed44
Update CI dataclerk workflow
LZRS Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
81 changes: 0 additions & 81 deletions .github/workflows/anc-release.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/apk-release.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

Loading
Loading