Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 865dfbf

Browse files
committed
Issue #427 - Adding subdirectory support for iOS bundle
1 parent 7ca0a7d commit 865dfbf

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

ios/CodePush/CodePush.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
+ (NSURL *)bundleURLForResource:(NSString *)resourceName
2222
withExtension:(NSString *)resourceExtension;
2323

24+
+ (NSURL *)bundleURLForResource:(NSString *)resourceName
25+
withExtension:(NSString *)resourceExtension
26+
subdirectory:(NSString *)resourceSubdirectory;
27+
2428
+ (NSString *)getApplicationSupportDirectory;
2529

2630
/*

ios/CodePush/CodePush.m

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,15 @@ @implementation CodePush {
5656
// in the binary.
5757
static NSString *bundleResourceExtension = @"jsbundle";
5858
static NSString *bundleResourceName = @"main";
59+
static NSString *bundleResourceSubdirectory = nil;
5960

6061
#pragma mark - Public Obj-C API
6162

6263
+ (NSURL *)binaryBundleURL
6364
{
64-
return [[NSBundle mainBundle] URLForResource:bundleResourceName withExtension:bundleResourceExtension];
65+
return [[NSBundle mainBundle] URLForResource:bundleResourceName
66+
withExtension:bundleResourceExtension
67+
subdirectory:bundleResourceSubdirectory];
6568
}
6669

6770
+ (NSURL *)bundleURL
@@ -78,10 +81,20 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
7881

7982
+ (NSURL *)bundleURLForResource:(NSString *)resourceName
8083
withExtension:(NSString *)resourceExtension
84+
{
85+
return [self bundleURLForResource:resourceName
86+
withExtension:resourceExtension
87+
subdirectory:nil];
88+
}
89+
90+
+ (NSURL *)bundleURLForResource:(NSString *)resourceName
91+
withExtension:(NSString *)resourceExtension
92+
subdirectory:(NSString *)resourceSubdirectory
8193
{
8294
bundleResourceName = resourceName;
8395
bundleResourceExtension = resourceExtension;
84-
96+
bundleResourceSubdirectory = resourceSubdirectory;
97+
8598
[self ensureBinaryBundleExists];
8699

87100
NSString *logMessageFormat = @"Loading JS bundle from %@";

0 commit comments

Comments
 (0)