diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 0000000..e8e4524
--- /dev/null
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidTestResultsUserPreferences">
+    <option name="androidTestResultsTableState">
+      <map>
+        <entry key="28629151">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_7_API_34" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index c63d3a2..bc49647 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,6 +13,9 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
+      <SelectionState runConfigName="All Tests">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 507162e..886b629 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,8 +71,8 @@ android {
 }
 
 dependencies {
-    def espresso_version = "3.3.0"
-    def lifecycle_version = "2.2.0"
+    def espresso_version = "3.5.1"
+    def lifecycle_version = "2.8.2"
     def room_version = "2.6.1"
 
     annotationProcessor("com.google.dagger:dagger-compiler:2.51.1")
@@ -82,33 +82,33 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$room_version"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
-    androidTestImplementation "androidx.test:core-ktx:1.3.0"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9"
-    implementation "androidx.activity:activity-ktx:1.2.3"
-    implementation "androidx.appcompat:appcompat:1.3.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
-    implementation "androidx.core:core-ktx:1.5.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.4" // Prevent crash when adding content
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test:core-ktx:1.5.0"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
+    implementation "androidx.activity:activity-ktx:1.9.0"
+    implementation "androidx.appcompat:appcompat:1.7.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation "androidx.core:core-ktx:1.13.1"
+    implementation "androidx.fragment:fragment-ktx:1.8.0" // Prevent crash when adding content
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     // Updating `recyclerview-selection` to version `1.1.0` breaks `espresso`'s `longClick`,
     // which is used in `EndToEndTests.kt`. Hence, we don't update it for now. See issue at
     // https://issuetracker.google.com/issues/188992115
-    implementation "androidx.recyclerview:recyclerview-selection:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.2.0"
+    implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.room:room-ktx:$room_version"
     implementation "androidx.room:room-runtime:$room_version"
-    implementation "com.google.android.material:material:1.3.0" // content_main.xml ConstraintLayout
+    implementation "com.google.android.material:material:1.12.0" // content_main.xml ConstraintLayout
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation "android.arch.core:core-testing:1.1.1"
-    testImplementation "androidx.lifecycle:lifecycle-runtime-testing:2.3.1"
-    testImplementation "androidx.test.ext:junit:1.1.2"
-    testImplementation "androidx.test:core-ktx:1.3.0"
+    testImplementation "androidx.lifecycle:lifecycle-runtime-testing:2.8.2"
+    testImplementation "androidx.test.ext:junit:1.1.5"
+    testImplementation "androidx.test:core-ktx:1.5.0"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
-    testImplementation "junit:junit:4.12"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9"
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
     testImplementation "org.robolectric:robolectric:4.4"
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2f15b9..f0c9609 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,11 +9,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SongActivity" />
+        <activity android:name=".SongActivity" android:exported="false"/>
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/klalumiere/repertoire/LiveDataGetOrAwaitValue.kt b/app/src/main/java/klalumiere/repertoire/LiveDataGetOrAwaitValue.kt
index 0c7a070..77144c0 100644
--- a/app/src/main/java/klalumiere/repertoire/LiveDataGetOrAwaitValue.kt
+++ b/app/src/main/java/klalumiere/repertoire/LiveDataGetOrAwaitValue.kt
@@ -10,7 +10,7 @@ fun <T> LiveData<T>.getOrAwaitValue(time: Long = 2, timeUnit: TimeUnit = TimeUni
     var data: T? = null
     val latch = CountDownLatch(1)
     val observer = object : Observer<T> {
-        override fun onChanged(x: T?) {
+        override fun onChanged(x: T) {
             data = x
             latch.countDown()
             this@getOrAwaitValue.removeObserver(this)
diff --git a/app/src/main/java/klalumiere/repertoire/MainActivity.kt b/app/src/main/java/klalumiere/repertoire/MainActivity.kt
index ae95de9..c9c34f7 100644
--- a/app/src/main/java/klalumiere/repertoire/MainActivity.kt
+++ b/app/src/main/java/klalumiere/repertoire/MainActivity.kt
@@ -110,7 +110,7 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
     private val contract = object : ActivityResultContracts.OpenMultipleDocuments() {
-        override fun createIntent(context: Context, input: Array<out String>): Intent {
+        override fun createIntent(context: Context, input: Array<String>): Intent {
             return super.createIntent(context, input).apply {
                 addCategory(Intent.CATEGORY_OPENABLE)
             }
diff --git a/gradle.properties b/gradle.properties
index 898cd3d..d4d22f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kapt.incremental.apt=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false