Update dependency fastlane to v2.221.1

.gitignore

@@ -9,7 +9,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
-/build
+**/build
 /captures
 .externalNativeBuild
 .cxx

Gemfile.lock

@@ -7,20 +7,20 @@ GEM
       rexml
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.894.0)
-    aws-sdk-core (3.191.3)
+    aws-partitions (1.945.0)
+    aws-sdk-core (3.197.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.85.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.143.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.109.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -67,7 +67,7 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.3.0)
+    fastimage (2.3.1)
     fastlane (2.214.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
@@ -125,12 +125,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
+    google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
+    google-cloud-errors (1.4.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -146,31 +146,32 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.1)
-    jwt (2.8.1)
+    json (2.7.2)
+    jwt (2.8.2)
       base64
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     naturally (2.2.1)
     nkf (0.2.0)
     optparse (0.1.1)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.0.4)
-    rake (13.1.0)
+    public_suffix (5.1.1)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -183,6 +184,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)

README.md

@@ -5,7 +5,7 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/savvasdalkitsis/uhuruphotos-android/badge/main)](https://www.codefactor.io/repository/github/savvasdalkitsis/uhuruphotos-android/overview/main)
 [![GitHub Sponsor](https://img.shields.io/github/sponsors/savvasdalkitsis?label=Sponsor&logo=GitHub)](https://github.com/sponsors/savvasdalkitsis)
 
-# <img src="https://github.com/savvasdalkitsis/uhuruphotos-android/raw/main/foundation/icons/api/src/main/ic_launcher-playstore.png" alt="logo" width = 60px> UhuruPhotos. A modern media gallery.
+# <img src="https://github.com/savvasdalkitsis/uhuruphotos-android/raw/main/foundation/icons/api/src/androidMain/ic_launcher-playstore.png" alt="logo" width = 60px> UhuruPhotos. A modern media gallery.
 
 Welcome to UhuruPhotos. A modern media gallery, with features like backup/sync, semantic search, media map, face recognition, memories and much more*
 
@@ -42,6 +42,16 @@ Features include:
 * Foldables support.
 * ...and more
 
+# Building
+
+To build the app you will need to copy the file `mock-google-services.json` from the root of the project into the `app` folder and rename it to `google-services.json`.
+
+Then simply run the command:
+
+```shell
+./gradlew :app:installDebug
+```
+
 # Installation
 
 ## Play store
@@ -81,4 +91,4 @@ existing translations at [weblate](https://hosted.weblate.org/engage/uhuruphotos
   </picture>
 </a>
 
-This project is tested with BrowserStack.
+This project is tested with BrowserStack.

app/build.gradle

@@ -1,7 +1,8 @@
 plugins {
-    id 'dagger.hilt.android.plugin'
-    alias(libs.plugins.google.services)
+    id "android.app"
     alias(libs.plugins.about)
+    alias(libs.plugins.google.services)
+
     id 'com.bugsnag.android.gradle'
 }
 
@@ -12,11 +13,8 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion libs.versions.compose.compiler.get()
     }
-
     defaultConfig {
         applicationId "com.savvasdalkitsis.uhuruphotos"
-        minSdk 24
-        targetSdk 34
         versionCode 219
         versionName "0.0.219"
 
@@ -72,10 +70,11 @@ dependencies {
             libs.androidx.compose.ui,
             libs.androidx.splash,
             libs.androidx.work.hilt,
-            libs.bundles.autodagger,
             libs.bugsnag,
+            libs.bundles.autodagger,
             libs.hilt,
             libs.permissions.base,
+            project(":app:implementation"),
             project(":feature:auth:domain:api"),
             project(":feature:auth:view:api"),
             project(":feature:download:domain:api"),
@@ -90,7 +89,6 @@ dependencies {
             project(":foundation:ui:api"),
             project(":foundation:ui:implementation"),
             project(":foundation:video:api"),
-            project(":app:implementation"),
     )
     debugImplementation(
             libs.leaks,

app/implementation/build.gradle

@@ -1,11 +1,19 @@
+plugins {
+    id "android.library"
+}
+
 android {
     namespace 'com.savvasdalkitsis.uhuruphotos.app.implementation'
 }
 
-dependencies {
-    for (p in rootProject.subprojects) {
-        if (p.path.contains(":implementation") && p != project) {
-            implementation p
+sourceSets {
+    commonMain {
+        dependencies {
+            for (p in rootProject.subprojects) {
+                if (p.path.endsWith(":implementation") && p != project) {
+                    implementation p
+                }
+            }
         }
     }
-}
+}

build.gradle

@@ -18,18 +18,16 @@ plugins {
     alias(libs.plugins.about) apply false
     alias(libs.plugins.android.app) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.compose) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.powerassert) apply false
     alias(libs.plugins.redacted) apply false
     alias(libs.plugins.sqldelight) apply false
 }
 
-tasks.register('clean', Delete) {
-    delete rootProject.layout.buildDirectory
-}
-
 sonarqube {
     properties {
         property "sonar.projectKey", "savvasdalkitsis_uhuruphotos-android"
@@ -39,37 +37,11 @@ sonarqube {
 }
 
 subprojects {
-    if (name == "app") {
-        apply plugin: libs.plugins.android.app.get().pluginId
-    } else {
-        apply plugin: libs.plugins.android.library.get().pluginId
-    }
     apply plugin: libs.plugins.powerassert.get().pluginId
-    apply plugin: libs.plugins.kotlin.android.get().pluginId
-    apply plugin: libs.plugins.kotlin.kapt.get().pluginId
     apply plugin: libs.plugins.redacted.get().pluginId
     apply plugin: libs.plugins.ksp.get().pluginId
 
-    android {
-        compileSdk 34
-
-        defaultConfig {
-            minSdk 24
-            targetSdk 34
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_17
-            targetCompatibility JavaVersion.VERSION_17
-        }
-        kotlinOptions {
-            jvmTarget = '17'
-        }
-    }
-
-    dependencies {
-        kapt libs.hilt.dagger.compiler
-        kapt libs.androidx.hilt.compiler
-    }
+    tasks.register('allDeps', DependencyReportTask) {}
 
     tasks.withType(KotlinCompile).configureEach {
         compilerOptions {
@@ -90,6 +62,7 @@ subprojects {
                     "-opt-in=kotlinx.ExperimentalStdlibApi",
                     "-opt-in=kotlin.ExperimentalStdlibApi",
                     "-Xcontext-receivers",
+                    "-Xexpect-actual-classes",
             )
         }
     }

buildSrc/build.gradle

@@ -0,0 +1,3 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}

buildSrc/src/main/groovy/android.app.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id "com.android.application"
+    id "org.jetbrains.kotlin.android"
+    id "android.common"
+}
+
+android {
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+}
+
+dependencies {
+    implementation(
+            libs.hilt
+    )
+    kapt libs.hilt.dagger.compiler
+    kapt libs.androidx.hilt.compiler
+}

buildSrc/src/main/groovy/android.common.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id "org.jetbrains.kotlin.kapt"
+    id "com.google.dagger.hilt.android"
+}
+
+android {
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 24
+        targetSdk 34
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}

buildSrc/src/main/groovy/android.library.gradle

@@ -0,0 +1,27 @@
+plugins {
+    id "com.android.library"
+    id "org.jetbrains.kotlin.multiplatform"
+    id "android.common"
+}
+
+kotlin {
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = '17'
+            }
+        }
+    }
+}
+
+sourceSets {
+    androidMain {
+        dependencies {
+            implementation(
+                    libs.hilt
+            )
+            kapt libs.hilt.dagger.compiler
+            kapt libs.androidx.hilt.compiler
+        }
+    }
+}

cookiecutter-templates/feature/{{cookiecutter.project_slug}}/domain/implementation/build.gradle

@@ -8,5 +8,5 @@ dependencies {
             libs.hilt,
             project(":feature:{{cookiecutter.project_slug}}:domain:api"),
     )
-    kapt libs.autodagger.kapt
+    ksp libs.autodagger.ksp
 }