Skip to content

Commit ef49816

Browse files
committed
Merge branch 'main' into latest
2 parents 0bad025 + 1d934b8 commit ef49816

File tree

6 files changed

+260
-156
lines changed

6 files changed

+260
-156
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Sync main and latest
2+
on:
3+
push:
4+
branches:
5+
- main
6+
7+
jobs:
8+
sync-branches:
9+
runs-on: ubuntu-latest
10+
name: Syncing branches
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v2
14+
- name: Opening pull request
15+
id: pull
16+
uses: tretuna/[email protected]
17+
with:
18+
GITHUB_TOKEN: ${{secrets.PAT}}
19+
FROM_BRANCH: "main"
20+
TO_BRANCH: "latest"

gradle/libs.versions.toml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
[versions]
22
accompanist = "0.32.0"
3-
androidGradlePlugin = "8.1.2"
4-
androidx-activity-compose = "1.8.0-rc01"
3+
androidGradlePlugin = "8.2.2"
4+
androidx-activity-compose = "1.9.0-alpha02"
55
androidx-appcompat = "1.6.1"
6-
androidx-compose-bom = "2023.10.01"
6+
androidx-compose-bom = "2024.01.00"
77
androidx-constraintlayout = "2.1.4"
88
androidx-constraintlayout-compose = "1.0.1"
99
androidx-coordinator-layout = "1.2.0"
1010
androidx-corektx = "1.9.0"
1111
androidx-emoji2-views = "1.4.0"
12-
androidx-fragment-ktx = "1.6.1"
12+
androidx-fragment-ktx = "1.6.2"
1313
androidx-glance-appwidget = "1.0.0"
14-
androidx-lifecycle-compose = "2.6.2"
15-
androidx-lifecycle-runtime-compose = "2.6.2"
16-
androidx-navigation = "2.7.4"
14+
androidx-lifecycle-compose = "2.7.0"
15+
androidx-lifecycle-runtime-compose = "2.7.0"
16+
androidx-navigation = "2.7.6"
1717
androidx-paging = "3.2.1"
1818
androidx-test = "1.5.0"
1919
androidx-test-espresso = "3.5.1"
20-
androidxHiltNavigationCompose = "1.0.0"
21-
coil = "2.4.0"
20+
androidxHiltNavigationCompose = "1.1.0"
21+
coil = "2.5.0"
2222
# @keep
2323
compileSdk = "34"
2424
compose-compiler = "1.5.4"
2525
compose-latest = "1.7.0-alpha01"
2626
coroutines = "1.7.3"
2727
google-maps = "18.2.0"
28-
gradle-versions = "0.49.0"
29-
hilt = "2.48.1"
28+
gradle-versions = "0.51.0"
29+
hilt = "2.50"
3030
junit = "4.13.2"
3131
# @pin Update in conjuction with Compose Compiler
3232
kotlin = "1.9.20"
3333
ksp = "1.8.0-1.0.9"
34-
maps-compose = "3.1.1"
34+
maps-compose = "4.3.2"
3535
material = "1.11.0"
36-
material3-adaptive = "1.0.0-alpha04"
36+
material3-adaptive = "1.0.0-alpha05"
3737
material3-adaptive-navigation-suite = "1.0.0-alpha02"
3838
# @keep
3939
minSdk = "21"
4040
recyclerview = "1.3.2"
4141
# @keep
4242
targetSdk = "34"
43-
version-catalog-update = "0.8.1"
43+
version-catalog-update = "0.8.3"
4444

4545
[libraries]
4646
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
@@ -65,8 +65,7 @@ androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
6565
androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
6666
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
6767
androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
68-
# TODO remove usage of this when `draw` method is in stable.
69-
androidx-compose-ui-graphics = "androidx.compose.ui:ui-graphics:1.6.0-alpha08"
68+
androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
7069
androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" }
7170
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
7271
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
@@ -93,7 +92,7 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
9392
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
9493
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
9594
androidx-test-runner = "androidx.test:runner:1.5.2"
96-
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.8.1"
95+
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.9.0"
9796
coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
9897
google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
9998
googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }

gradle/wrapper/gradle-wrapper.jar

8.83 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Nov 30 15:03:58 PST 2022
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)