Merge branch 'main' into agp-8.2

bloomberg · Feb 4, 2024 · 5704770 · 5704770
2 parents 851daae + 43b9628
commit 5704770
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/selekt-java/src/main/kotlin/com/bloomberg/selekt/commons/NativeResources.kt b/selekt-java/src/main/kotlin/com/bloomberg/selekt/commons/NativeResources.kt
@@ -59,9 +59,9 @@ internal fun libraryResourceNames(
 
 @Throws(IOException::class)
 fun loadEmbeddedLibrary(loader: ClassLoader, parentDirectory: String, name: String) {
-    val url = checkNotNull(libraryResourceNames(parentDirectory, name).mapNotNull {
+    val url = checkNotNull(libraryResourceNames(parentDirectory, name).firstNotNullOfOrNull {
         loader.getResource(it)
-    }.firstOrNull()) { "Failed to find resource with name: $name" }
+    }) { "Failed to find resource with name: $name" }
     @Suppress("NewApi") // Not used by Android.
     val file = createTempFile("lib$name", "lib").toFile().apply { deleteOnExit() }
     try {