Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d3a1842
Update dependencies
MagicalMeghan Apr 27, 2026
ac040bd
Update libs.versions.toml
MagicalMeghan Apr 27, 2026
23b9f55
update issues with android block
MagicalMeghan Apr 28, 2026
8ccb60d
Update boolean and any deprecation
MagicalMeghan Apr 29, 2026
5e9d3e2
Merge branch 'main' into mm/snippet-update-2026-04-27
MagicalMeghan Apr 29, 2026
81d6e3d
re-add health connect
MagicalMeghan Apr 29, 2026
40047b1
Merge branch 'mm/snippet-update-2026-04-27' of https://github.com/and…
MagicalMeghan Apr 29, 2026
7ee96ae
Update build.gradle.kts
MagicalMeghan Apr 29, 2026
2dabcd6
Update compile SDK and kotlin block placement
MagicalMeghan Apr 29, 2026
481e178
Add safe calls to bluetooth
MagicalMeghan Apr 29, 2026
74580e8
Downgrade accompanist
MagicalMeghan Apr 29, 2026
4a42fd6
Update libs.versions.toml
MagicalMeghan Apr 29, 2026
cf3d951
Update DatePickers.kt
MagicalMeghan Apr 30, 2026
bf8a8d0
Merge branch 'main' into mm/snippet-update-2026-04-27
MagicalMeghan May 1, 2026
b37565f
Address Kat review
MagicalMeghan May 4, 2026
8e62d0e
Merge branch 'mm/snippet-update-2026-04-27' of https://github.com/and…
MagicalMeghan May 4, 2026
7358a09
Merge branch 'main' into mm/snippet-update-2026-04-27
kkuan2011 May 4, 2026
9774b63
Merge branch 'main' into mm/snippet-update-2026-04-27
MagicalMeghan May 5, 2026
6f38f0f
Merge branch 'main' into mm/snippet-update-2026-04-27
MagicalMeghan May 6, 2026
960a063
Merge branch 'main' into mm/snippet-update-2026-04-27
MagicalMeghan May 6, 2026
1fee432
Update libs.versions.toml
MagicalMeghan May 6, 2026
3895a97
Merge branch 'main' into mm/snippet-update-2026-04-27
MagicalMeghan May 8, 2026
2b016ff
Merge branch 'main' into mm/snippet-update-2026-04-27
raystatic May 9, 2026
076c5ab
Updated Dependencies for compose 1.11.1
raystatic May 9, 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 @@ -33,7 +33,7 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.test.SemanticsMatcher
import androidx.compose.ui.test.assert
import androidx.compose.ui.test.junit4.accessibility.enableAccessibilityChecks
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.tryPerformAccessibilityChecks
import androidx.compose.ui.unit.dp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.test.captureToImage
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onRoot
import androidx.compose.ui.unit.dp
import org.junit.Rule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import androidx.compose.ui.test.DeviceConfigurationOverride
import androidx.compose.ui.test.FontScale
import androidx.compose.ui.test.FontWeightAdjustment
import androidx.compose.ui.test.ForcedSize
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.then
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.example.compose.snippets.interop

import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.test.platform.app.InstrumentationRegistry
import com.example.compose.snippets.MyActivity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.SemanticsProperties
import androidx.compose.ui.test.SemanticsMatcher
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package com.example.compose.snippets.touchinput.pointerinput
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.test.click
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performTouchInput
import androidx.compose.ui.test.swipeDown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.example.datastore.snippets

import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.example.datastore.snippets.json.JsonDataStoreScreen
Expand Down
7 changes: 6 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are lines 21-24 needed? I thought useAndroidX is true by default now?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we remove this? I think this is default = true


# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official

Expand All @@ -27,4 +32,4 @@ android.enableR8.fullMode=true
android.newDsl=false
Comment thread
kkuan2011 marked this conversation as resolved.
# Use an AndroidX snapshot build.
# https://androidx.dev/snapshots/builds
# snapshotVersion=14793336
snapshotVersion=14793336
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Uncommenting snapshotVersion forces the build to use a specific AndroidX snapshot. This is typically used for temporary testing of unreleased features and can lead to non-reproducible builds. If this PR is intended for a stable baseline, this should remain commented out.

# snapshotVersion=14793336

Comment thread
MagicalMeghan marked this conversation as resolved.
Outdated
54 changes: 27 additions & 27 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[versions]
accompanist = "0.36.0"
accompanist = "0.37.3"
activityKtx = "1.13.0"
android-googleid = "1.2.0"
androidGradlePlugin = "9.1.0"
androidGradlePlugin = "9.2.0"
androidx-activity-compose = "1.13.0"
androidx-appcompat = "1.7.1"
androidx-appfunctions = "1.0.0-alpha08"
androidx-cameraX = "1.6.0"
androidx-car = "1.7.0"
androidx-compose-bom = "2026.03.00"
androidx-compose-bom = "2026.04.01"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The Compose BOM version 2026.04.01 appears to be a typo. BOM versions typically follow the YYYY.MM.VV format, and 2026 is in the future. Please verify if 2024.04.01 or a similar current version was intended.

Suggested change
androidx-compose-bom = "2026.04.01"
androidx-compose-bom = "2024.10.01"

androidx-compose-ui-test = "1.7.0-alpha08"
androidx-compose-ui-test-junit4-accessibility = "1.11.0-beta01"
androidx-constraintlayout = "2.2.1"
androidx-constraintlayout-compose = "1.1.1"
androidx-coordinator-layout = "1.3.0"
androidx-corektx = "1.18.0"
androidx-credentials = "1.6.0-rc02"
androidx-credentials-play-services-auth = "1.6.0-rc02"
androidx-credentials = "1.6.0"
androidx-credentials-play-services-auth = "1.6.0"
androidx-emoji2-views = "1.6.0"
androidx-fragment = "1.8.9"
androidx-glance-appwidget = "1.1.1"
androidx-lifecycle-compose = "2.10.0"
androidx-lifecycle-runtime-compose = "2.10.0"
androidx-lifecycle-viewmodel-navigation3 = "2.10.0-beta01"
androidx-navigation = "2.9.7"
androidx-navigation = "2.9.8"
androidx-navigation3 = "1.1.0"
androidx-paging = "3.4.2"
androidx-startup-runtime = "1.2.0"
Expand All @@ -34,7 +34,7 @@ androidx-test-junit = "1.3.0"
androidx-window = "1.5.1"
androidx-window-core = "1.5.1"
androidx-window-java = "1.5.1"
androidx-work-runtime = "2.11.1"
androidx-work-runtime = "2.11.2"
androidx-xr-arcore = "1.0.0-alpha12"
androidx-xr-arcore-play-services = "1.0.0-alpha12"
androidx-xr-compose = "1.0.0-alpha12"
Expand All @@ -56,63 +56,63 @@ datastoreCore = "1.2.1"
datastorePreferencesRxjava2 = "1.2.1"
datastorePreferencesRxjava3 = "1.2.1"
firebase-bom = "34.10.0"
glide = "1.0.0-beta08"
glide = "1.0.0-beta09"
google-ar-core = "1.53.0"
google-maps = "20.0.0"
gradle-versions = "0.53.0"
guava = "33.5.0-jre"
guava-android = "33.5.0-jre"
gradle-versions = "0.54.0"
guava = "33.6.0-jre"
guava-android = "33.6.0-jre"
hilt = "2.59.2"
horologist = "0.8.3-alpha"
junit = "4.13.2"
kotlin = "2.3.10"
kotlin = "2.3.21"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Kotlin version 2.3.21 is not a valid release. The current stable versions are in the 2.0.x or 2.1.x range. This is likely a typo for 2.0.21 or 2.1.0.

Suggested change
kotlin = "2.3.21"
kotlin = "2.0.21"

kotlinCoroutinesOkhttp = "1.0"
kotlinxCoroutinesGuava = "1.10.2"
kotlinxSerialization = "1.10.0"
ksp = "2.3.6"
kotlinxSerialization = "1.11.0"
ksp = "2.3.7"
ktlint = "1.5.0"
lifecycleService = "2.10.0"
maps-compose = "8.2.1"
material = "1.14.0-alpha10"
material = "1.14.0-beta01"
material3-adaptive = "1.2.0"
material3-adaptive-navigation-suite = "1.4.0"
material3-adaptive-navigation3 = "1.3.0-alpha09"
media3 = "1.9.2"
media3Ui = "1.9.2"
mockitoKotlin = "5.3.1"
media3 = "1.10.0"
media3Ui = "1.10.0"
mockitoKotlin = "6.3.0"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The version 6.3.0 for mockitoKotlin appears to be invalid. The current stable major version is 5.x. Using a non-existent version will cause dependency resolution to fail.

Suggested change
mockitoKotlin = "6.3.0"
mockitoKotlin = "5.4.0"

# @keep
minSdk = "36"
okHttp = "5.3.2"
playServicesWearable = "19.0.0"
playbilling = "8.3.0"
protobuf = "4.34.0"
protobuf = "4.34.1"
protoc = "0.9.6"
protolayout = "1.3.0"
protolayout = "1.4.0"
reactive-streams = "1.0.4"
recyclerview = "1.4.0"
registryDigitalCredentials = "1.0.0-alpha04"
robolectric = "4.16.1"
roborazzi = "1.59.0"
spotless = "8.3.0"
spotless = "8.4.0"
targetSdk = "36"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should target sdk be left at 37?

tiles = "1.5.0"
tiles = "1.6.0"
tracing = "1.3.0"
truth = "1.4.4"
truth = "1.4.5"
tvComposeMaterial3 = "1.1.0-beta01"
validatorPush = "1.0.0-alpha09"
version-catalog-update = "1.1.0"
watchfaceComplicationsDataSourceKtx = "1.3.0"
wear = "1.4.0"
wearComposeFoundation = "1.6.0-rc01"
wearComposeMaterial = "1.6.0-rc01"
wearComposeMaterial3 = "1.6.0-rc01"
wearComposeFoundation = "1.6.1"
wearComposeMaterial = "1.6.1"
wearComposeMaterial3 = "1.6.1"
wearInput = "1.2.0"
wearOngoing = "1.1.0"
wearPhoneInteractions = "1.1.0"
wearRemoteInteractions = "1.2.0"
wearToolingPreview = "1.0.0"
webkit = "1.15.0"
wfp = "1.0.0-rc01"
wfp = "1.0.0"
androidx-core-telecom = "1.1.0-alpha04"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading