Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,25 @@ on:
branches:
- main

env:
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true

jobs:
test-android:
name: Android Tests (JVM)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
java-version: 17
distribution: temurin

- name: Write google-services.json
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --decode > composeApp/google-services.json

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Run JVM unit tests
run: ./gradlew testDebugUnitTest
Expand All @@ -29,9 +32,9 @@ jobs:
name: iOS Tests (Kotlin/Native)
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
java-version: 17
distribution: temurin
Expand All @@ -40,7 +43,7 @@ jobs:
with:
xcode-version: latest-stable

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Run Kotlin/Native tests
run: ./gradlew iosSimulatorArm64Test
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
A personal diet app built with Kotlin Multiplatform. Native Android UI with Compose, native iOS UI
with SwiftUI, shared business logic.

Testing

---

## Tech Stack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package dev.yaseyo.user.impl.network
import dev.yaseyo.user.api.ActivityLevel
import dev.yaseyo.user.api.Sex
import dev.yaseyo.user.api.User
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDate
import kotlinx.serialization.Serializable

Expand Down Expand Up @@ -37,8 +36,8 @@ internal fun UserNet.toDomain() =
targetProtein = targetProtein,
targetCarbs = targetCarbs,
targetFat = targetFat,
createdAt = Instant.parse(createdAt),
updatedAt = Instant.parse(updatedAt),
createdAt = kotlin.time.Instant.parse(createdAt),
updatedAt = kotlin.time.Instant.parse(updatedAt),
)

internal fun ActivityLevel.toApiString() =
Expand Down