feat: Instruct sentry-cli to create/upload il2cpp mappings

getsentry · Jun 20, 2022 · b71f7e2 · b71f7e2
1 parent 7c4cb12
commit b71f7e2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@
 - Bump Native SDK to v0.4.17 ([#810](https://github.com/getsentry/sentry-unity/pull/810))
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0417)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.4.15-7-g9eecb1b...0.4.17)
+- Bump Sentry CLI 2.2.0 ([#790](https://github.com/getsentry/sentry-unity/pull/790))
+  - [changelog](https://github.com/getsentry/sentry-cli/releases/tag/2.2.0)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/1.72.0...2.2.0)
+- Generate and upload il2cpp line mappings alongside debug files. ([#790](https://github.com/getsentry/sentry-unity/pull/790))
 
 ## 0.19.0
 

diff --git a/package-dev/Editor/sentry-cli/sentry-cli-Darwin-universal b/package-dev/Editor/sentry-cli/sentry-cli-Darwin-universal
diff --git a/package-dev/Editor/sentry-cli/sentry-cli-Linux-x86_64 b/package-dev/Editor/sentry-cli/sentry-cli-Linux-x86_64
diff --git a/package-dev/Editor/sentry-cli/sentry-cli-Windows-x86_64.exe b/package-dev/Editor/sentry-cli/sentry-cli-Windows-x86_64.exe
diff --git a/scripts/download-sentry-cli.sh b/scripts/download-sentry-cli.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 cd $(dirname "$0")
 REPO=getsentry/sentry-cli
-VERSION=1.71.0
+VERSION=2.2.0
 PLATFORMS="Darwin-universal Linux-x86_64 Windows-x86_64"
 TARGETDIR="../package-dev/Editor/sentry-cli/"
 
@@ -16,4 +16,4 @@ for plat in $PLATFORMS; do
   fn="${TARGETDIR}/sentry-cli-${plat}${suffix}"
   curl -SL --progress-bar "$download_url" -o "$fn"
   chmod +x "$fn"
-done
+done
diff --git a/src/Sentry.Unity.Editor.iOS/SentryXcodeProject.cs b/src/Sentry.Unity.Editor.iOS/SentryXcodeProject.cs
@@ -150,10 +150,10 @@ public void AddBuildPhaseSymbolUpload(IDiagnosticLogger? logger, SentryCliOption
                 return;
             }
 
-            var uploadDifArguments = string.Empty;
+            var uploadDifArguments = "--il2cpp-mapping";
             if (sentryCliOptions.UploadSources)
             {
-                uploadDifArguments += "--include-sources";
+                uploadDifArguments += " --include-sources";
             }
             var uploadScript = string.Format(_uploadScript, SentryCli.SentryCliMacOS, uploadDifArguments);
 

diff --git a/src/Sentry.Unity.Editor/Android/DebugSymbolUpload.cs b/src/Sentry.Unity.Editor/Android/DebugSymbolUpload.cs
@@ -84,7 +84,7 @@ public void AppendUploadToGradleFile(string sentryCliPath)
                 throw new FileNotFoundException("Failed to find sentry-cli", sentryCliPath);
             }
 
-            var uploadDifArguments = string.Empty;
+            var uploadDifArguments = "\"--il2cpp-mapping\",";
             if (_cliOptions?.UploadSources ?? false)
             {
                 uploadDifArguments += "\"--include-sources\",";

diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -151,7 +151,7 @@ private static void UploadDebugSymbols(IDiagnosticLogger logger, BuildTarget tar
                 addPath(Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS/Sentry/Sentry.dylib.dSYM"));
             }
 
-            var cliArgs = "upload-dif ";
+            var cliArgs = "upload-dif --il2cpp-mapping ";
             if (cliOptions.UploadSources)
             {
                 cliArgs += "--include-sources ";