fix(ios): load swift classes from objc interface header (#314)

resolves TIMOB-26697
tidev · Jan 17, 2019 · cc569c1 · cc569c1
1 parent 0f07734
commit cc569c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/iphone/hooks/generate/class.js b/iphone/hooks/generate/class.js
@@ -88,7 +88,7 @@ function generateFullyQualifiedClassName(cls, state) {
 	var fullyQualifiedClassName = cls.name;
 	if (cls.language === 'swift') {
 		fullyQualifiedClassName = swift.generateSwiftMangledClassName(state.appName, cls.name);
-	} else if (cls.filename === cls.framework + '-Swift.h') {
+	} else if (cls.filename && cls.filename.endsWith(cls.framework + '-Swift.h')) {
 		fullyQualifiedClassName = cls.framework + '.' + cls.name;
 	}
 

diff --git a/iphone/hooks/hyperloop.js b/iphone/hooks/hyperloop.js
@@ -1090,7 +1090,7 @@ HyperloopiOSBuilder.prototype.updateXcodeProject = function updateXcodeProject()
 		thirdPartyFrameworksUsed = true;
 	}
 
-	if (!nativeModules.length && !thirdPartyFrameworksUsed) {
+	if (!nativeModules.length && !thirdPartyFrameworksUsed && !this.hasCocoaPods) {
 		return;
 	}