feat: Upgrade dependencies.

zouhir96 · zouhir96 · commit b80bffb85bfc · 2025-07-11T22:49:20.000+02:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -49,10 +49,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvmTarget.get()
-    }
-
     buildFeatures {
         buildConfig = true
     }
@@ -63,6 +59,10 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation(project(":shared"))
 
diff --git a/core/analytics/src/commonMain/kotlin/com/zrcoding/hackertab/analytics/models/AnalyticsEvent.kt b/core/analytics/src/commonMain/kotlin/com/zrcoding/hackertab/analytics/models/AnalyticsEvent.kt
@@ -20,6 +20,7 @@ data class AnalyticsEvent(
         const val SETUP_COMPLETED = "setup_completed"
         const val TOPIC_SELECTION_CHANGED = "topic_selection_changed"
         const val SOURCE_SELECTION_CHANGED = "source_selection_changed"
+        const val SOURCE_FILTER_CHANGED = "source_filter_changed"
         const val TOPIC_FILTER_CHANGED = "topic_filter_changed"
         // Add more standard event types here
     }
diff --git a/core/data/src/commonMain/kotlin/com/zrcoding/hackertab/data/mappers/Mappers.kt b/core/data/src/commonMain/kotlin/com/zrcoding/hackertab/data/mappers/Mappers.kt
@@ -16,12 +16,14 @@ import com.zrcoding.hackertab.network.dtos.ConferenceDto
 import com.zrcoding.hackertab.network.dtos.GithubDto
 import com.zrcoding.hackertab.network.dtos.IndieHackersDto
 import com.zrcoding.hackertab.network.dtos.ProductHuntDto
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
+@OptIn(ExperimentalTime::class)
 fun Long.toZonedLocalDate(): LocalDateTime = Instant.fromEpochMilliseconds(this)
     .toLocalDateTime(TimeZone.currentSystemDefault())
 
@@ -108,6 +110,7 @@ fun ProductHuntDto.toProductHunt() = ProductHunt(
     tags = tags.orEmpty().take(1)
 )
 
+@OptIn(ExperimentalTime::class)
 fun IndieHackersDto.toIndieHackers() = IndieHackers(
     id = id ?: Clock.System.now().toEpochMilliseconds().toString(),
     title = title,
diff --git a/core/domain/src/commonMain/kotlin/com/zrcoding/hackertab/domain/usecases/BuildConferenceDisplayedDateUseCase.kt b/core/domain/src/commonMain/kotlin/com/zrcoding/hackertab/domain/usecases/BuildConferenceDisplayedDateUseCase.kt
@@ -14,7 +14,7 @@ object BuildConferenceDisplayedDateUseCase {
                     if (startDate.month != endDate.month) {
                         "$start - ${toMonthWithDay(endDate)}"
                     } else {
-                        "$start - ${endDate.dayOfMonth}"
+                        "$start - ${endDate.day}"
                     }
                 }
             }
@@ -25,6 +25,6 @@ object BuildConferenceDisplayedDateUseCase {
         val month = date.month.name.lowercase().replaceFirstChar {
             if (it.isLowerCase()) it.titlecase() else it.toString()
         }
-        return "$month ${date.dayOfMonth}"
+        return "$month ${date.day}"
     }
 }
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/HomeScreenViewModel.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/HomeScreenViewModel.kt
@@ -2,6 +2,9 @@ package com.zrcoding.hackertab.home.presentation
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.zrcoding.hackertab.analytics.AnalyticsHelper
+import com.zrcoding.hackertab.analytics.models.AnalyticsEvent
+import com.zrcoding.hackertab.analytics.models.Param
 import com.zrcoding.hackertab.domain.models.BaseArticle
 import com.zrcoding.hackertab.domain.models.NetworkErrors
 import com.zrcoding.hackertab.domain.models.Resource
@@ -22,7 +25,8 @@ import kotlinx.coroutines.launch
 class HomeScreenViewModel(
     private val observeSelectedSourcesUseCase: ObserveSelectedSourcesUseCase,
     private val observeSelectedTopicsUseCase: ObserveSelectedTopicsUseCase,
-    private val articleRepository: ArticleRepository
+    private val articleRepository: ArticleRepository,
+    private val analyticsHelper: AnalyticsHelper
 ) : ViewModel() {
 
     private val _viewState = MutableStateFlow(HomeScreenViewState())
@@ -75,6 +79,7 @@ class HomeScreenViewModel(
             it.copy(selectedSource = source)
         }
         loadArticles()
+        logSourceFilterChanged(source)
     }
 
     fun onTopicSelected(topic: Topic) {
@@ -83,6 +88,7 @@ class HomeScreenViewModel(
             it.copy(selectedTopic = topic)
         }
         loadArticles()
+        logTopicFilterChanged(topic)
     }
 
     fun onRefreshBtnClick() {
@@ -104,6 +110,7 @@ class HomeScreenViewModel(
                             error = null
                         )
                     }
+
                     is Resource.Failure -> {
                         _viewState.update {
                             it.copy(
@@ -130,7 +137,7 @@ class HomeScreenViewModel(
         }
     }
 
-    suspend fun getSourceTag(
+    private suspend fun getSourceTag(
         source: Source,
         topic: Topic
     ): Resource<List<BaseArticle>, NetworkErrors>? {
@@ -179,4 +186,32 @@ class HomeScreenViewModel(
             Source.INDIE_HACKERS -> articleRepository.getIndieHackersArticles()
         }
     }
+
+    private fun logSourceFilterChanged(source: Source) {
+        analyticsHelper.logEvent(
+            event = AnalyticsEvent(
+                name = AnalyticsEvent.Types.SOURCE_FILTER_CHANGED,
+                properties = setOf(
+                    Param(
+                        key = AnalyticsEvent.ParamKeys.VALUE,
+                        value = source.analyticsTag
+                    )
+                )
+            ),
+        )
+    }
+
+    private fun logTopicFilterChanged(topic: Topic) {
+        analyticsHelper.logEvent(
+            event = AnalyticsEvent(
+                name = AnalyticsEvent.Types.SOURCE_FILTER_CHANGED,
+                properties = setOf(
+                    Param(
+                        key = AnalyticsEvent.ParamKeys.VALUE,
+                        value = topic.id
+                    )
+                )
+            ),
+        )
+    }
 }
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/devto/DevtoItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/devto/DevtoItem.kt
@@ -13,11 +13,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.Devto
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -46,6 +47,7 @@ fun DevtoItem(devto: Devto) {
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 private fun DevtoItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/freecodecamp/FreeCodeCampItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/freecodecamp/FreeCodeCampItem.kt
@@ -9,10 +9,11 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.FreeCodeCamp
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -31,6 +32,7 @@ fun FreeCodeCampItem(post: FreeCodeCamp) {
     )
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 private fun FreeCodeCampItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/hackernews/HackerNewsItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/hackernews/HackerNewsItem.kt
@@ -14,11 +14,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.HackerNews
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -45,6 +46,7 @@ fun HackerNewsItem(new: HackerNews) {
     )
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 fun HackerNewsItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/hashnode/HashnodeItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/hashnode/HashnodeItem.kt
@@ -13,11 +13,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.Hashnode
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -46,6 +47,7 @@ fun HashnodeItem(hashnode: Hashnode) {
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 private fun HashnodeItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/indiehackers/IndieHackersItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/indiehackers/IndieHackersItem.kt
@@ -14,11 +14,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.IndieHackers
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -47,6 +48,7 @@ fun IndieHackersItem(indieHackers: IndieHackers) {
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 private fun IndieHackersItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/lobsters/LobstersItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/lobsters/LobstersItem.kt
@@ -19,11 +19,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.Lobster
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -59,6 +60,7 @@ fun LobstersItem(lobster: Lobster) {
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 private fun LobstersItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/mediun/MediumItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/mediun/MediumItem.kt
@@ -14,11 +14,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.Medium
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -46,6 +47,7 @@ fun MediumItem(medium: Medium) {
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 private fun MediumItemPreview() {
@@ -54,7 +56,7 @@ private fun MediumItemPreview() {
             medium = Medium(
                 id = "porttitor",
                 title = "Coroutines explained in a simple way",
-                date =Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()),
+                date = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()),
                 commentsCount = 9783,
                 claps = 9145,
                 url = "https://duckduckgo.com/?q=minim"
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/reddit/RedditItem.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/cards/reddit/RedditItem.kt
@@ -15,11 +15,12 @@ import com.zrcoding.hackertab.design.theme.HackertabTheme
 import com.zrcoding.hackertab.domain.models.Reddit
 import com.zrcoding.hackertab.home.presentation.cards.SourceItemTemplate
 import com.zrcoding.hackertab.home.presentation.utils.timeAgo
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -47,6 +48,7 @@ fun RedditItem(reddit: Reddit) {
     )
 }
 
+@OptIn(ExperimentalTime::class)
 @Preview()
 @Composable
 fun RedditItemPreview() {
diff --git a/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/utils/DateUtils.kt b/feature/home/src/commonMain/kotlin/com/zrcoding/hackertab/home/presentation/utils/DateUtils.kt
@@ -1,11 +1,13 @@
 package com.zrcoding.hackertab.home.presentation.utils
 
-import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalTime::class)
 fun LocalDateTime.timeAgo(): String {
     val timeZone = TimeZone.currentSystemDefault()
     val currentTime = Clock.System.now().toLocalDateTime(timeZone)
diff --git a/gradle.properties b/gradle.properties
@@ -23,4 +23,6 @@ kotlin.code.style=official
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
+kotlin.native.cacheKind=none
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,6 @@ android {`
`49`	`49`	`targetCompatibility = JavaVersion.VERSION_17`
`50`	`50`	`}`
`51`	`51`
`52`		`- kotlinOptions {`
`53`		`- jvmTarget = libs.versions.jvmTarget.get()`
`54`		`- }`
`55`		`-`
`56`	`52`	`buildFeatures {`
`57`	`53`	`buildConfig = true`
`58`	`54`	`}`
`@@ -63,6 +59,10 @@ android {`
`63`	`59`	`}`
`64`	`60`	`}`
`65`	`61`
	`62`	`+kotlin {`
	`63`	`+ jvmToolchain(17)`
	`64`	`+}`
	`65`	`+`
`66`	`66`	`dependencies {`
`67`	`67`	`implementation(project(":shared"))`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ data class AnalyticsEvent(`
`20`	`20`	`const val SETUP_COMPLETED = "setup_completed"`
`21`	`21`	`const val TOPIC_SELECTION_CHANGED = "topic_selection_changed"`
`22`	`22`	`const val SOURCE_SELECTION_CHANGED = "source_selection_changed"`
	`23`	`+ const val SOURCE_FILTER_CHANGED = "source_filter_changed"`
`23`	`24`	`const val TOPIC_FILTER_CHANGED = "topic_filter_changed"`
`24`	`25`	`// Add more standard event types here`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ object BuildConferenceDisplayedDateUseCase {`
`14`	`14`	`if (startDate.month != endDate.month) {`
`15`	`15`	`"$start - ${toMonthWithDay(endDate)}"`
`16`	`16`	`} else {`
`17`		`- "$start - ${endDate.dayOfMonth}"`
	`17`	`+ "$start - ${endDate.day}"`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`}`
`@@ -25,6 +25,6 @@ object BuildConferenceDisplayedDateUseCase {`
`25`	`25`	`val month = date.month.name.lowercase().replaceFirstChar {`
`26`	`26`	`if (it.isLowerCase()) it.titlecase() else it.toString()`
`27`	`27`	`}`
`28`		`- return "$month ${date.dayOfMonth}"`
	`28`	`+ return "$month ${date.day}"`
`29`	`29`	`}`
`30`	`30`	`}`