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.

Sign up for GitHub

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

Jump to bottom

Update all dependencies #35

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update all dependencies #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 17
- name: Build with Gradle
Expand Down
20 changes: 10 additions & 10 deletions android-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ android {


dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")

implementation(platform("com.google.firebase:firebase-bom:26.2.0"))
implementation(platform("com.google.firebase:firebase-bom:33.6.0"))
implementation("com.google.firebase:firebase-analytics-ktx")
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.activity:activity-compose:1.9.3")

implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.foundation)
Expand All @@ -136,20 +136,20 @@ dependencies {
implementation(libs.koin.android)
implementation(libs.koin.androidx.compose)

implementation("io.github.pushpalroy:jetlime:2.0.1")
implementation("io.github.pushpalroy:jetlime:3.0.1")

// TODO: Added this as a temporary fix for a crash in ProgressIndicator, can be removed later.
// Issue: https://github.com/JetBrains/compose-multiplatform/issues/4157
implementation("androidx.compose.material3:material3-android:1.2.1")
implementation("androidx.compose.material3:material3-android:1.3.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1")
implementation("com.google.maps.android:android-maps-utils:2.3.0")
implementation("com.google.maps.android:android-maps-utils:3.9.0")

implementation("com.google.android.gms:play-services-location:16.0.0")
implementation("com.google.android.gms:play-services-maps:18.0.2")
implementation("com.google.android.gms:play-services-location:21.3.0")
implementation("com.google.android.gms:play-services-maps:19.0.0")

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")

implementation(project(":SharedCode"))
}
Expand Down
4 changes: 2 additions & 2 deletions ar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ dependencies {
implementation Kotlin.stdLib

// ARCore
implementation 'com.google.ar:core:1.4.0'
implementation 'de.javagl:obj:0.2.1'
implementation 'com.google.ar:core:1.46.0'
implementation 'de.javagl:obj:0.4.0'
}
36 changes: 18 additions & 18 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,53 @@ kotlinx-dateTime = "0.6.1"


composeUiTooling = "1.3.1"
androidGradlePlugin = "8.7.1"
androidGradlePlugin = "8.7.2"
koin = "4.0.0"
koinCompose = "4.0.0"
koinComposeMultiplatform = "1.2.0-Beta4"
ktor = "3.0.0"
ktor = "3.0.1"
slf4j = "2.0.16"
sqlDelight = "2.0.2"
kmpNativeCoroutines = "1.0.0-ALPHA-35"
kmpNativeCoroutines = "1.0.0-ALPHA-37"
googleServices = "4.4.2"

androidxActivity = "1.9.3"
androidxComposeCompiler = "1.5.8"
jbComposeCompiler = "1.5.4"
androidxComposeBom = "2024.10.00"
androidxNavigationCompose = "2.8.3"
uiToolingPreview = "1.7.4"
androidxLifecycle = "2.8.6"
imageLoader = "1.8.3"
androidxComposeBom = "2024.11.00"
androidxNavigationCompose = "2.8.4"
uiToolingPreview = "1.7.5"
androidxLifecycle = "2.8.7"
imageLoader = "1.9.0"
osmdroidAndroid = "6.1.20"
googleMapsCompose = "5.0.3"
googleMapsCompose = "6.2.1"

composeMultiplatform = "1.7.0"
composeMultiplatform = "1.8.0+check"
accompanist = "0.36.0"
coilCompose = "2.7.0"
horologist = "0.6.20"
okhttp = "5.0.0-alpha.14"

junit = "4.13.2"
androidxTestJUnit = "1.2.1"
robolectric = "4.13"
robolectric = "4.14.1"
androidxTestCore = "1.6.1"
mockito = "3.11.2"
mockito = "5.2.0"

multiplatformSettings = "1.2.0"
kermit = "2.0.4"
kermit = "2.0.5"

minSdk = "24"
targetSdk = "34"
compileSdk = "34"
coreKtx = "1.13.1"
coreKtx = "1.15.0"
espressoCore = "3.6.1"
appcompat = "1.7.0"
material = "1.12.0"
constraintlayout = "2.1.4"
lifecycleLivedataKtx = "2.8.6"
navigationFragmentKtx = "2.8.3"
navigationUiKtx = "2.8.3"
constraintlayout = "2.2.0"
lifecycleLivedataKtx = "2.8.7"
navigationFragmentKtx = "2.8.4"
navigationUiKtx = "2.8.4"


[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun May 28 21:12:18 IST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading