#747 rollback to old search way but still failed

gradle.properties

@@ -8,7 +8,6 @@ kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.applyDefaultHierarchyTemplate=false
-kotlin.mpp.enableCInteropCommonization=true
 
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.uikit.enabled=true

resources/build.gradle.kts

@@ -2,9 +2,6 @@
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-
 plugins {
     id("multiplatform-library-extended-convention")
     id("multiplatform-android-publish-convention")
@@ -28,20 +25,6 @@ kotlin {
             }
         }
     }
-
-    // setup bundle searcher for apple
-//    targets
-//        .withType<KotlinNativeTarget>()
-//        .matching { it.konanTarget.family.isAppleFamily }
-//        .configureEach {
-//            compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME) {
-//                val appleNative by cinterops.creating {
-//                    defFile(project.file("src/appleMain/def/appleNative.def"))
-//
-//                    includeDirs("$projectDir/src/appleMain/objective-c")
-//                }
-//            }
-//        }
 }
 
 android {

resources/src/appleMain/kotlin/dev/icerock/moko/resources/utils/NSBundleExt.kt

@@ -12,11 +12,18 @@ import platform.Foundation.NSURL
 import platform.Foundation.pathExtension
 
 fun NSBundle.Companion.loadableBundle(identifier: String): NSBundle {
-    // we should use search by our class because dynamic framework with resources can be placed in
-    //  external directory, not inside app directory (NSBundle.main). for example in case of
-    //  SwiftUI preview - app directory empty, but dynamic framework with resources will be in
-    //  different directory (DerivedData)
-    val bundlePath: String = MRBundleAnchor().getBundle().bundlePath
+    // at first we try to find required bundle inside Bundle.main, because it's faster way
+    // https://github.com/icerockdev/moko-resources/issues/708
+    // but in some cases (for example in SwiftUI Previews) dynamic framework with bundles can be located
+    // in different location, not inside Bundle.main. So in this case we run less performant way - bundleWithIdentifier
+    // https://github.com/icerockdev/moko-resources/issues/747
+    return findBundleInMain(identifier)
+        ?: NSBundle.bundleWithIdentifier(identifier)
+        ?: throw IllegalArgumentException("bundle with identifier $identifier not found")
+}
+
+private fun findBundleInMain(identifier: String): NSBundle? {
+    val bundlePath: String = NSBundle.mainBundle.bundlePath
 
     val enumerator: NSDirectoryEnumerator = requireNotNull(
         NSFileManager.defaultManager.enumeratorAtPath(bundlePath)
@@ -39,7 +46,7 @@ fun NSBundle.Companion.loadableBundle(identifier: String): NSBundle {
         }
     }
 
-    throw IllegalArgumentException("bundle with identifier $identifier not found")
+    return null
 }
 
 var isBundleSearchLogEnabled = false