Skip to content

Commit

Permalink
Merge branch 'develop' into custom-theming
Browse files Browse the repository at this point in the history
ninovanhooff committed Dec 13, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 6faf296 + 6694330 commit 235d6fe
Showing 8 changed files with 43 additions and 22 deletions.
24 changes: 24 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import com.ramcosta.composedestinations.spec.DestinationSpec
import com.ramcosta.composedestinations.spec.NavGraphSpec
import nl.q42.template.home.destinations.HomeScreenDestination
import nl.q42.template.home.destinations.HomeSecondScreenDestination
import nl.q42.template.onboarding.ui.start.destinations.OnboardingStartScreenDestination
import nl.q42.template.onboarding.start.ui.destinations.OnboardingStartScreenDestination

/**
*

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.q42.template.onboarding.presentation.start
package nl.q42.template.onboarding.start.presentation

import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package nl.q42.template.onboarding.start.presentation

class OnboardingStartViewState(val title: String)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.q42.template.onboarding.ui.start
package nl.q42.template.onboarding.start.ui

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -15,7 +15,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
import nl.q42.template.navigation.viewmodel.InitNavigator
import nl.q42.template.onboarding.presentation.start.OnboardingStartViewModel
import nl.q42.template.onboarding.start.presentation.OnboardingStartViewModel

@Destination
@Composable
25 changes: 11 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
[versions]
androidxCore = "1.13.1"
androidxLifecycle = "2.8.4"
androidxLifecycle = "2.8.5"
kotlinxCoroutinesTest = "1.8.1"
junit = "4.13.2"
mockkAndroid = "1.13.9"
mockkAndroid = "1.13.12"
jvmTarget = "21"
kotlin = "2.0.10"
ksp = "2.0.10-1.0.24"
gradlePlugin = "8.5.2"
kotlin = "2.0.20"
# should match kotlin https://github.com/google/ksp/releases
ksp = "2.0.20-1.0.25"
gradlePlugin = "8.6.0"
googleServices = "4.4.2"
crashlyticsPlugin = "3.0.2"
firebaseBOM = "33.1.2"
manesVersions = "0.44.0"
littleRobotsCatalogUpdates = "0.8.1"
firebaseBOM = "33.2.0"
hilt = "2.52"
retrofit = "2.11.0"
kotlinx-serialization = "1.6.3"
kotlinx-serialization = "1.7.2"
retrofit2KotlinxSerializationConverter = "1.0.0"
networkResponseAdapter = "5.0.0"
napier = "2.7.1"
composeDestinations = "1.10.2"
okhttp = "4.12.0"
composePlatform = "2024.08.00"
activityCompose = "1.9.1"
composePlatform = "2024.09.00"
activityCompose = "1.9.2"
hiltNavigationCompose = "1.2.0"
composeLifecycle = "2.8.4"
composeLifecycle = "2.8.5"
turbine = "1.0.0"

[libraries]
@@ -64,8 +63,6 @@ androidApplication = { id = "com.android.application", version.ref = "gradlePlug
androidLibrary = { id = "com.android.library", version.ref = "gradlePlugin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
manesVersions = { id = "com-github-ben-manes-versions", version.ref = "manesVersions" }
littleRobotsCatalogUpdates = { id = "nl.littlerobots.version-catalog-update", version.ref = "littleRobotsCatalogUpdates" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }

0 comments on commit 235d6fe

Please sign in to comment.