Update a bunch of library and build versions

Also changed the order of the action workflow to make sure the cdr build does not contain the google services json file

.github/workflows/android.yaml

@@ -27,37 +27,37 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
 
-      - name: Save google-services.json
-        env:
-          GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
-        run: echo "$GOOGLE_SERVICES" > networksurvey/google-services.json
-
-      - name: Build Regular APK
+      - name: Build CDR APK
         env:
           NS_API_KEY: ${{ secrets.NS_API_KEY }}
-        run: ./gradlew assembleRegularDebug
+        run: ./gradlew assembleCdrDebug
           -PnsApiKey=$NS_API_KEY
 
       - name: Get APK name
         run: echo "base_name=`./gradlew :networksurvey:properties -q | grep 'archivesBaseName:' | awk '{print $2}'`" >> $GITHUB_ENV
 
-      - name: Upload Regular APK
+      - name: Upload CDR APK
         uses: actions/upload-artifact@v4
         with:
-          name: Network Survey Regular Debug APK
-          path: networksurvey/build/outputs/apk/regular/debug/${{ env.base_name }}-regular-debug.apk
+          name: Network Survey CDR Debug APK
+          path: networksurvey/build/outputs/apk/cdr/debug/${{ env.base_name }}-cdr-debug.apk
 
-      - name: Build CDR APK
+      - name: Save google-services.json
+        env:
+          GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
+        run: echo "$GOOGLE_SERVICES" > networksurvey/google-services.json
+
+      - name: Build Regular APK
         env:
           NS_API_KEY: ${{ secrets.NS_API_KEY }}
-        run: ./gradlew assembleCdrDebug
+        run: ./gradlew assembleRegularDebug
           -PnsApiKey=$NS_API_KEY
 
-      - name: Upload CDR APK
+      - name: Upload Regular APK
         uses: actions/upload-artifact@v4
         with:
-          name: Network Survey CDR Debug APK
-          path: networksurvey/build/outputs/apk/cdr/debug/${{ env.base_name }}-cdr-debug.apk
+          name: Network Survey Regular Debug APK
+          path: networksurvey/build/outputs/apk/regular/debug/${{ env.base_name }}-regular-debug.apk
 
 
   test:

build.gradle

@@ -1,21 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.9.21'
-    ext.hilt_version = '2.51.1'
+    ext.kotlin_version = '1.9.24'
+    ext.hilt_version = '2.52'
     ext.useCrashlytics = file("networksurvey/google-services.json").exists()
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         if (useCrashlytics) {
             classpath 'com.google.gms:google-services:4.4.2'
             classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
         }
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.1"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
     }
 }

networksurvey/build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'dagger.hilt.android.plugin'
 ext.androidVersion = '28.0.0'
 ext.grpcVersion = '1.65.1'
 ext.networkSurveyMessagingVersion = '1.5.0'
-ext.navigationVersion = '2.7.7'
+ext.navigationVersion = '2.8.1'
 
 android {
     compileSdk 34
@@ -54,7 +54,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.7'
+        kotlinCompilerExtensionVersion '1.5.14'
     }
     kotlinOptions {
         jvmTarget = "17"
@@ -139,8 +139,8 @@ dependencies {
     implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
     implementation 'com.google.zxing:core:3.5.3'
 
-    implementation 'com.google.dagger:dagger:2.51.1'
-    kapt 'com.google.dagger:dagger-compiler:2.51.1'
+    implementation "com.google.dagger:dagger:$hilt_version"
+    kapt "com.google.dagger:dagger-compiler:$hilt_version"
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
 
@@ -152,7 +152,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
 
     // Compose
-    def composeBom = platform('androidx.compose:compose-bom:2024.08.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.02')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -166,11 +166,11 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose"
     implementation "androidx.lifecycle:lifecycle-runtime-compose"
-    implementation 'androidx.compose.ui:ui-tooling:1.6.8'
+    implementation 'androidx.compose.ui:ui-tooling:1.7.2'
     implementation "com.google.accompanist:accompanist-themeadapter-material:0.28.0"
 
     // Only include firebase in the google play build
-    regularImplementation platform('com.google.firebase:firebase-bom:33.1.2')
+    regularImplementation platform('com.google.firebase:firebase-bom:33.3.0')
     regularImplementation 'com.google.firebase:firebase-analytics'
     regularImplementation 'com.google.firebase:firebase-crashlytics'
 
@@ -183,8 +183,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test:runner:1.6.2'
     androidTestImplementation 'androidx.test:rules:1.6.1'
-    androidTestImplementation 'com.adevinta.android:barista:4.2.0'
-    androidTestImplementation 'com.google.truth:truth:1.1.2'
+    androidTestImplementation 'com.adevinta.android:barista:4.3.0'
+    androidTestImplementation 'com.google.truth:truth:1.4.4'
     androidTestImplementation "com.craxiom:network-survey-messaging:${networkSurveyMessagingVersion}"
     androidTestImplementation "mil.nga.geopackage:geopackage-android:6.7.3"
 }