Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6f2c6a4
🤖 Update Dependencies
compose-devrel-github-bot Apr 24, 2026
23170c0
update versions - jetcaster
MagicalMeghan Apr 28, 2026
cfefe0a
Skill dependency updates
MagicalMeghan Apr 28, 2026
f272d8e
update gradle wrapper
MagicalMeghan Apr 28, 2026
d4cf673
Update build.gradle.kts
MagicalMeghan Apr 28, 2026
48f071f
Update build.gradle.kts
MagicalMeghan Apr 28, 2026
5d43b1a
Update build.gradle.kts
MagicalMeghan Apr 28, 2026
2a8262c
Update build.gradle
MagicalMeghan Apr 28, 2026
2bd2b28
Update build.gradle
MagicalMeghan Apr 28, 2026
32e8e27
update gradle dist
MagicalMeghan Apr 28, 2026
b3e4e5a
Update gradle-wrapper.properties
MagicalMeghan Apr 28, 2026
f3145ee
Update gradle-wrapper.properties
MagicalMeghan Apr 30, 2026
7ac3993
update jetlagged gradle issues
MagicalMeghan Apr 30, 2026
e949e60
delete distSha - Jetlagged
MagicalMeghan Apr 30, 2026
1d33b6f
Update
MagicalMeghan Apr 30, 2026
9e022d0
update gradle for reply
MagicalMeghan May 1, 2026
f501120
Update DayLabel to use LocalLocale.
dturner May 1, 2026
db1df6d
Update local - Jetsnack
MagicalMeghan May 1, 2026
00b533a
Merge branch 'bot-update-deps' of https://github.com/android/compose-…
MagicalMeghan May 1, 2026
613d598
Jetlagged Spotless
MagicalMeghan May 1, 2026
c3150f0
Add Material 1.5.0 alpha18, fix other build issues
dturner May 1, 2026
6892544
Spotless jetcaster
MagicalMeghan May 1, 2026
f67e90d
Added Horologist annotations
MagicalMeghan May 1, 2026
035bbe5
Update QueueViewModel.kt
MagicalMeghan May 1, 2026
51572fd
Jetcaster spotless
MagicalMeghan May 1, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.example.jetlagged

import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import com.example.jetlagged.ui.theme.JetLaggedTheme
import org.junit.Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.platform.LocalLocale
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.example.jetlagged.BasicInformationalCard
Expand Down Expand Up @@ -108,7 +109,7 @@ private fun JetLaggedTimeGraph(sleepGraphData: SleepGraphData, modifier: Modifie
private fun DayLabel(dayOfWeek: DayOfWeek) {
Text(
dayOfWeek.getDisplayName(
TextStyle.SHORT, Locale.getDefault(),
TextStyle.SHORT, LocalLocale.current.platformLocale,
),
Modifier
.height(24.dp)
Expand Down
1 change: 0 additions & 1 deletion JetLagged/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {
alias(libs.plugins.gradle.versions)
alias(libs.plugins.version.catalog.update)
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.parcelize) apply false
alias(libs.plugins.compose) apply false
alias(libs.plugins.spotless) apply false
Expand Down
28 changes: 14 additions & 14 deletions JetLagged/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha09"
androidGradlePlugin = "9.0.1"
android-material3 = "1.14.0-beta01"
androidGradlePlugin = "9.2.0"
androidx-activity-compose = "1.13.0"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2026.03.00"
androidx-compose-bom = "2026.04.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.2.0"
androidx-corektx = "1.17.0"
androidx-corektx = "1.18.0"
androidx-glance = "1.1.1"
androidx-lifecycle = "2.8.2"
androidx-lifecycle-compose = "2.10.0"
androidx-lifecycle-runtime-compose = "2.10.0"
androidx-navigation = "2.9.7"
androidx-navigation = "2.9.8"
androidx-palette = "1.0.0"
androidx-test = "1.7.0"
androidx-test-espresso = "3.7.0"
androidx-test-ext-junit = "1.3.0"
androidx-test-ext-truth = "1.7.0"
androidx-tv-foundation = "1.0.0-alpha12"
androidx-tv-foundation = "1.0.0-rc01"
androidx-tv-material = "1.0.1"
androidx-wear-compose = "1.5.6"
androidx-wear-compose = "1.6.1"
androidx-window = "1.5.1"
androidxHiltNavigationCompose = "1.3.0"
androix-test-uiautomator = "2.3.0"
Expand All @@ -29,27 +29,27 @@ coil = "2.7.0"
compileSdk = "36"
coroutines = "1.10.2"
google-maps = "20.0.0"
gradle-versions = "0.53.0"
gradle-versions = "0.54.0"
hilt = "2.59.2"
hiltExt = "1.3.0"
horologist = "0.7.15"
jdkDesugar = "2.1.5"
junit = "4.13.2"
kotlin = "2.3.10"
kotlinx-serialization-json = "1.10.0"
kotlin = "2.3.21"
kotlinx-serialization-json = "1.11.0"
kotlinx_immutable = "0.4.0"
ksp = "2.3.6"
maps-compose = "8.2.0"
ksp = "2.3.7"
maps-compose = "8.3.0"
# @keep
minSdk = "23"
okhttp = "5.3.2"
play-services-wearable = "19.0.0"
robolectric = "4.16.1"
roborazzi = "1.59.0"
roborazzi = "1.60.0"
rome = "2.1.0"
room = "2.8.4"
secrets = "2.0.1"
spotless = "8.2.1"
spotless = "8.4.0"
# @keep
targetSdk = "33"
version-catalog-update = "1.1.0"
Expand Down
Binary file modified JetLagged/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
19 changes: 3 additions & 16 deletions JetLagged/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
# Copyright 2023 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading