From 71e090e1568949af726ba0080ec4b7ae2ace5ce8 Mon Sep 17 00:00:00 2001
From: Siddharth Agarwal <sagarwal@rtsl.org>
Date: Thu, 21 Mar 2024 16:55:12 +0530
Subject: [PATCH] update gradle version

---
 CHANGELOG.md                             |  2 +-
 app/build.gradle.kts                     |  2 +-
 gradle.properties                        |  1 -
 gradle/libs.versions.toml                | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 mobius-base/build.gradle.kts             |  3 +++
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7789e87d69c..829311eb018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Internal
 
-- Bump AGP to v8.3.0
+- Bump AGP to v8.3.1
 
 ## 2024-01-08-8979
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3eddc4c1920..4e61a5eb952 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -3,7 +3,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
 import org.simple.rmg.RoomMetadataGenerator
-import java.util.Locale
 
 plugins {
   id("com.android.application")
@@ -164,6 +163,7 @@ android {
   buildFeatures {
     viewBinding = true
     compose = true
+    buildConfig = true
   }
 
   composeOptions {
diff --git a/gradle.properties b/gradle.properties
index c1c1a7d7aed..80641b3f82c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,6 @@ defaultProguardFile=proguard-android-optimize.txt
 # Android-specific flags
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.suppressUnsupportedCompileSdk=34
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc2ac879b2c..95ac3c297b9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ dagger = "2.48.1"
 
 flipper = "0.176.0"
 
-kotlin = "1.9.10"
+kotlin = "1.9.23"
 
 ktlint = "0.36.0"
 
@@ -33,19 +33,19 @@ rx-binding = "3.1.0"
 
 coroutines = "1.6.4"
 
-compose-compiler = "1.5.3"
+compose-compiler = "1.5.11"
 
 androidx-compose-bom = "2023.07.00-alpha02"
 
 composeThemeAdapter = "0.31.3-beta"
 
-ksp = "1.9.10-1.0.13"
+ksp = "1.9.23-1.0.19"
 
 sqlCipher = "4.5.4"
 
 [libraries]
-android-gradle-plugin = "com.android.tools.build:gradle:8.3.0"
-android-desugaring = "com.android.tools:desugar_jdk_libs:1.2.3"
+android-desugaring = "com.android.tools:desugar_jdk_libs:2.0.4"
+android-gradle-plugin = "com.android.tools.build:gradle:8.3.1"
 
 androidx-annotation-annotation = "androidx.annotation:annotation:1.5.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 744c64d1277..509c4a29b43 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mobius-base/build.gradle.kts b/mobius-base/build.gradle.kts
index ef7e21b88a3..1d389b6dda9 100644
--- a/mobius-base/build.gradle.kts
+++ b/mobius-base/build.gradle.kts
@@ -32,6 +32,8 @@ android {
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+
+    isCoreLibraryDesugaringEnabled = true
   }
 
   kotlinOptions {
@@ -40,6 +42,7 @@ android {
 }
 
 dependencies {
+  coreLibraryDesugaring(libs.android.desugaring)
   api(libs.bundles.mobius)
 
   implementation(libs.kotlin.stdlib)