fix and simplify bundle resource path hyperoslo#481

pavelar · pavelar · commit b19a4cb8a724 · 2023-12-09T12:57:30.000-06:00
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/Package.swift b/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.8
 
 import PackageDescription
 
 let package = Package(
     name: "ImagePicker",
     platforms: [
-        .iOS(.v9)
+        .iOS(.v10)
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
diff --git a/Source/AssetManager.swift b/Source/AssetManager.swift
@@ -4,13 +4,9 @@ import Photos
 
 extension Bundle {
     static func myResourceBundle() -> Bundle? {
-        let bundles = Bundle.allBundles
-        let bundlePaths = bundles.compactMap { $0.resourceURL?.appendingPathComponent("ImagePicker", isDirectory: false).appendingPathExtension("bundle") }
-
-        return bundlePaths.compactMap({ Bundle(url: $0) }).first
+        return Bundle(for: ImagePickerController.self)
     }
 }
-
 open class AssetManager {
 
   public static func getImage(_ name: String) -> UIImage {

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,9 @@ import Photos`
`4`	`4`
`5`	`5`	`extension Bundle {`
`6`	`6`	`static func myResourceBundle() -> Bundle? {`
`7`		`- let bundles = Bundle.allBundles`
`8`		`- let bundlePaths = bundles.compactMap { $0.resourceURL?.appendingPathComponent("ImagePicker", isDirectory: false).appendingPathExtension("bundle") }`
`9`		`-`
`10`		`- return bundlePaths.compactMap({ Bundle(url: $0) }).first`
	`7`	`+ return Bundle(for: ImagePickerController.self)`
`11`	`8`	`}`
`12`	`9`	`}`
`13`		`-`
`14`	`10`	`open class AssetManager {`
`15`	`11`
`16`	`12`	`public static func getImage(_ name: String) -> UIImage {`