Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync: main to latest #195

Closed
wants to merge 2 commits into from
Closed
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
20 changes: 20 additions & 0 deletions .github/workflows/sync_main_latest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Sync main and latest
on:
push:
branches:
- main

jobs:
sync-branches:
runs-on: ubuntu-latest
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Opening pull request
id: pull
uses: tretuna/sync-branches@1.4.0
with:
GITHUB_TOKEN: ${{secrets.PAT}}
FROM_BRANCH: "main"
TO_BRANCH: "latest"
33 changes: 16 additions & 17 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
[versions]
accompanist = "0.32.0"
androidGradlePlugin = "8.1.2"
androidx-activity-compose = "1.8.0-rc01"
androidGradlePlugin = "8.2.2"
androidx-activity-compose = "1.9.0-alpha02"
androidx-appcompat = "1.6.1"
androidx-compose-bom = "2023.10.01"
androidx-compose-bom = "2024.01.00"
androidx-constraintlayout = "2.1.4"
androidx-constraintlayout-compose = "1.0.1"
androidx-coordinator-layout = "1.2.0"
androidx-corektx = "1.9.0"
androidx-emoji2-views = "1.4.0"
androidx-fragment-ktx = "1.6.1"
androidx-fragment-ktx = "1.6.2"
androidx-glance-appwidget = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.4"
androidx-lifecycle-compose = "2.7.0"
androidx-lifecycle-runtime-compose = "2.7.0"
androidx-navigation = "2.7.6"
androidx-paging = "3.2.1"
androidx-test = "1.5.0"
androidx-test-espresso = "3.5.1"
androidxHiltNavigationCompose = "1.0.0"
coil = "2.4.0"
androidxHiltNavigationCompose = "1.1.0"
coil = "2.5.0"
# @keep
compileSdk = "34"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.2.0"
gradle-versions = "0.49.0"
hilt = "2.48.1"
gradle-versions = "0.51.0"
hilt = "2.50"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.9.20"
ksp = "1.8.0-1.0.9"
maps-compose = "3.1.1"
maps-compose = "4.3.2"
material = "1.11.0"
material3-adaptive = "1.0.0-alpha04"
material3-adaptive = "1.0.0-alpha05"
material3-adaptive-navigation-suite = "1.0.0-alpha02"
# @keep
minSdk = "21"
recyclerview = "1.3.2"
# @keep
targetSdk = "34"
version-catalog-update = "0.8.1"
version-catalog-update = "0.8.3"

[libraries]
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
Expand All @@ -64,8 +64,7 @@ androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
# TODO remove usage of this when `draw` method is in stable.
androidx-compose-ui-graphics = "androidx.compose.ui:ui-graphics:1.6.0-alpha08"
androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" }
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
Expand All @@ -92,7 +91,7 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
androidx-test-runner = "androidx.test:runner:1.5.2"
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.8.1"
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.9.0"
coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Nov 30 15:03:58 PST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading