Merge pull request #5225 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -39,8 +39,8 @@
 - Bump Play Services Auth to v21.3.0
 - Bump AndroidX Core KTX to v1.15.0
 - Bump AndroidX RecyclerView to v1.4.0
-- Bump Kotlin to v2.1.0
-- Bump KSP to v2.1.0-1.0.29
+- Bump KSP to v2.1.10-1.0.29
+- Bump Kotlin to v2.1.10
 - Bump Jackson Core to v2.18.2
 - Bump Firebase Analytics to v22.2.0
 - Bump Open CSV to v5.10
@@ -53,6 +53,8 @@
 - Bump Sentry Android to v8.0.0
 - Bump Gradle to v8.12.1
 - Bump Sentry Gradle plugin to v5
+- Opt out of edge-to-edge enforcement in Android 15
+- Bump Google Gson to v2.12.0
 
 ### Fixes
 

common-ui/src/main/res/values-v35/theme.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <style name="Base.Theme.Simple" parent="Base.Theme.Simple.Global">
+    <!-- Platform -->
+    <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+  </style>
+</resources>

common-ui/src/main/res/values/theme.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="Base.Theme.Simple" parent="Theme.MaterialComponents.Light.NoActionBar">
+  <style name="Base.Theme.Simple.Global" parent="Theme.MaterialComponents.Light.NoActionBar">
     <!-- Dialog Themes -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Simple.Dialog.Alert</item>
     <item name="android:datePickerDialogTheme">@style/ThemeOverlay.Simple.Dialog</item>
@@ -53,6 +53,8 @@
     <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Simple.LargeComponent</item>
   </style>
 
+  <style name="Base.Theme.Simple" parent="Base.Theme.Simple.Global" />
+
   <style name="Theme.Simple" parent="Base.Theme.Simple">
     <item name="colorPrimary">@color/simple_light_blue_500</item>
     <item name="colorPrimaryVariant">@color/simple_light_blue_100</item>

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ dagger = "2.55"
 
 flipper = "0.273.0"
 
-kotlin = "2.1.0"
+kotlin = "2.1.10"
 
 ktlint = "0.36.0"
 
@@ -42,7 +42,7 @@ androidx-compose-bom = "2023.07.00-alpha02"
 
 composeThemeAdapter = "0.36.0"
 
-ksp = "2.1.0-1.0.29"
+ksp = "2.1.10-1.0.29"
 
 sqlCipher = "4.5.4"
 
@@ -111,7 +111,7 @@ firebase-analytics = "com.google.firebase:firebase-analytics-ktx:22.2.0"
 flipper-flipper = { module = "com.facebook.flipper:flipper", version.ref = "flipper" }
 flipper-networkPlugin = { module = "com.facebook.flipper:flipper-network-plugin", version.ref = "flipper" }
 
-gson = "com.google.code.gson:gson:2.11.0"
+gson = "com.google.code.gson:gson:2.12.0"
 
 itemanimators = "com.mikepenz:itemanimators:1.1.0"