Skip to content
Open
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
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ org.gradle.caching=true
org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.vfs.watch=true
room.incremental=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Expand Down
32 changes: 7 additions & 25 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,18 @@ jvmTarget = "17"

#dependencies
adaptive = "1.1.0"
androidxAppCompat = "1.6.1"
androidxActivity = "1.11.0"
androidxComposeBom = "2025.09.00"
androidxComposeBom = "2025.09.01"
androidxComposeCompiler = "1.5.5"
androidxComposeUiTestJunit4 = "1.4.0"
animationAndroid = "1.9.1"
animationAndroid = "1.9.2"
androidxCore = "1.17.0"
androidxHiltWork = "1.0.0"
androidxLifecycle = "2.9.3"
androidxNavigationCompose = "2.9.2"
androidxLifecycle = "2.9.4"
lifecycleViewmodelNavigation3 = "1.0.0-alpha04"
androidxRoom = "2.8.0"
androidxTestExt = "1.1.5"
androidxTestRules = "1.7.0"
androidxTestRunner = "1.7.0"
androidxTextCoreKtx = "1.7.0"
androidxWorkRuntimeKtx = "2.8.1"
gradleVersionsPlugin = "0.46.0"
navigation3 = "1.0.0-alpha09"
material3 = "1.4.0-alpha18"
hilt = "2.57.1"
navigation3 = "1.0.0-alpha10"
hilt = "2.57.2"
hiltExt = "1.3.0"
junit = "4.13.2"
junit5Plugin = "1.13.4.0"
Expand All @@ -46,8 +37,8 @@ ktlint = "1.7.1"
mockK = "1.14.5"
nexus = "2.0.0"
slf4j = "1.7.26"
spotless = "7.2.1"
ksp = "2.2.10-2.0.2"
spotless = "8.0.0"
ksp = "2.2.20-2.0.3"
turbine = "1.2.1"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
Expand All @@ -56,9 +47,6 @@ kotlinxSerializationCore = "1.9.0"

[plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }
android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization" }
junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "junit5Plugin" }
Expand All @@ -77,9 +65,7 @@ androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", ve
androidx-animation-android = { group = "androidx.compose.animation", name = "animation-android", version.ref = "animationAndroid" }
androidx-compose-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "adaptive" }
androidx-compose-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "adaptive" }
androidx-compose-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "adaptive" }
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha", version.ref = "androidxComposeBom" }
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
Expand All @@ -103,10 +89,6 @@ androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifec
androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycleViewmodelNavigation3" }
androidx-navigation-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
androidx-navigation-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
androidx-room-common = { group = "androidx.room", name = "room-common", version.ref = "androidxRoom" }
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidxRoom" }
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidxRoom" }
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidxRoom" }
androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidxTextCoreKtx" }
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" }
Expand Down
4 changes: 0 additions & 4 deletions samples/petsnavigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ android {
targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
}

kotlinOptions {
jvmTarget = libs.versions.javaVersion.get()
}

buildFeatures {
compose = true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.navigation3.runtime.NavKey
import androidx.navigation3.runtime.entry
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.ui.NavDisplay
import com.toggl.komposable.architecture.Reducer
Expand Down Expand Up @@ -154,18 +153,18 @@ fun PetsNavigationApp() {
backStack = petsState.backStack,
onBack = { petsStore.send(PetsAction.BackEvent) },
entryProvider = entryProvider {
entry<AnimalListRoute> { entry: AnimalListRoute ->
entry<AnimalListRoute> {
AnimalListPage(
animals = petsState.animals,
onAnimalClick = { animalId ->
petsStore.send(PetsAction.AnimalClicked(animalId))
},
)
}
entry<AnimalDetailRoute> { entry: AnimalDetailRoute ->
entry<AnimalDetailRoute> {
AnimalDetailPage(petsState.selectedAnimal)
}
entry<SettingsRoute> { entry: SettingsRoute ->
entry<SettingsRoute> {
SettingsPage(onAboutClick = {
petsStore.send(PetsAction.AboutClicked)
})
Expand Down
4 changes: 0 additions & 4 deletions samples/todos/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ android {
targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
}

kotlinOptions {
jvmTarget = libs.versions.javaVersion.get()
}

buildFeatures {
compose = true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@ private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40,

/* Other default colors to override
background = Color(0xFFFFFBFE),
surface = Color(0xFFFFFBFE),
onPrimary = Color.White,
onSecondary = Color.White,
onTertiary = Color.White,
onBackground = Color(0xFF1C1B1F),
onSurface = Color(0xFF1C1B1F),
*/
)

@Composable
Expand All @@ -44,7 +34,7 @@ fun TodosTheme(
content: @Composable () -> Unit,
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
dynamicColor -> {
val context = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}
Expand Down