diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 179ac53..0b87b6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,14 +5,17 @@ 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 @@ -20,7 +23,7 @@ jobs: - 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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 88c2578..d8a3324 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/libs/user/impl/src/commonMain/kotlin/dev/yaseyo/user/impl/network/UserNet.kt b/libs/user/impl/src/commonMain/kotlin/dev/yaseyo/user/impl/network/UserNet.kt index 6bc30c6..b886f29 100644 --- a/libs/user/impl/src/commonMain/kotlin/dev/yaseyo/user/impl/network/UserNet.kt +++ b/libs/user/impl/src/commonMain/kotlin/dev/yaseyo/user/impl/network/UserNet.kt @@ -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 @@ -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() =