Skip to content

Commit

Permalink
Merge branch 'master' into 2754-migrate-realmcourseactivity-model-cla…
Browse files Browse the repository at this point in the history
…ss-to-kotlin
  • Loading branch information
dogi authored Nov 30, 2023
2 parents b586467 + 44fcd27 commit ee39667
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: setup JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
expose-version-code: 'true'

- name: setup JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ dependencies {
implementation "com.github.VaibhavLakhera:Circular-Progress-View:0.1.2"
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
implementation 'com.applandeo:material-calendar-view:1.9.0'
implementation "androidx.work:work-runtime:2.8.1"
implementation "androidx.work:work-runtime:2.9.0"
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.21"))
}
realm {
Expand Down

0 comments on commit ee39667

Please sign in to comment.