Skip to content

Commit

Permalink
build(deps): bump Sentry for iOS (sentry-cocoa) to 8.8.0 (#397)
Browse files Browse the repository at this point in the history
* build(deps): bump Sentry for iOS to 8.8.0

Fixed formatting issues in plist files

* update changelog

* Updated capacitor plugin

* Ensure compatibility with all example apps

* Fix type mismatch

---------

Co-authored-by: LucasZF <[email protected]>
  • Loading branch information
Zapominacz and lucas-zimerman authored Jun 29, 2023
1 parent e5933ba commit 7a36a73
Show file tree
Hide file tree
Showing 12 changed files with 154 additions and 146 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

### Dependencies

- Bump sentry-cocoa SDK to `8.8.0` ([#397](https://github.com/getsentry/sentry-capacitor/pull/397))
- [changelog](https://github.com/getsentry/sentry-cocoa/releases/tag/8.8.0)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.1...8.8.0)
- Improved capacitor plugin file (added weak self, updated workaround from sentry-react-native)
- Bump Sentry JavaScript SDK to `7.56.0` ([#398](https://github.com/getsentry/sentry-capacitor/pull/398))
- [changelog](https://github.com/getsentry/sentry-javascript/releases/tag/7.56.0)
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.54.0...7.56.0)
Expand Down
5 changes: 3 additions & 2 deletions SentryCapacitor.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Pod::Spec.new do |s|
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'

s.dependency 'Sentry/HybridSDK', '8.8.0'
s.dependency 'Capacitor'

if File.exist?('../../@capacitor/core/package.json') == false
# If Capacitor was not found (could happen when using Yarn PNP), fallback to the
# required minimum version of Capacitor 4.
Expand All @@ -26,7 +29,5 @@ Pod::Spec.new do |s|
end
end
s.ios.deployment_target = miniOSVersion
s.dependency 'Sentry', '~> 7.27.1'
s.dependency 'Capacitor'
s.swift_version = '5.1'
end
2 changes: 1 addition & 1 deletion example/ionic-angular-v2/ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>ionic-angular</string>
<string>ionic-angular</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion example/ionic-angular-v2/ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def capacitor_pods
# Automatic Capacitor Pod dependencies, do not delete
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
pod 'SentryCapacitor', :path => '../../.yalc/@sentry/capacitor'
pod 'SentryCapacitor', :path => '../../node_modules/@sentry/capacitor'
# Do not delete
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -332,7 +332,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
2 changes: 1 addition & 1 deletion example/ionic-angular-v5/ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>ionic-angular</string>
<string>ionic-angular</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion example/ionic-angular/ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>ionic-angular</string>
<string>ionic-angular</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
144 changes: 72 additions & 72 deletions example/ionic-angular/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1634,48 +1634,48 @@
"@angular-devkit/schematics" "13.3.0"
jsonc-parser "3.0.0"

"@sentry-internal/tracing@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.54.0.tgz#eeb10ee72426d08669a7706faa4264f1ec02c71d"
integrity sha512-JsyhZ0wWZ+VqbHJg+azqRGdYJDkcI5R9+pnkO6SzbzxrRewqMAIwzkpPee3oI7vG99uhMEkOkMjHu0nQGwkOQw==
dependencies:
"@sentry/core" "7.54.0"
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry-internal/tracing@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.56.0.tgz#ba709258f2f0f3d8a36f9740403088b39212b843"
integrity sha512-OKI4Pz/O13gng8hT9rNc+gRV3+P7nnk1HnHlV8fgaQydS6DsRxoDL1sHa42tZGbh7K9jqNAP3TC6VjBOsr2tXA==
dependencies:
"@sentry/core" "7.56.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
tslib "^1.9.3"

"@sentry/angular@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/angular/-/angular-7.54.0.tgz#1e8468bab819be3107b94fa15dc0b95967806f27"
integrity sha512-/c3mys0dE64GKk0jjmWG9a+rGQbEwX1pflayD1cjwCStb0D/RVp4mUOMmbj5n40TlqQQehxfbFSSAA53fD+jQQ==
"@sentry/angular@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/angular/-/angular-7.56.0.tgz#f76f228cecf68d0042bde9436c84a1ffc4abf8bc"
integrity sha512-KECZOiwt7ZKPMNGlV4d6Unl2B2bZN7M8EOXGXP35BVSs5aIq6S1cIYlXxzWC67YUJ0zfxPDtNbRrYRQ3rpmgxw==
dependencies:
"@sentry/browser" "7.54.0"
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry/browser" "7.56.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
tslib "^2.0.0"

"@sentry/browser@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.54.0.tgz#7fe331c776d02b5c902733aa41dcbfac7bef1ae6"
integrity sha512-EvLAw03N9WE2m1CMl2/1YMeIs1icw9IEOVJhWmf3uJEysNJOFWXu6ZzdtHEz1E6DiJYhc1HzDya0ExZeJxNARA==
"@sentry/browser@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.56.0.tgz#6bf3ff21bc2e9b66a72ea0c7dcc3572fdeb3bd8f"
integrity sha512-qpyyw+NM/psbNAYMlTCCdWwxHHcogppEQ+Q40jGE4sKP2VRIjjyteJkUcaEMoGpbJXx9puzTWbpzqlQ8r15Now==
dependencies:
"@sentry-internal/tracing" "7.54.0"
"@sentry/core" "7.54.0"
"@sentry/replay" "7.54.0"
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry-internal/tracing" "7.56.0"
"@sentry/core" "7.56.0"
"@sentry/replay" "7.56.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
tslib "^1.9.3"

"@sentry/capacitor@file:.yalc/@sentry/capacitor":
version "0.12.0"
version "0.12.1"
dependencies:
"@sentry/browser" "7.54.0"
"@sentry/core" "7.54.0"
"@sentry/hub" "7.54.0"
"@sentry/integrations" "7.54.0"
"@sentry/tracing" "7.54.0"
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry/browser" "7.56.0"
"@sentry/core" "7.56.0"
"@sentry/hub" "7.56.0"
"@sentry/integrations" "7.56.0"
"@sentry/tracing" "7.56.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
"@sentry/wizard" "^1.1.4"
promise "^8.1.0"

Expand All @@ -1692,62 +1692,62 @@
proxy-from-env "^1.1.0"
which "^2.0.2"

"@sentry/core@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.54.0.tgz#8c4cb8800f8df708b3f3f6483026bb9a02820014"
integrity sha512-MAn0E2EwgNn1pFQn4qxhU+1kz6edullWg6VE5wCmtpXWOVw6sILBUsQpeIG5djBKMcneJCdOlz5jeqcKPrLvZQ==
"@sentry/core@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.56.0.tgz#f4253e0d61f55444180a63e5278b62e57303f7cf"
integrity sha512-Nuyyfh09Yz27kPo74fXHlrdmZeK6zrlJVtxQ6LkwuoaTBcNcesNXVaOtr6gjvUGUmsfriVPP3Jero5LXufV7GQ==
dependencies:
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
tslib "^1.9.3"

"@sentry/hub@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.54.0.tgz#fca3db1c302a030ed07f59c33603de32c207cc70"
integrity sha512-GePswxz0rzSaCGB0QR2FgH7Hht9SfxsVyX271FtPH3V5hUIZOHlftXggqmNy5XyyiGf27zsWM+DYgQUFJwMcjQ==
"@sentry/hub@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.56.0.tgz#840f4df37945ac2230570366f8913c0406cfa827"
integrity sha512-d5AnPHk7PNhPFHyIuyMEnG+dtC8SHbCBffm05jMqL0+ocU1rSAJb4K6r5D1wrfQtHxPHNV+R3uwkvOWDekF+VA==
dependencies:
"@sentry/core" "7.54.0"
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry/core" "7.56.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
tslib "^1.9.3"

"@sentry/integrations@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.54.0.tgz#62c73013ca6040d0c9b045809fc5d6ecefda3339"
integrity sha512-RolGsQzJChJzjHTJcCKSZ1HanmY33floc5o13WgU9NoDqJbLGLNcOIrAu+WynqPe8P5VTVrVb8NiwhLqWrKp4g==
"@sentry/integrations@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.56.0.tgz#6fe812454fbccf00810f65667eb393b3bf298b92"
integrity sha512-0d/E/R3MW+5bQ9wcHPD0h/B2KFOpUt+wQgN1kNk7atY12auDzHKuGCjPP87D/xVyRoma3ErFqZCRqwtvCj1cfQ==
dependencies:
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"
localforage "^1.8.1"
tslib "^1.9.3"

"@sentry/replay@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.54.0.tgz#f0f44f9413ceefd1809bf1665e82315927ae08db"
integrity sha512-C0F0568ybphzGmKGe23duB6n5wJcgM7WLYhoeqW3o2bHeqpj1dGPSka/K3s9KzGaAgzn1zeOUYXJsOs+T/XdsA==
"@sentry/replay@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.56.0.tgz#8a49dcb45e9ea83bf905cec0d9b42fed4b8085bd"
integrity sha512-bvjiJK1+SM/paLapuL+nEJ8CIF1bJqi0nnFyxUIi2L5L6yb2uMwfyT3IQ+kz0cXJsLdb3HN4WMphVjyiU9pFdg==
dependencies:
"@sentry/core" "7.54.0"
"@sentry/types" "7.54.0"
"@sentry/utils" "7.54.0"
"@sentry/core" "7.56.0"
"@sentry/types" "7.56.0"
"@sentry/utils" "7.56.0"

"@sentry/tracing@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.54.0.tgz#8364cec20aadc16d8ffcfd4ed9e437e1d317fa87"
integrity sha512-IyflAAqOiKuNvhWXrJsXN8yfl8DbHRpfgtCEPo5TBvdkpcyxUyfE8W2a2MQ8MXDzgfJT1IixXEwleO+qPIi3Gg==
"@sentry/tracing@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.56.0.tgz#f119c2b04c06718fa3a0d00b2781c56005e9dd80"
integrity sha512-Qy7lJdC2YBk9T8JFt4da7xHB3pTZH6yUiIwo5edmSBv2cY6MQ0QZgLzsjJurjf47+/WecVYYKdye9q4twsBlDA==
dependencies:
"@sentry-internal/tracing" "7.54.0"
"@sentry-internal/tracing" "7.56.0"

"@sentry/types@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.54.0.tgz#bfee18107a78e290e6c8ad41646e2b9d9dd95234"
integrity sha512-D+i9xogBeawvQi2r0NOrM7zYcUaPuijeME4O9eOTrDF20tj71hWtJLilK+KTGLYFtpGg1h+9bPaz7OHEIyVopg==
"@sentry/types@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.56.0.tgz#9042a099cf9e8816d081886d24b88082a5d9f87a"
integrity sha512-5WjhVOQm75ItOytOx2jTx+5yw8/qJ316+g1Di8dS9+kgIi1zniqdMcX00C2yYe3FMUgFB49PegCUYulm9Evapw==

"@sentry/utils@7.54.0":
version "7.54.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.54.0.tgz#a3acb5e25a1409cbca7b46d6356d7417a253ea9a"
integrity sha512-3Yf5KlKjIcYLddOexSt2ovu2TWlR4Fi7M+aCK8yUTzwNzf/xwFSWOstHlD/WiDy9HvfhWAOB/ukNTuAeJmtasw==
"@sentry/utils@7.56.0":
version "7.56.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.56.0.tgz#e60e4935d17b2197584abf6ce61b522ad055352c"
integrity sha512-wgeX7bufxc//TjjSIE+gCMm8hVId7Jzvc+f441bYrWnNZBuzPIDW2BummCcPrKzSYe5GeYZDTZGV8YZGMLGBjw==
dependencies:
"@sentry/types" "7.54.0"
"@sentry/types" "7.56.0"
tslib "^1.9.3"

"@sentry/wizard@^1.1.4":
Expand Down
6 changes: 4 additions & 2 deletions ios/Plugin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,14 @@
"${BUILT_PRODUCTS_DIR}/Capacitor/Capacitor.framework",
"${BUILT_PRODUCTS_DIR}/CapacitorCordova/Cordova.framework",
"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
"${BUILT_PRODUCTS_DIR}/SentryPrivate/SentryPrivate.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Capacitor.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cordova.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SentryPrivate.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -454,7 +456,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand All @@ -479,7 +481,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand Down
Loading

0 comments on commit 7a36a73

Please sign in to comment.