Merge branch 'release/3.2.1'

benoitletondor · Apr 14, 2024 · 8c848bf · 8c848bf
2 parents b697f6d + 9ddd4d4
commit 8c848bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/Android/EasyBudget/app/build.gradle.kts b/Android/EasyBudget/app/build.gradle.kts
@@ -38,8 +38,8 @@ android {
         compileSdk = 34
         minSdk = 23
         targetSdk = 34
-        versionCode = 133
-        versionName = "3.2.0"
+        versionCode = 134
+        versionName = "3.2.1"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -93,7 +93,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
+        kotlinCompilerExtensionVersion = "1.5.11"
     }
 
     buildFeatures {
@@ -103,24 +103,6 @@ android {
     }
 }
 
-// Remove this when https://github.com/google/dagger/issues/4049 is merged
-androidComponents {
-    onVariants(selector().all()) { variant ->
-        afterEvaluate {
-            // This is a workaround for https://issuetracker.google.com/301245705 which depends on internal
-            // implementations of the android gradle plugin and the ksp gradle plugin which might change in the future
-            // in an unpredictable way.
-            project.tasks.getByName("ksp" + variant.name.capitalize() + "Kotlin") {
-                val dataBindingTask = project.tasks.getByName ("dataBindingGenBaseClasses" + variant.name.capitalize()) as com.android.build.gradle.internal.tasks.databinding.DataBindingGenBaseClassesTask
-
-                (this as org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool<*>).setSource(
-                    dataBindingTask.sourceOutFolder
-                )
-            }
-        }
-    }
-}
-
 dependencies {
     val kotlinVersion: String by rootProject.extra
     val hiltVersion: String by rootProject.extra
@@ -148,15 +130,15 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0")
 
-    implementation(platform("com.google.firebase:firebase-bom:32.7.4"))
+    implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
     implementation("com.google.firebase:firebase-messaging-ktx")
     implementation("com.google.firebase:firebase-storage")
     implementation("com.google.firebase:firebase-crashlytics")
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("com.google.firebase:firebase-firestore-ktx")
     implementation("com.firebaseui:firebase-ui-auth:8.0.2")
 
-    val composeBom = platform("androidx.compose:compose-bom:2024.02.02")
+    val composeBom = platform("androidx.compose:compose-bom:2024.04.00")
     implementation(composeBom)
     androidTestImplementation(composeBom)
     debugImplementation("androidx.compose.ui:ui-tooling")

diff --git a/Android/EasyBudget/build.gradle.kts b/Android/EasyBudget/build.gradle.kts
@@ -13,17 +13,17 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-val kotlinVersion by extra("1.9.22") // Change in the plugins below too
-val hiltVersion by extra("2.51") // Change in the plugins below too
+val kotlinVersion by extra("1.9.23") // Change in the plugins below too
+val hiltVersion by extra("2.51.1") // Change in the plugins below too
 val realmVersion by extra("1.14.1") // Change in the plugins below too
 
 plugins {
-    id("com.android.application") version "8.3.1" apply false
-    id("com.android.library") version "8.3.1" apply false
+    id("com.android.application") version "8.3.2" apply false
+    id("com.android.library") version "8.3.2" apply false
     id("com.google.firebase.crashlytics") version "2.9.9" apply false
     id("com.google.gms.google-services") version "4.4.1" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-    id("com.google.dagger.hilt.android") version "2.51" apply false
-    id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+    id("com.google.dagger.hilt.android") version "2.51.1" apply false
+    id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false
     id("io.realm.kotlin") version "1.14.1" apply false
 }