diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 09fce0f39..e2d996252 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -59,10 +59,52 @@ updates: schedule: interval: monthly groups: + AndroidX: + patterns: + - androidx.core:core-ktx + - androidx.appcompat:appcompat + - androidx.preference:preference-ktx + lifecycle: + patterns: + - androidx.lifecycle:lifecycle-runtime-ktx + - androidx.lifecycle:lifecycle-extensions + - androidx.lifecycle:lifecycle-viewmodel-ktx + - androidx.lifecycle:lifecycle-livedata-ktx + navigation: + patterns: + - androidx.navigation:navigation-fragment-ktx + - androidx.navigation:navigation-ui-ktx hilt: patterns: + - androidx.lifecycle:lifecycle-viewmodel-ktx + - androidx.constraintlayout:constraintlayout + - androidx.hilt:hilt-compiler - com.google.dagger.hilt.android + - com.google.dagger:hilt.android - com.google.dagger:hilt-android-compiler + retrofit: + patterns: + - com.squareup.retrofit2:retrofit + - com.squareup.retrofit2:converter-moshi + okhttp: + patterns: + - com.squareup.okhttp3:okhttp + - com.squareup.okhttp3:logging-interceptor + moshi: + patterns: + - com.squareup.moshi:moshi + - com.squareup.moshi:moshi-kotlin + junit: + patterns: + - junit:junit + - androidx.test.ext:junit + - androidx.browser:browser + firebase: + patterns: + - com.google.firebase:firebase-crashlytics-ktx + - com.google.firebase:firebase-crashlytics-ndk + - com.google.firebase:firebase-analytics-ktx + - package-ecosystem: swift directory: swift/apple/FirezoneKit/ schedule: diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 4a424a72d..342fbea86 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -154,11 +154,8 @@ android { } dependencies { - val coreVersion = "1.12.0" - val navVersion = "2.7.6" - // AndroidX - implementation("androidx.core:core-ktx:$coreVersion") + implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.preference:preference-ktx:1.2.0") @@ -172,16 +169,12 @@ dependencies { implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1") // Navigation - implementation("androidx.navigation:navigation-fragment-ktx:$navVersion") - implementation("androidx.navigation:navigation-ui-ktx:$navVersion") - - // Safe Args - // + implementation("androidx.navigation:navigation-fragment-ktx:2.7.6") + implementation("androidx.navigation:navigation-ui-ktx:2.7.6") // Hilt - implementation("com.google.dagger:hilt-android:2.50") + implementation("com.google.dagger:hilt-android:2.51") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.core:core-ktx:$coreVersion") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") kapt("androidx.hilt:hilt-compiler:1.2.0") kapt("com.google.dagger:hilt-android-compiler:2.50") @@ -217,7 +210,6 @@ dependencies { implementation("com.google.firebase:firebase-crashlytics-ktx") implementation("com.google.firebase:firebase-crashlytics-ndk") implementation("com.google.firebase:firebase-analytics-ktx") - implementation("com.google.firebase:firebase-installations-ktx") } cargo { diff --git a/kotlin/android/build.gradle.kts b/kotlin/android/build.gradle.kts index bb958fd75..272c4ada1 100644 --- a/kotlin/android/build.gradle.kts +++ b/kotlin/android/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("org.jetbrains.kotlin.android") version "1.8.22" apply false id("com.android.application") version "8.3.0" apply false id("com.google.firebase.appdistribution") version "4.0.1" apply false - id("com.google.dagger.hilt.android") version "2.50" apply false + id("com.google.dagger.hilt.android") version "2.51" apply false id("com.google.gms.google-services") version "4.4.1" apply false id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false id("com.google.firebase.crashlytics") version "2.9.9" apply false