Merge pull request #72 from bruvzg/4_4_fixes

Fix build with Godot 4.4.

Author: akien-mga

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
           ./scripts/release_xcframework.sh 3.x
           ls -l bin/release
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: plugins
           path: bin/release/*

plugins/apn/godot_apn_delegate.mm

@@ -43,7 +43,11 @@
 struct APNSInitializer {
 
 	APNSInitializer() {
+#if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
+		[GodotApplicationDelegate addService:[GodotAPNAppDelegate shared]];
+#else
 		[GodotApplicalitionDelegate addService:[GodotAPNAppDelegate shared]];
+#endif
 	}
 };
 static APNSInitializer initializer;

plugins/apn/godot_app_delegate_extension.h

@@ -36,6 +36,10 @@
 #import "platform/iphone/godot_app_delegate.h"
 #endif
 
+#if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
+@interface GodotApplicationDelegate (PushNotifications)
+#else
 @interface GodotApplicalitionDelegate (PushNotifications)
+#endif
 
 @end

plugins/apn/godot_app_delegate_extension.m

@@ -30,6 +30,45 @@
 
 #include "godot_app_delegate_extension.h"
 
+#if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
+@implementation GodotApplicationDelegate (PushNotifications)
+
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+	for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {
+		if (![service respondsToSelector:_cmd]) {
+			continue;
+		}
+
+		[service application:application didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+	}
+}
+
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+	for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {
+		if (![service respondsToSelector:_cmd]) {
+			continue;
+		}
+
+		[service application:application didFailToRegisterForRemoteNotificationsWithError:error];
+	}
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {
+	for (ApplicationDelegateService *service in GodotApplicationDelegate.services) {
+		if (![service respondsToSelector:_cmd]) {
+			continue;
+		}
+
+		[service application:application didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
+	}
+
+	completionHandler(UIBackgroundFetchResultNoData);
+}
+
+@end
+
+#else
+
 @implementation GodotApplicalitionDelegate (PushNotifications)
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
@@ -65,3 +104,4 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
 }
 
 @end
+#endif

plugins/camera/camera_ios.mm

@@ -218,7 +218,11 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 		}
 
 		// set our texture...
+#if VERSION_MAJOR == 4 && VERSION_MINOR >= 4
+		feed->set_ycbcr_images(img[0], img[1]);
+#else
 		feed->set_YCbCr_imgs(img[0], img[1]);
+#endif
 
 		// update our matrix to match the orientation, note, before changing anything
 		// here, be aware that the project orientation settings must match your xcode

plugins/inappstore/in_app_store.mm

@@ -376,7 +376,7 @@ - (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedW
 	ERR_FAIL_COND_V(!p_params.has("product_ids"), ERR_INVALID_PARAMETER);
 
 	GodotStringArray pids = p_params["product_ids"];
-	printf("************ request product info! %i\n", pids.size());
+	printf("************ request product info! %lli\n", pids.size());
 
 	NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:pids.size()];
 	for (int i = 0; i < pids.size(); i++) {