fix: workaround for different inheritant customappdelegate chain

Kudo · Dec 19, 2022 · db21524 · db21524
1 parent 3e51058
commit db21524
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/example/ios/TestSwiftModuleExample.xcodeproj/project.pbxproj b/example/ios/TestSwiftModuleExample.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
 		0C80B921A6F3F58F76C31292 /* libPods-TestSwiftModuleExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-TestSwiftModuleExample.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
-		13B07FC11A68108700A75B9A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.mm */; };
+		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		7699B88040F8A987B510C191 /* libPods-TestSwiftModuleExample-TestSwiftModuleExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-TestSwiftModuleExample-TestSwiftModuleExampleTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
@@ -35,7 +35,7 @@
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = TestSwiftModuleExample/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = TestSwiftModuleExample/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = TestSwiftModuleExample/Info.plist; sourceTree = "<group>"; };
-		13B07FB71A68108700A75B9A /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = main.mm; path = TestSwiftModuleExample/main.mm; sourceTree = "<group>"; };
+		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = TestSwiftModuleExample/main.m; sourceTree = "<group>"; };
 		19F6CBCC0A4E27FBF8BF4A61 /* libPods-TestSwiftModuleExample-TestSwiftModuleExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TestSwiftModuleExample-TestSwiftModuleExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B4392A12AC88292D35C810B /* Pods-TestSwiftModuleExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestSwiftModuleExample.debug.xcconfig"; path = "Target Support Files/Pods-TestSwiftModuleExample/Pods-TestSwiftModuleExample.debug.xcconfig"; sourceTree = "<group>"; };
 		5709B34CF0A7D63546082F79 /* Pods-TestSwiftModuleExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestSwiftModuleExample.release.xcconfig"; path = "Target Support Files/Pods-TestSwiftModuleExample/Pods-TestSwiftModuleExample.release.xcconfig"; sourceTree = "<group>"; };
@@ -91,7 +91,7 @@
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
-				13B07FB71A68108700A75B9A /* main.mm */,
+				13B07FB71A68108700A75B9A /* main.m */,
 			);
 			name = TestSwiftModuleExample;
 			sourceTree = "<group>";
@@ -413,7 +413,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
-				13B07FC11A68108700A75B9A /* main.mm in Sources */,
+				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/example/ios/TestSwiftModuleExample/main.mm → example/ios/TestSwiftModuleExample/main.m b/example/ios/TestSwiftModuleExample/main.mm → example/ios/TestSwiftModuleExample/main.m
diff --git a/ios/CustomAppDelegate.h b/ios/CustomAppDelegate.h
@@ -7,4 +7,10 @@
 @interface CustomAppDelegate : RCTAppDelegate
 @end
 
+#else
+
+// Workaround build error from main.m
+@interface CustomAppDelegate : UIResponder
+@end
+
 #endif