[APN] Fixed build errors from new apple embedded changes

Koyper · Koyper · commit 65cb41c24ad6 · 2025-07-11T21:29:14.000-05:00
diff --git a/plugins/apn/apn.mm b/plugins/apn/apn.mm
@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "apn.h"
+#import "godot_apn_delegate.h"
 
 #import <Foundation/Foundation.h>
 
@@ -40,7 +41,7 @@
 #include "core/project_settings.h"
 #endif
 
-#import "godot_apn_delegate.h"
+#import "drivers/apple_embedded/godot_app_delegate.h"
 
 static APNPlugin *singleton;
 
diff --git a/plugins/apn/godot_apn_delegate.mm b/plugins/apn/godot_apn_delegate.mm
@@ -28,25 +28,24 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#import "godot_apn_delegate.h"
 
 #include "apn.h"
-
+#import "godot_apn_delegate.h"
 #import "godot_user_notification_delegate.h"
 
 #if VERSION_MAJOR == 4
-#import "platform/ios/godot_app_delegate.h"
+#import "drivers/apple_embedded/godot_app_delegate.h"
 #else
-#import "platform/iphone/godot_app_delegate.h"
+#import "godot_app_delegate.h"
 #endif
 
 struct APNSInitializer {
 
 	APNSInitializer() {
 #if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
-		[GodotApplicationDelegate addService:[GodotAPNAppDelegate shared]];
+		[GDTApplicationDelegate addService:[GodotAPNAppDelegate shared]];
 #else
-		[GodotApplicalitionDelegate addService:[GodotAPNAppDelegate shared]];
+		[GDTApplicationDelegate addService:[GodotAPNAppDelegate shared]];
 #endif
 	}
 };
@@ -94,7 +93,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 	}
 
 	String device_token;
-	device_token.parse_utf8([[token copy] UTF8String]);
+	device_token.append_utf8([[token copy] UTF8String]);
 
 	APNPlugin::get_singleton()->update_device_token(device_token);
 }
diff --git a/plugins/apn/godot_app_delegate_extension.h b/plugins/apn/godot_app_delegate_extension.h
@@ -31,15 +31,15 @@
 #include "core/version.h"
 
 #if VERSION_MAJOR == 4
-#import "platform/ios/godot_app_delegate.h"
+#import "drivers/apple_embedded/godot_app_delegate.h"
 #else
 #import "platform/iphone/godot_app_delegate.h"
 #endif
 
 #if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
-@interface GodotApplicationDelegate (PushNotifications)
+@interface GDTApplicationDelegate (PushNotifications)
 #else
-@interface GodotApplicalitionDelegate (PushNotifications)
+@interface GDTApplicationDelegate (PushNotifications)
 #endif
 
 @end
diff --git a/plugins/apn/godot_app_delegate_extension.m b/plugins/apn/godot_app_delegate_extension.m
@@ -31,10 +31,10 @@
 #include "godot_app_delegate_extension.h"
 
 #if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
-@implementation GodotApplicationDelegate (PushNotifications)
+@implementation GDTApplicationDelegate (PushNotifications)
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-	for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {
+	for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {
 		if (![service respondsToSelector:_cmd]) {
 			continue;
 		}
@@ -44,7 +44,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 }
 
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-	for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {
+	for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {
 		if (![service respondsToSelector:_cmd]) {
 			continue;
 		}
@@ -54,7 +54,7 @@ - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotif
 }
 
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {
-	for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {
+	for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {
 		if (![service respondsToSelector:_cmd]) {
 			continue;
 		}
@@ -69,10 +69,10 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
 
 #else
 
-@implementation GodotApplicalitionDelegate (PushNotifications)
+@implementation GDTApplicationDelegate (PushNotifications)
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-	for (ApplicationDelegateService *service in GodotApplicalitionDelegate.services) {
+	for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {
 		if (![service respondsToSelector:_cmd]) {
 			continue;
 		}
@@ -82,7 +82,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 }
 
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-	for (ApplicationDelegateService *service in GodotApplicalitionDelegate.services) {
+	for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {
 		if (![service respondsToSelector:_cmd]) {
 			continue;
 		}
@@ -92,7 +92,7 @@ - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotif
 }
 
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {
-	for (ApplicationDelegateService *service in GodotApplicalitionDelegate.services) {
+	for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {
 		if (![service respondsToSelector:_cmd]) {
 			continue;
 		}
diff --git a/plugins/photo_picker/photo_picker.mm b/plugins/photo_picker/photo_picker.mm
@@ -34,8 +34,8 @@
 #import <Photos/Photos.h>
 
 #if VERSION_MAJOR == 4
-#import "platform/ios/app_delegate.h"
-#import "platform/ios/view_controller.h"
+#import "drivers/apple_embedded/godot_app_delegate.h"
+#import "drivers/apple_embedded/view_controller.h"
 #else
 #import "platform/iphone/app_delegate.h"
 #import "platform/iphone/view_controller.h"

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@`
`31`	`31`	`#include "godot_app_delegate_extension.h"`
`32`	`32`
`33`	`33`	`#if VERSION_MAJOR == 4 && VERSION_MINOR >= 4`
`34`		`-@implementation GodotApplicationDelegate (PushNotifications)`
	`34`	`+@implementation GDTApplicationDelegate (PushNotifications)`
`35`	`35`
`36`	`36`	`- (void)application:(UIApplication )application didRegisterForRemoteNotificationsWithDeviceToken:(NSData )deviceToken {`
`37`		`- for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {`
	`37`	`+ for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {`
`38`	`38`	`if (![service respondsToSelector:_cmd]) {`
`39`	`39`	`continue;`
`40`	`40`	`}`
`@@ -44,7 +44,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`- (void)application:(UIApplication )application didFailToRegisterForRemoteNotificationsWithError:(NSError )error {`
`47`		`- for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {`
	`47`	`+ for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {`
`48`	`48`	`if (![service respondsToSelector:_cmd]) {`
`49`	`49`	`continue;`
`50`	`50`	`}`
`@@ -54,7 +54,7 @@ - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotif`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`- (void)application:(UIApplication )application didReceiveRemoteNotification:(NSDictionary )userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {`
`57`		`- for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {`
	`57`	`+ for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {`
`58`	`58`	`if (![service respondsToSelector:_cmd]) {`
`59`	`59`	`continue;`
`60`	`60`	`}`
`@@ -69,10 +69,10 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N`
`69`	`69`
`70`	`70`	`#else`
`71`	`71`
`72`		`-@implementation GodotApplicalitionDelegate (PushNotifications)`
	`72`	`+@implementation GDTApplicationDelegate (PushNotifications)`
`73`	`73`
`74`	`74`	`- (void)application:(UIApplication )application didRegisterForRemoteNotificationsWithDeviceToken:(NSData )deviceToken {`
`75`		`- for (ApplicationDelegateService *service in GodotApplicalitionDelegate.services) {`
	`75`	`+ for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {`
`76`	`76`	`if (![service respondsToSelector:_cmd]) {`
`77`	`77`	`continue;`
`78`	`78`	`}`
`@@ -82,7 +82,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`- (void)application:(UIApplication )application didFailToRegisterForRemoteNotificationsWithError:(NSError )error {`
`85`		`- for (ApplicationDelegateService *service in GodotApplicalitionDelegate.services) {`
	`85`	`+ for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {`
`86`	`86`	`if (![service respondsToSelector:_cmd]) {`
`87`	`87`	`continue;`
`88`	`88`	`}`
`@@ -92,7 +92,7 @@ - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotif`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`- (void)application:(UIApplication )application didReceiveRemoteNotification:(NSDictionary )userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {`
`95`		`- for (ApplicationDelegateService *service in GodotApplicalitionDelegate.services) {`
	`95`	`+ for (GDTAppDelegateServiceProtocol *service in GDTApplicationDelegate.services) {`
`96`	`96`	`if (![service respondsToSelector:_cmd]) {`
`97`	`97`	`continue;`
`98`	`98`	`}`