Merge pull request #12 from bugfender/develop

Develop

Author: ventayol

Editor/IOSProjectBuildCustomizer.cs

@@ -22,7 +22,7 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string pathToBuil
         string mainTargetGuid = pbxProject.GetUnityMainTargetGuid();
 
         // Get the remote package GUID
-        string packageGuid = pbxProject.AddRemotePackageReferenceAtVersionUpToNextMajor("https://github.com/bugfender/BugfenderSDK-iOS", "2.0.0");
+        string packageGuid = pbxProject.AddRemotePackageReferenceAtVersionUpToNextMajor("https://github.com/bugfender/BugfenderSDK-iOS", "2.2.0");
 
         // Add the Remote Package to the Xcode project (both Unity framework and main target)
         pbxProject.AddRemotePackageFrameworkToProject(pbxProject.GetUnityFrameworkTargetGuid(), "BugfenderLibrary", packageGuid, false /* required dependency */);
@@ -36,4 +36,4 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string pathToBuil
         // Apply changes to the pbxproj file
         pbxProject.WriteToFile(projectPath);
     }
-}
+}

README.md

@@ -33,3 +33,6 @@ By default, the latest compatible versions are used. If you would like to tweak
 
 ## Example project
 Check out this project to see Bugfender in action: https://github.com/bugfender/unity-demo
+
+## Testing
+See `TESTING.md` for a manual validation checklist for Unity import, Android builds, iOS builds, and runtime verification.

Runtime/Bugfender.cs

@@ -1,8 +1,10 @@
-using UnityEngine;
+using UnityEngine;
 using System.Runtime.InteropServices;
 using UnityEngine.Diagnostics;
 
 public class Bugfender : MonoBehaviour {
+    private const string SDK_TYPE = "unity";
+    private const int SDK_TYPE_VERSION = 30000;
 
     public string APP_KEY;
     public bool ENABLE_UI_EVENT_LOGGING = false;
@@ -15,9 +17,14 @@ public class Bugfender : MonoBehaviour {
 
     public enum LogLevel { Debug, Warning, Error, Trace, Info, Fatal };
 
+    private const int SDK_VERSION = 20260119;
+
 #if UNITY_ANDROID && !UNITY_EDITOR
 	private static AndroidJavaClass bugfender;
 #elif UNITY_IOS && !UNITY_EDITOR
+    [DllImport ("__Internal")]
+    private static extern void BugfenderSetSDKType(string sdkType, int version);
+
     [DllImport ("__Internal")]
     private static extern void BugfenderActivateLogger(string key, bool printToConsole, bool hideDeviceName, string apiURL, string baseURL);
 
@@ -59,11 +66,26 @@ public enum LogLevel { Debug, Warning, Error, Trace, Info, Fatal };
 
     [DllImport ("__Internal")]
     private static extern void BugfenderForceSendOnce();
+
+    [DllImport ("__Internal")]
+    private static extern void BugfenderSetSDKType(string sdkType, int version);
 #endif
 
     // Automatically called when scene starts
     void Start()
     {
+        // Optional override from Resources/bugfender_app_key.txt (e.g. for CI or per-build config)
+        var keyAsset = Resources.Load<TextAsset>("bugfender_app_key");
+        if (keyAsset != null && !string.IsNullOrWhiteSpace(keyAsset.text))
+        {
+            APP_KEY = keyAsset.text.Trim();
+        }
+        // Optional: set Resources/bugfender_print_to_console.txt to "true" to mirror logs to logcat (Android) / Xcode console (iOS)
+        var printAsset = Resources.Load<TextAsset>("bugfender_print_to_console");
+        if (printAsset != null && string.Equals(printAsset.text.Trim(), "true", System.StringComparison.OrdinalIgnoreCase))
+        {
+            PRINT_TO_CONSOLE = true;
+        }
         Debug.Log("[BF] *** INITIALIZING BUGFENDER ***");
 #if UNITY_ANDROID && !UNITY_EDITOR
 		if (bugfender == null) {
@@ -72,6 +94,11 @@ void Start()
 
 				bugfender = new AndroidJavaClass ("com.bugfender.sdk.Bugfender");
 				if (bugfender != null) {
+                                        try {
+                                                bugfender.CallStatic ("setSDKType", SDK_TYPE, SDK_TYPE_VERSION);
+                                        } catch (AndroidJavaException) {
+                                                Debug.LogWarning("[BF] Bugfender.setSDKType is not available in the Android SDK.");
+                                        }
                                         if(HIDE_DEVICE_NAME) {
                                                 bugfender.CallStatic ("overrideDeviceName", "Unknown");
                                         }
@@ -89,12 +116,18 @@ void Start()
                                         if (ENABLE_CRASH_REPORTING) {
                                                 bugfender.CallStatic ("enableCrashReporting");
                                         }
+                                        // Optional: set Resources/bugfender_debug.txt to "true" to enable native SDK debug logs (tag BF/DEBUG in logcat)
+                                        var debugAsset = Resources.Load<TextAsset>("bugfender_debug");
+                                        if (debugAsset != null && string.Equals(debugAsset.text.Trim(), "true", System.StringComparison.OrdinalIgnoreCase)) {
+                                                try { bugfender.CallStatic("setDebugMode", true); } catch (AndroidJavaException) { /* ignore if not available */ }
+                                        }
                                         //bugfender.CallStatic ("enableLogcatLogging"); // optional, uncomment if you want it (Android only)
 				}
 
 			}
 		}
 #elif UNITY_IOS && !UNITY_EDITOR
+        BugfenderSetSDKType(SDK_TYPE, SDK_TYPE_VERSION);
         BugfenderActivateLogger(APP_KEY, PRINT_TO_CONSOLE, HIDE_DEVICE_NAME, API_URL, BASE_URL);
         if(ENABLE_UI_EVENT_LOGGING) {
                 BugfenderEnableUIEventLogging();
@@ -273,4 +306,17 @@ public static void ForceSendOnce()
 #endif
     }
 
-}
+    public static void SetSDKType(string sdkType, int version)
+    {
+#if UNITY_ANDROID && !UNITY_EDITOR
+        if (bugfender != null) {
+            bugfender.CallStatic ("setSDKType", sdkType, version);
+        }
+#elif UNITY_IOS && !UNITY_EDITOR
+        BugfenderSetSDKType(sdkType, version);
+#else
+        Debug.Log("[BF] Set SDK type: " + sdkType + " version: " + version);
+#endif
+    }
+
+}

Runtime/Plugins/Android/Bugfender.androidlib.meta

@@ -10,5 +10,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.bugfender.sdk:android:3.+'
+    implementation 'com.bugfender.sdk:android:3.6.2'
 }

Runtime/Plugins/Android/Bugfender.androidlib/build.gradle

@@ -23,6 +23,15 @@
 }
 
 extern "C" {
+void BugfenderSetSDKType(const char* sdkType, int version) {
+    SEL selector = NSSelectorFromString(@"setSDKType:version:");
+    if ([Bugfender respondsToSelector:selector]) {
+        typedef void (*SetSDKTypeFunc)(id, SEL, NSString*, int);
+        SetSDKTypeFunc invoke = (SetSDKTypeFunc)[Bugfender methodForSelector:selector];
+        invoke((id)[Bugfender class], selector, convertCStringToNSString(sdkType), version);
+    }
+}
+
 void BugfenderActivateLogger(const char* key, bool printToConsole, bool hideDeviceName, const char* apiURL, const char* baseURL) {
     NSString* apiURLString = convertCStringToNSString(apiURL);
     if(apiURLString.length > 0) {
@@ -95,4 +104,8 @@ void BugfenderForceSendOnce() {
     [Bugfender forceSendOnce];
 }
 
+void BugfenderSetSDKType(const char* sdkType, int version) {
+    [Bugfender setSDKType:convertCStringToNSString(sdkType) version:version];
+}
+
 }

Runtime/Plugins/iOS/BugfenderBridge.mm

@@ -0,0 +1,67 @@
+# Testing Bugfender SDK for Unity
+
+This document describes the manual validation flow for the Unity SDK package.
+
+## Test project
+
+Use the sample project at:
+
+`/home/aleix/Projects/bugfender/unity-demo`
+
+To test local package changes, the sample project's package manifest should point to:
+
+`file:../../BugfenderSDK-Unity`
+
+## Unity version
+
+Validate with Unity `6000.3.10f` or the target Unity 6 version under support.
+
+## Import checks
+
+1. Open `/home/aleix/Projects/bugfender/unity-demo` in Unity.
+2. Wait for Package Manager and asset import to finish.
+3. Confirm the Bugfender package resolves from the local file path.
+4. Confirm there are no C# compilation errors.
+5. Confirm there are no Android plugin import errors for `Bugfender.androidlib`.
+6. Confirm there are no iOS plugin compilation issues for `BugfenderBridge.mm`.
+
+## Android build checks
+
+1. Switch the active platform to Android.
+2. Build the sample project.
+3. If the build fails, capture the first Gradle error block.
+
+Expected result:
+
+- No `Could not find com.bugfender.sdk:android` errors.
+- No `ClassNotFoundException` or `cannot find symbol` errors for `com.bugfender.sdk.Bugfender`.
+- No missing module or `Project with path` errors involving `Bugfender.androidlib`.
+
+## iOS build checks
+
+1. Switch the active platform to iOS.
+2. Build the Xcode project from Unity.
+3. Open the generated Xcode project and build it.
+
+Expected result:
+
+- Swift Package Manager resolves `BugfenderSDK-iOS`.
+- No compile or link errors for `Bugfender`.
+- No selector or symbol errors related to `setSDKType:version:`.
+
+## Runtime checks
+
+1. Set a valid Bugfender app key in the sample scene.
+2. Run the app on a device or simulator.
+3. Confirm startup completes without crashing.
+4. Confirm Bugfender initializes successfully.
+5. Send a test log and verify it appears in Bugfender.
+
+## What to capture on failure
+
+When reporting a failure, include:
+
+- Unity version
+- Target platform
+- Whether the failure happens during import, build, or runtime
+- The first relevant error block from Unity Console, Gradle, or Xcode

TESTING.md

@@ -1,6 +1,6 @@
 {
   "name": "com.bugfender.unity",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "displayName": "Bugfender",
   "description": "Unity bindings for the native Bugfender iOS and Android SDKs",
   "unity": "2022.3",