Merge pull request #44 from CathalOConnorRH/dev

Merge from Dev to Main for release 0.3

.github/workflows/BuildAndRelease.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: setup jdk
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'

.github/workflows/android-apk-generation.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       # Set Current Date As Env Variable
       - name: Set current date as env variable
@@ -40,7 +40,7 @@ jobs:
         run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
 
       - name: Set Up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '17'
@@ -73,21 +73,21 @@ jobs:
       # Upload Artifact Build
       # Noted For Output [main_project_module]/build/outputs/apk/debug/
       - name: Upload APK Debug - ${{ env.repository_name }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
           path: ${{ env.main_project_module }}/build/outputs/apk/debug/
 
       # Noted For Output [main_project_module]/build/outputs/apk/release/
       - name: Upload APK Release - ${{ env.repository_name }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
           path: ${{ env.main_project_module }}/build/outputs/apk/release/
 
       # Noted For Output [main_project_module]/build/outputs/bundle/release/
       - name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
           path: ${{ env.main_project_module }}/build/outputs/bundle/release/

.github/workflows/android.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
      steps:
          # 1
          - name: Checkout code
-           uses: actions/checkout@v2
+           uses: actions/checkout@v4
          # 2
          - name: Generate Release APK
            run: ./gradlew assembleFossRelease

.github/workflows/publish.yml

@@ -8,7 +8,7 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         # 1
-        - uses: dawidd6/action-download-artifact@v2
+        - uses: dawidd6/action-download-artifact@v3
           with:
             github_token: ${{secrets.GITHUB_TOKEN}}
             workflow: build.yml
@@ -24,7 +24,7 @@ jobs:
             echo "::set-output name=release_tag::APP_$(date +"%Y.%m.%d_%H-%M")"
         # 3
         - name: Release
-          uses: softprops/action-gh-release@v1
+          uses: softprops/action-gh-release@v2
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:

app/build.gradle.kts

@@ -9,6 +9,21 @@ plugins {
     alias(libs.plugins.googleAndroidLibrariesMapsplatformSecretsGradlePlugin)
 }
 
+secrets {
+    // Optionally specify a different file name containing your secrets.
+    // The plugin defaults to "local.properties"
+    propertiesFileName = "secrets.properties"
+
+    // A properties file containing default secret values. This file can be
+    // checked in version control.
+    defaultPropertiesFileName = "local.defaults.properties"
+
+    // Configure which keys should be ignored by the plugin by providing regular expressions.
+    // "sdk.dir" is ignored by default.
+    ignoreList.add("keyToIgnore") // Ignore the key "keyToIgnore"
+    ignoreList.add("sdk.*")       // Ignore all keys matching the regexp "sdk.*"
+}
+
 android {
     namespace = "ie.coconnor.mobileappdev"
     compileSdk = 34
@@ -63,7 +78,7 @@ android {
         viewBinding = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
+        kotlinCompilerExtensionVersion = "1.5.12"
     }
     packaging {
         resources {
@@ -101,32 +116,32 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
     // Splash API
     implementation ("androidx.core:core-splashscreen:1.0.1")
-    implementation("com.google.android.gms:play-services-auth:20.5.0")
-    implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0")
-    implementation ("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-    implementation ("androidx.navigation:navigation-compose:2.5.3")
-    implementation ("io.coil-kt:coil-compose:2.2.2")
-    implementation ("androidx.compose.material:material-icons-extended:1.6.3")
-    implementation ("androidx.appcompat:appcompat:1.2.0")
-    implementation ("com.firebaseui:firebase-ui-auth:7.2.0")
-
-    implementation("com.google.dagger:hilt-android:2.51")
-    kapt("com.google.dagger:hilt-android-compiler:2.51")
-    implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
+    implementation("com.google.android.gms:play-services-auth:21.1.0")
+    implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
+    implementation ("androidx.lifecycle:lifecycle-runtime-compose:2.7.0")
+    implementation ("androidx.navigation:navigation-compose:2.7.7")
+    implementation ("io.coil-kt:coil-compose:2.6.0")
+    implementation ("androidx.compose.material:material-icons-extended:1.6.6")
+    implementation ("androidx.appcompat:appcompat:1.6.1")
+    implementation ("com.firebaseui:firebase-ui-auth:8.0.2")
+
+    implementation("com.google.dagger:hilt-android:2.51.1")
+    kapt("com.google.dagger:hilt-android-compiler:2.51.1")
+    implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
 
     // Retrofit for network requests
-    implementation ("com.squareup.retrofit2:retrofit:2.10.0")
-    implementation ("com.squareup.retrofit2:converter-gson:2.10.0")
+    implementation ("com.squareup.retrofit2:retrofit:2.11.0")
+    implementation ("com.squareup.retrofit2:converter-gson:2.11.0")
 
-    implementation ("androidx.compose.runtime:runtime-livedata:1.6.3")
-    implementation ("com.google.android.gms:play-services-maps:18.1.0")
-    implementation ("com.google.android.gms:play-services-location:21.0.1")
-    implementation ("com.google.maps.android:maps-compose:4.3.3")
+    implementation ("androidx.compose.runtime:runtime-livedata:1.6.6")
+    implementation ("com.google.android.gms:play-services-maps:18.2.0")
+    implementation ("com.google.android.gms:play-services-location:21.2.0")
+    implementation ("com.google.maps.android:maps-compose:4.4.1")
     implementation ("com.google.maps.android:maps-ktx:5.0.0")
 
-    implementation ("com.squareup.moshi:moshi:1.14.0")
-    implementation ("com.squareup.moshi:moshi-kotlin:1.14.0")
+    implementation ("com.squareup.moshi:moshi:1.15.1")
+    implementation ("com.squareup.moshi:moshi-kotlin:1.15.1")
 
-    implementation("io.klogging:klogging-jvm:0.5.11")
+    implementation ("com.jakewharton.timber:timber:5.0.1")
 
 }

app/src/main/AndroidManifest.xml

@@ -47,7 +47,10 @@
             />
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps" />
+            android:value="${MAPS_API_KEY}"/>
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
 
         <activity
             android:name=".MainActivity"

app/src/main/java/ie/coconnor/mobileappdev/AuthViewModel.kt

@@ -47,4 +47,8 @@ class AuthViewModel @Inject constructor(
         DataProvider.signOutResponse = Response.Loading
         DataProvider.signOutResponse = repository.signOut()
     }
+
+    fun signInWithCredentials() = {
+
+    }
 }