Merge pull request #3 from SourcePointUSA/DIA-2026-revive-unity-sdk

[DIA-2026] Update / Improve Unity SDK

Author: andresilveirah

Assets/ConsentManagementProvider/Editor/CMPPostProcessBuild.cs

@@ -1,15 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+#if UNITY_IOS
 using UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEditor.iOS.Xcode;
-using System.Diagnostics;
-
 using System.IO;
-using System.Linq;
 using UnityEditor.iOS.Xcode.Extensions;
-using Debug = UnityEngine.Debug;
 
 public static class CMPPostProcessBuild
 {
@@ -23,36 +17,64 @@ public static void OnPostProcessBuild(BuildTarget buildTarget, string buildPath)
             PBXProject pbxProject = new PBXProject();
             string projPath = buildPath + "/Unity-Iphone.xcodeproj/project.pbxproj";
             pbxProject.ReadFromFile(projPath);
+            string unityProjectGuid = pbxProject.ProjectGuid();
             string unityMainTargetGuid = pbxProject.GetUnityMainTargetGuid();
-            
-            ConfigureFrameworks(pbxProject, unityMainTargetGuid);
+
+            pbxProject.AddBuildProperty(unityMainTargetGuid, "LIBRARY_SEARCH_PATHS", "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\" \"/usr/lib/swift\"");
+            pbxProject.AddBuildProperty(unityProjectGuid, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES");
+
+            ConfigureFrameworks(pbxProject, unityProjectGuid);
             TieBridgingHeader(pbxProject, unityMainTargetGuid);
             EnableCppModules(pbxProject);
             EnableObjectiveCExceptions(pbxProject);
-            //LinkBinaryWithLibraries(pbxProject, unityMainGUID);
-            // EnableSwift(pbxProject, targetGuid);
+            EnableBitcode(pbxProject, unityProjectGuid, false);
+            // EnableBitcode(pbxProject, unityMainTargetGuid, false);
+
+            // LinkBinaryWithLibraries(pbxProject, unityMainGUID);
+            // LinkBinaryWithLibraries(pbxProject,unityMainTargetGuid, "libswiftWebKit.tbd");
+            // EnableSwift(pbxProject, unityProjectGuid);
 
             pbxProject.WriteToFile(projPath);
+            
+            string plistPath = buildPath + "/Info.plist";
+            AddParameterToInfoPlist(plistPath);
         }
     }
 
+    static void AddParameterToInfoPlist(string plistPath)
+    {
+        PlistDocument plist = new PlistDocument();
+        plist.ReadFromString(File.ReadAllText(plistPath));
+        PlistElementDict rootDict = plist.root;
+            
+        // var buildKey = "Privacy - Tracking Usage Description";
+        var buildKey = "NSUserTrackingUsageDescription";
+        rootDict.SetString(buildKey,"This identifier will be used to deliver personalized ads to you.");
+
+        File.WriteAllText(plistPath, plist.WriteToString());
+    }
+    
     static void ConfigureFrameworks(PBXProject pbxProject, string targetGuid)
     {
-        pbxProject.AddBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", "@executable_path/Frameworks $(PROJECT_DIR)/lib/$(CONFIGURATION) $(inherited)");
-        pbxProject.AddBuildProperty(targetGuid, "FRAMERWORK_SEARCH_PATHS",
+        pbxProject.AddBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", "/usr/lib/swift");
+        /*pbxProject.AddBuildProperty(targetGuid, "FRAMERWORK_SEARCH_PATHS",
             "$(inherited) $(PROJECT_DIR) $(PROJECT_DIR)/Frameworks");
         pbxProject.AddBuildProperty(targetGuid, "DYLIB_INSTALL_NAME_BASE", "@rpath");
         pbxProject.AddBuildProperty(targetGuid, "LD_DYLIB_INSTALL_NAME",
-            "@executable_path/../Frameworks/$(EXECUTABLE_PATH)");
+            "@executable_path/../Frameworks/$(EXECUTABLE_PATH)");*/
     }
 
     static void TieBridgingHeader(PBXProject pbxProject, string targetGuid)
     {
-        pbxProject.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
         pbxProject.SetBuildProperty(targetGuid, "SWIFT_OBJC_BRIDGING_HEADER", "Libraries/Plugins/iOS/Source/UnityPlugin-Bridging-Header.h");
         pbxProject.SetBuildProperty(targetGuid, "SWIFT_OBJC_INTERFACE_HEADER_NAME", "UnityController.h");
     }
-    
+
+    private static void EnableBitcode(PBXProject pbxProject, string targetGuid, bool enabled)
+    {
+        pbxProject.SetBuildProperty(targetGuid, "ENABLE_BITCODE", enabled ? "YES" : "NO");
+    }
+
     static void EnableCppModules(PBXProject pbxProject)
     {
         pbxProject.AddBuildProperty(pbxProject.GetUnityMainTargetGuid(), "CLANG_ENABLE_MODULES", "YES");
@@ -78,4 +100,5 @@ static void EnableSwift(PBXProject pbxProject, string targetGuid)
         pbxProject.AddBuildProperty(targetGuid, "COREML_CODEGEN_LANGUAGE", "Swift");
         pbxProject.AddBuildProperty(targetGuid, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES");
     }
-}
+}
+#endif

Assets/ConsentManagementProvider/Editor/CMPPostProcessBuild.cs.meta

@@ -109,61 +109,68 @@ - (void) addTargetingParamForCampaignType : (int) campaignType : (char*) key : (
 //    NSLog(@"params => %@", params);
 }
 
--(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (int[]) campaignTypes _: (int) campaignsEnvironment _: (long) timeOutSeconds 
+-(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (int[]) campaignTypes _: (int) campaignsEnvironment _: (long) timeOutSeconds
 {
     SPError * err = [self checkIfPropNameNotNull: propName];
     if(err != nil)
     {
         [self onErrorWithError:err];
     }else{
         NSString* nsPropName = [self convertCharToNSString:propName];;
-        
+
         @try
         {
             SPPropertyName *propertyName = [[SPPropertyName alloc] init:nsPropName error:NULL];
-        
+
             SPCampaign * gdpr = nil;
             SPCampaign * ccpa = nil;
             SPCampaign * ios14 = nil;
-            
+
             NSMutableDictionary<NSString *, NSString *> * gdprParams;
             NSMutableDictionary<NSString *, NSString *> * ccpaParams;
             NSMutableDictionary<NSString *, NSString *> * ios14Params;
-            
+
             for (int index=0; index < arrSize; index++)
             {
                 SPCampaignType type = campaignTypes[index];
 //                NSLog(@"and type is... %ld", (long)type);
-                
+
                 NSNumber * nsCampaignType = [NSNumber numberWithInt:index];
                 NSMutableDictionary<NSString *, NSString *> * campaignParams = params[[nsCampaignType stringValue]];
-                SPCampaignEnv * env = campaignsEnvironment;
-                
+//                SPCampaignEnv * env = campaignsEnvironment;
+
                 if(type == SPCampaignTypeGdpr)
                 {
                     gdprParams = campaignParams;
                     if([gdprParams count] == 0){
                         [gdprParams setObject:@"" forKey:@""];
                     }
+//                    gdpr = [[SPCampaign alloc]
+//                            initWithEnvironment:env
+//                            targetingParams:gdprParams];
                     gdpr = [[SPCampaign alloc]
-                            initWithEnvironment:env
-                            targetingParams:gdprParams];
+                            initWithTargetingParams:gdprParams];
+
                 }else if(type == SPCampaignTypeCcpa){
                     ccpaParams = campaignParams;
                     if([ccpaParams count] == 0){
                         [ccpaParams setObject:@"" forKey:@""];
                     }
+//                    ccpa = [[SPCampaign alloc]
+//                            initWithEnvironment:env
+//                            targetingParams: ccpaParams];
                     ccpa = [[SPCampaign alloc]
-                            initWithEnvironment:env
-                            targetingParams: ccpaParams];
+                            initWithTargetingParams: ccpaParams];
                 }else if(type == SPCampaignTypeIos14){
                     ios14Params = campaignParams;
                     if([ios14Params count] == 0){
                         [ios14Params setObject:@"" forKey:@""];
                     }
+//                    ios14 = [[SPCampaign alloc]
+//                             initWithEnvironment:env
+//                             targetingParams: ios14Params];
                     ios14 = [[SPCampaign alloc]
-                             initWithEnvironment:env
-                             targetingParams: ios14Params];
+                             initWithTargetingParams: ios14Params];
                 }else{
                     SPError *myErr = [SPError errorWithDomain:@"SPConsentManager"
                                               code:100
@@ -174,14 +181,19 @@ -(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (i
                 }
             }
 //            NSLog(@"%@ ||| %@ ||| %@", gdpr.description, ccpa.description, ios14.description);
-            
+
             SPCampaigns * campaigns = [[SPCampaigns alloc]
                                        initWithGdpr: gdpr
                                        ccpa: ccpa
                                        ios14: ios14];
+
+            SPCampaignEnv * env = campaignsEnvironment;
+            NSLog(@" ENVIRONMENT: %ld", (long)env);
+
             consentManager = [[SPConsentManager alloc]
                     initWithAccountId:accountId
                     propertyName: propertyName
+                    campaignsEnv: env
                     campaigns: campaigns
                     delegate: self];
             consentManager.messageTimeoutInSeconds = timeOutSeconds;
@@ -294,4 +306,4 @@ - (void)onConsentReadyWithUserData:(SPUserData *)userData {
     UnitySendMessage([self getGOName], "OnConsentReady", [self convertNSStringToChar:[userData toJSON]]);
 }
 
-@end
+@end

Assets/ConsentManagementProvider/Plugins/Android/cmp/cmplibrary-6.1.3.aar

@@ -31,11 +31,23 @@ void onUIFinished(AndroidJavaObject view)
             ConsentMessenger.Broadcast<IOnConsentUIFinished>();
         }
 
-        void onAction(AndroidJavaObject view, AndroidJavaObject actionType)
+        AndroidJavaObject onAction(AndroidJavaObject view, AndroidJavaObject actionType)
         {
-            CONSENT_ACTION_TYPE unwrappedType = (CONSENT_ACTION_TYPE)actionType.Call<int>("getCode");
-            CmpDebugUtil.Log("I've reached the C# onAction: " + unwrappedType);
+            CmpDebugUtil.Log("I've reached the C# onAction!");
+            
+            CmpDebugUtil.Log("Trying to unwrap ActionType... ");
+            AndroidJavaObject wrapper = actionType.Call<AndroidJavaObject>("getActionType");
+            CONSENT_ACTION_TYPE unwrappedType = (CONSENT_ACTION_TYPE)wrapper.Call<int>("getCode");
+            CmpDebugUtil.Log("Unwrapped ActionType is: " + unwrappedType);
+            
+            CmpDebugUtil.Log("Trying to put \"pb_key\", \"pb_value\" in pubData");
+            AndroidJavaObject pubData = actionType.Call<AndroidJavaObject>("getPubData");
+            pubData.Call<AndroidJavaObject>("put", "pb_key", "pb_value");
+            CmpDebugUtil.Log("PUT IS SUCCESSFUL");
+
             ConsentMessenger.Broadcast<IOnConsentAction>(unwrappedType);
+            CmpDebugUtil.Log("Now I'll return actionType back to Java...");
+            return actionType;
         }
 
         void onConsentReady(string spConsents)