Fixed iOS build.

Author: cengiz-pz

demo/.godot/uid_cache.bin

@@ -257,6 +257,7 @@ application/additional_plist_content=""
 application/icon_interpolation=4
 application/export_project_only=false
 application/delete_old_export_files_unconditionally=false
+plugins/InappReviewPlugin=true
 entitlements/increased_memory_limit=false
 entitlements/game_center=false
 entitlements/push_notifications="Disabled"
@@ -473,13 +474,12 @@ icons/app_store_1024x1024="res://assets/1024.png"
 icons/app_store_1024x1024_dark=""
 icons/app_store_1024x1024_tinted=""
 application/targeted_device_family=2
-application/min_ios_version="14.3"
+application/min_ios_version="16.0"
 storyboard/image_scale_mode=0
 storyboard/custom_image@2x=""
 storyboard/custom_image@3x=""
 storyboard/use_custom_bg_color=false
 storyboard/custom_bg_color=Color(0, 0, 0, 1)
-plugins/InappReviewPlugin=true
 application/generate_simulator_library_if_missing=true
 capabilities/push_notifications=false
 icons/ipad_76x76=""

demo/export_presets.cfg

@@ -5,31 +5,48 @@
 source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
-# Manually parse config.properties
+# Get the directory of the Podfile
+podfile_dir = File.dirname(__FILE__)
+
+# Construct paths to both config files relative to the Podfile
+ios_config_path = File.join(podfile_dir, 'config', 'config.properties')
+common_config_path = File.join(podfile_dir, '..', 'common', 'config.properties')
+
+# Initialize properties map
 properties = {}
-begin
-	File.foreach('config/config.properties') do |line|
-	# Skip comments and empty lines
-	line = line.strip
-	next if line.empty? || line.start_with?('#', '!')
-	# Split on the first '=' to handle values containing '='
-	key, value = line.split('=', 2).map(&:strip)
-	properties[key] = value if key && value
-end
-rescue Errno::ENOENT
-	puts "Error: config/config.properties not found. Podfile cannot proceed without configuration."
-	exit 1
+
+# Helper function to read properties from a file
+def read_properties(file_path, properties)
+	begin
+		File.foreach(file_path) do |line|
+			# Skip comments and empty lines
+			line = line.strip
+			next if line.empty? || line.start_with?('#', '!')
+			# Split on the first '=' to handle values containing '='
+			key, value = line.split('=', 2).map(&:strip)
+			properties[key] = value if key && value
+		end
+	rescue Errno::ENOENT
+		puts "Error: #{file_path} not found. Podfile cannot proceed without configuration."
+		exit 1
+	end
 end
 
-plugin_name = "#{properties['plugin_node_name']}Plugin"
+# Read common config first
+read_properties(common_config_path, properties)
+
+# Read project-specific config second (overrides common config)
+read_properties(ios_config_path, properties)
+
+plugin_project_name = "#{properties['ios_project_name']}_plugin"
 
-project "#{plugin_name}.xcodeproj"
-workspace "./#{plugin_name}.xcodeproj/project.xcworkspace"
+project "#{plugin_project_name}.xcodeproj"
+workspace "./#{plugin_project_name}.xcodeproj/project.xcworkspace"
 
 # Extract dependencies (assuming a comma-separated list of name:version pairs)
 deps = properties['dependencies']&.split(',')&.map(&:strip) || []
 
-target "#{plugin_name}" do
+target "#{plugin_project_name}" do
 	platform :ios, properties[:platform_version] || '14.3'
 
 	# Install each dependency with its version

ios/Podfile

@@ -2,12 +2,13 @@
 # © 2024-present https://github.com/cengiz-pz
 #
 
-initialization_method=deeplink_plugin_init
-deinitialization_method=deeplink_plugin_deinit
+ios_project_name=inapp_review
+initialization_method=InappReviewPlugin_init
+deinitialization_method=InappReviewPlugin_deinit
 frameworks=Foundation.framework,StoreKit.framework
 embedded_frameworks=
 flags=-ObjC,-Wl,-weak-lswiftCore,-weak-lswiftObjectiveC,-weak-lswift_Concurrency
 dependencies=
-platform_version=14.3
+platform_version=16.0
 valid_godot_versions=,4.1,4.2,4.3,4.4.1,4.5
 extra_properties=

ios/config/config.properties

@@ -7,15 +7,19 @@
 #import "inapp_review_plugin.h"
 #import "core/config/engine.h"
 
-InappReviewPlugin *plugin;
+InappReviewPlugin *inapp_review_plugin;
 
 void InappReviewPlugin_init() {
-	plugin = memnew(InappReviewPlugin);
-	Engine::get_singleton()->add_singleton(Engine::Singleton("InappReviewPlugin", plugin));
+	NSLog(@"InappReviewPlugin: Initializing plugin at timestamp: %f", [[NSDate date] timeIntervalSince1970]);
+	inapp_review_plugin = memnew(InappReviewPlugin);
+	Engine::get_singleton()->add_singleton(Engine::Singleton("InappReviewPlugin", inapp_review_plugin));
+	NSLog(@"InappReviewPlugin: Singleton registered");
 }
 
 void InappReviewPlugin_deinit() {
-	if (plugin) {
-		memdelete(plugin);
+	NSLog(@"InappReviewPlugin: Deinitializing plugin");
+	if (inapp_review_plugin) {
+		memdelete(inapp_review_plugin);
+		inapp_review_plugin = nullptr;
 	}
 }

ios/inapp_review/godot_plugin.mm

@@ -218,7 +218,7 @@ function generate_godot_headers()
 
 	display_status "starting godot build to generate godot headers..."
 
-	$SCRIPT_DIR/run_with_timeout.sh -t $BUILD_TIMEOUT -c "scons platform=ios target=template_release" -d ./godot || true
+	$SCRIPT_DIR/run_with_timeout.sh -t $BUILD_TIMEOUT -c "scons platform=ios target=template_release" -d $GODOT_DIR || true
 
 	display_status "terminated godot build after $BUILD_TIMEOUT seconds..."
 }
@@ -227,7 +227,7 @@ function generate_godot_headers()
 function install_pods()
 {
 	display_status "installing pods..."
-	pod install --repo-update || true
+	pod install --repo-update --project-directory=$IOS_DIR/ || true
 }
 
 
@@ -248,29 +248,29 @@ function build_plugin()
 	mkdir -p $LIB_DIR
 
 	xcodebuild archive \
-		-project "./$PROJECT" \
+		-project "$IOS_DIR/$PROJECT" \
 		-scheme $SCHEME \
 		-archivePath "$LIB_DIR/ios_release.xcarchive" \
 		-sdk iphoneos \
 		SKIP_INSTALL=NO
 
 	xcodebuild archive \
-		-project "./$PROJECT" \
+		-project "$IOS_DIR/$PROJECT" \
 		-scheme $SCHEME \
 		-archivePath "$LIB_DIR/sim_release.xcarchive" \
 		-sdk iphonesimulator \
 		SKIP_INSTALL=NO
 
 	xcodebuild archive \
-		-project "./$PROJECT" \
+		-project "$IOS_DIR/$PROJECT" \
 		-scheme $SCHEME \
 		-archivePath "$LIB_DIR/ios_debug.xcarchive" \
 		-sdk iphoneos \
 		SKIP_INSTALL=NO \
 		GCC_PREPROCESSOR_DEFINITIONS="DEBUG_ENABLED=1"
 
 	xcodebuild archive \
-		-project "./$PROJECT" \
+		-project "$IOS_DIR/$PROJECT" \
 		-scheme $SCHEME \
 		-archivePath "$LIB_DIR/sim_debug.xcarchive" \
 		-sdk iphonesimulator \
@@ -457,7 +457,7 @@ function create_zip_archive()
 	mkdir -p $tmp_directory/ios/framework
 	find $PODS_DIR -iname '*.xcframework' -type d -exec cp -r {} $tmp_directory/ios/framework \;
 
-	cp $LIB_DIR/$PLUGIN_NAME.{release,debug}.a $tmp_directory/ios/plugins
+	cp -r $FRAMEWORK_DIR/$PLUGIN_NAME.{release,debug}.xcframework $tmp_directory/ios/plugins
 
 	mkdir -p $DEST_DIR