Revert "Use pre-built version of sentry-cocoa SDK (#3727)"

This reverts commit d179ec9.

Author: jpnurmi

.github/actions/buildcocoasdk/action.yml

@@ -0,0 +1,17 @@
+name: Build Native Dependencies
+description: Builds Sentry Cocoa SDK with custom Carthage
+runs:
+  using: composite
+
+  steps:
+    - name: Cache Sentry Cocoa SDK
+      id: cache-sentry-cocoa
+      uses: actions/cache@v3
+      with:
+        path: modules/sentry-cocoa/Carthage
+        key: sentry-cocoa-${{ hashFiles('scripts/build-sentry-cocoa.sh') }}-${{ hashFiles('.git/modules/modules/sentry-cocoa/HEAD') }}
+
+    - name: Build Sentry Cocoa SDK
+      if: ${{ steps.cache-sentry-cocoa.outputs.cache-hit != 'true' }}
+      shell: bash
+      run: scripts/build-sentry-cocoa.sh

.github/workflows/build.yml

@@ -204,6 +204,10 @@ jobs:
         if: ${{ !matrix.container }}
         uses: ./.github/actions/buildnative
 
+      - name: Build Cocoa SDK
+        if: runner.os == 'macOS'
+        uses: ./.github/actions/buildcocoasdk
+
       - name: Restore .NET Dependencies
         run: dotnet restore ${{ matrix.slnf }} --nologo
 

.github/workflows/device-tests-ios.yml

@@ -27,6 +27,9 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Build Cocoa SDK
+        uses: ./.github/actions/buildcocoasdk
+
       - name: Setup Environment
         uses: ./.github/actions/environment
 

.github/workflows/update-deps.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         include:
           - name: Cocoa SDK
-            path: modules/sentry-cocoa.properties
+            path: modules/sentry-cocoa
           - name: Java SDK
             path: scripts/update-java.ps1
           - name: Native SDK

.gitignore

@@ -28,6 +28,3 @@ test/**/*.apk
 *.log
 .sentry-native
 **/EnvironmentVariables.g.cs
-
-# Download cache for Cocoa SDK
-modules/sentry-cocoa

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "modules/Ben.Demystifier"]
 	path = modules/Ben.Demystifier
 	url = https://github.com/getsentry/Ben.Demystifier
+[submodule "modules/sentry-cocoa"]
+	path = modules/sentry-cocoa
+	url = https://github.com/getsentry/sentry-cocoa.git
 [submodule "modules/perfview"]
 	path = modules/perfview
 	url = https://github.com/getsentry/perfview.git

Sentry.sln

@@ -156,9 +156,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleFileTestApp", "test\SingleFileTestApp\SingleFileTestApp.csproj", "{162A1CAE-ACEE-45CA-A6D0-7702ADE4D3DE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{A3CCA27E-4DF8-479D-833C-CAA0950715AA}"
-	ProjectSection(SolutionItems) = preProject
-		modules\sentry-cocoa.properties = modules\sentry-cocoa.properties
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TraceEvent", "modules\perfview\src\TraceEvent\TraceEvent.csproj", "{67269916-C417-4CEE-BD7D-CA66C3830AEE}"
 EndProject

modules/sentry-cocoa

@@ -4,7 +4,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 $RootPath = (Get-Item $PSScriptRoot).Parent.FullName
-$CocoaSdkPath = "$RootPath/modules/sentry-cocoa/Sentry.framework"
+$CocoaSdkPath = "$RootPath/modules/sentry-cocoa"
 $BindingsPath = "$RootPath/src/Sentry.Bindings.Cocoa"
 $BackupPath = "$BindingsPath/obj/_unpatched"
 
@@ -101,7 +101,7 @@ Write-Output "iPhoneSdkVersion: $iPhoneSdkVersion"
 # ...instead of:
 #     `#import "SomeHeader.h"`
 # This causes sharpie to fail resolve those headers
-$filesToPatch = Get-ChildItem -Path "$CocoaSdkPath/Headers" -Filter *.h -Recurse | Select-Object -ExpandProperty FullName
+$filesToPatch = Get-ChildItem -Path "$CocoaSdkPath/Carthage/Headers" -Filter *.h -Recurse | Select-Object -ExpandProperty FullName
 foreach ($file in $filesToPatch)
 {
     if (Test-Path $file)
@@ -116,7 +116,7 @@ foreach ($file in $filesToPatch)
         Write-Host "File not found: $file"
     }
 }
-$privateHeaderFile = "$CocoaSdkPath/PrivateHeaders/PrivatesHeader.h"
+$privateHeaderFile = "$CocoaSdkPath/Carthage/PrivateHeaders/PrivatesHeader.h"
 if (Test-Path $privateHeaderFile)
 {
     $content = Get-Content -Path $privateHeaderFile -Raw
@@ -133,9 +133,9 @@ else
 # Generate bindings
 Write-Output 'Generating bindings with Objective Sharpie.'
 sharpie bind -sdk $iPhoneSdkVersion `
-    -scope "$CocoaSdkPath" `
-    "$CocoaSdkPath/Headers/Sentry.h" `
-    "$CocoaSdkPath/PrivateHeaders/PrivateSentrySDKOnly.h" `
+    -scope "$CocoaSdkPath/Carthage/Headers" `
+    "$CocoaSdkPath/Carthage/Headers/Sentry.h" `
+    "$CocoaSdkPath/Carthage/Headers/PrivateSentrySDKOnly.h" `
     -o $BindingsPath `
     -c -Wno-objc-property-no-attribute