Merge branch 'develop' into dependabot/gradle/kotlin-1.9.22

michaelbel · Jan 14, 2024 · aa162a2 · aa162a2
2 parents d8f2546 + 4e1dbea
commit aa162a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -113,6 +113,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
             </intent-filter>
 
         </activity-alias>
@@ -128,6 +129,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
             </intent-filter>
 
         </activity-alias>
@@ -143,6 +145,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
             </intent-filter>
 
         </activity-alias>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ compile-sdk = "34"
 target-sdk = "34"
 gradle = "8.2.1"
 kotlin = "1.9.22"
-kotlin-ksp = "1.9.21-1.0.16"
+kotlin-ksp = "1.9.22-1.0.16"
 kotlin-coroutines = "1.7.3"
 kotlin-serialization-json = "1.6.2"
 detekt = "1.23.4"
@@ -38,7 +38,7 @@ androidx-browser = "1.7.0"
 androidx-core-ktx = "1.12.0"
 androidx-core-splashscreen = "1.0.1"
 androidx-constraintlayout = "1.0.1"
-androidx-lifecycle = "2.6.2"
+androidx-lifecycle = "2.7.0"
 androidx-hilt-navigation-compose = "1.1.0"
 androidx-hilt-work = "1.1.0"
 androidx-navigation = "2.7.6"