Merge branch '8.0.0' into ref/2395-remove-options-dict

* 8.0.0: Update CHANGELOG.md (#2415) feat: Properly demangle Swift class name (#2162) chore: Create 8.0.0 branch test: include Sentry changes in hash keys (#2412) release: 7.31.2
getsentry · Nov 21, 2022 · 924a0d7 · 924a0d7
2 parents a8e7397 + 58ec104
commit 924a0d7
Show file tree

Hide file tree

Showing 44 changed files with 528 additions and 151 deletions.
diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
@@ -5,6 +5,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
 
  pull_request:
  paths:
@@ -37,7 +38,7 @@ jobs:
  path: |
  DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
  DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
- key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}
+ key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-${{ hashFiles('Sentry/Sources/**') }}
  - name: Cache iOS-Swift UI Test Runner App build product
  id: ios-swift-benchmark-runner-cache
  uses: actions/cache@v3

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
  - release/**
 
  pull_request:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -3,6 +3,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
 
  pull_request:
  paths:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,6 +3,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
  paths:
  - 'Sources/**'
  - 'Tests/**'
@@ -39,8 +40,8 @@ jobs:
  - run: ./scripts/ci-select-xcode.sh
  - run: make analyze
 
- validate-podspec:
- name: Validate Podspec
+ validate-podspec-framework:
+ name: Validate Podspec as Framework
  runs-on: macos-12
  strategy:
  matrix:
@@ -50,7 +51,21 @@ jobs:
  - uses: actions/checkout@v3
  - run: ./scripts/ci-select-xcode.sh
  - name: Validate Podspec
- run: pod lib lint --verbose --platforms=${{ matrix.platform }}
+ run: pod lib lint --verbose --platforms=${{ matrix.platform }} Sentry.podspec --include-podspecs=SentryPrivate.podspec
+ shell: sh
+
+ validate-podspec-static:
+ name: Validate Podspec as Static library
+ runs-on: macos-12
+ strategy:
+ matrix:
+ platform: ['ios', 'macos', 'tvos', 'watchos']
+
+ steps:
+ - uses: actions/checkout@v3
+ - run: ./scripts/ci-select-xcode.sh
+ - name: Validate Podspec
+ run: pod lib lint --verbose --platforms=${{ matrix.platform }} Sentry.podspec --include-podspecs=SentryPrivate.podspec --use-libraries 
  shell: sh
 
  validate-high-risk-files:

diff --git a/.github/workflows/profile-data-generator.yml b/.github/workflows/profile-data-generator.yml
@@ -30,7 +30,7 @@ jobs:
  path: |
  DerivedData/Build/Products/Debug-iphoneos/TrendingMovies.app
  DerivedData/Build/Products/Debug-iphoneos/TrendingMovies.app.dSYM
- key: trendingmovies-app-cache-key-${{ hashFiles('Samples/TrendingMovies/TrendingMovies/**') }}
+ key: trendingmovies-app-cache-key-${{ hashFiles('Samples/TrendingMovies/TrendingMovies/**') }}-${{ hashFiles('Sentry/Sources/**') }}
  - name: Cache ProfileDataGenerator UI Test Runner App build product
  id: cache-profiledatagenerator-test-runner-app
  uses: actions/cache@v3

diff --git a/.github/workflows/saucelabs-UI-tests.yml b/.github/workflows/saucelabs-UI-tests.yml
@@ -7,6 +7,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
 
  pull_request:
  paths:
@@ -44,7 +45,7 @@ jobs:
  path: |
  DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
  DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
- key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}
+ key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}-${{ hashFiles('Sentry/Sources/**') }}
  - name: Cache iOS-Swift UI Test Runner App build product
  id: ios-swift-uitest-runner-cache
  uses: actions/cache@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
  - release/**
 
  pull_request:

diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -3,6 +3,7 @@ on:
  push:
  branches:
  - master
+ - 8.0.0
  paths:
  - 'Sources/**'
  - 'Samples/iOS-Swift/**'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,21 @@
 # Changelog
 
-## Unreleased
+## Unreleased 
+
+This version adds a dependency on Swift.
+
+### Features
+
+- Properly demangle Swift class name (#2162)
 
 ### Breaking Changes
 
 - Removed `- [SentryOptions initWithDict:didFailWithError:]` (#2404)
 - Renamed `- [SentrySDK startWithOptionsObject:]` to `- [SentrySDK startWithOptions:]` (#2404)
 - Removed `- [SentryOptions sdkInfo]` (#2404)
 
+## 7.31.2
+
 ### Fixes
 
 - Crash in Client when reading integrations (#2398)

diff --git a/Makefile b/Makefile
@@ -108,3 +108,4 @@ git-commit-add:
 
 release-pod:
  pod trunk push Sentry.podspec
+ pod trunk push SentryPrivate.podspec
diff --git a/Package.swift b/Package.swift
@@ -9,8 +9,15 @@ let package = Package(
  .library(name: "Sentry-Dynamic", type: .dynamic, targets: ["Sentry"])
  ],
  targets: [
+ .target( name: "SentryPrivate",
+ path: "Sources",
+ sources: [
+ "Swift"
+ ]
+ ),
  .target(
  name: "Sentry",
+ dependencies: ["SentryPrivate"],
  path: "Sources",
  sources: [
  "Sentry/",

diff --git a/Samples/Carthage-Validation/Framework/input.xcfilelist b/Samples/Carthage-Validation/Framework/input.xcfilelist
@@ -1 +1 @@
-$(SRCROOT)/Carthage/Build/iOS/Sentry.framework
+$(SRCROOT)/Carthage/Build/iOS/Sentry.framework
diff --git a/Samples/Carthage-Validation/Framework/output.xcfilelist b/Samples/Carthage-Validation/Framework/output.xcfilelist
@@ -1 +1 @@
-$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Sentry.framework
+$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Sentry.framework
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
@@ -132,6 +132,13 @@
  remoteGlobalIDString = 637AFDA5243B02760034958B;
  remoteInfo = "iOS-Swift";
  };
+ D81A3499291D0B2C005A27A9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = D81A3488291D0AC0005A27A9;
+ remoteInfo = SentryPrivate;
+ };
  D83A30CA279F075800372D0A /* PBXContainerItemProxy */ = {
  isa = PBXContainerItemProxy;
  containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */;
@@ -350,6 +357,7 @@
  children = (
  630853322440C44F00DDE4CE /* Sentry.framework */,
  630853342440C44F00DDE4CE /* SentryTests.xctest */,
+ D81A349A291D0B2C005A27A9 /* SentryPrivate.framework */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -720,6 +728,13 @@
  remoteRef = 630853332440C44F00DDE4CE /* PBXContainerItemProxy */;
  sourceTree = BUILT_PRODUCTS_DIR;
  };
+ D81A349A291D0B2C005A27A9 /* SentryPrivate.framework */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.framework;
+ path = SentryPrivate.framework;
+ remoteRef = D81A3499291D0B2C005A27A9 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -1096,7 +1111,7 @@
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 7.31.1;
+ MARKETING_VERSION = 7.31.2;
  PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1125,7 +1140,7 @@
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 7.31.1;
+ MARKETING_VERSION = 7.31.2;
  PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1770,7 +1785,7 @@
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 7.31.1;
+ MARKETING_VERSION = 7.31.2;
  PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1805,7 +1820,7 @@
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 7.31.1;
+ MARKETING_VERSION = 7.31.2;
  PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";

diff --git a/Sentry.podspec b/Sentry.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "Sentry"
- s.version = "7.31.1"
+ s.version = "7.31.2"
  s.summary = "Sentry client for cocoa"
  s.homepage = "https://github.com/getsentry/sentry-cocoa"
  s.license = "mit"
@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
  s.requires_arc = true
  s.frameworks = 'Foundation'
  s.libraries = 'z', 'c++'
+ s.swift_versions = "5.5"
  s.pod_target_xcconfig = {
  'GCC_ENABLE_CPP_EXCEPTIONS' => 'YES',
  'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
@@ -26,20 +27,20 @@ Pod::Spec.new do |s|
  }
 
  s.default_subspecs = ['Core']
+ s.dependency "SentryPrivate", "7.31.0"
 
  s.subspec 'Core' do |sp|
  sp.source_files = "Sources/Sentry/**/*.{h,hpp,m,mm,c,cpp}",
- "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}"
-  
- sp.public_header_files = "Sources/Sentry/Public/*.h"
+ "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/Sentry.swift"
+ sp.public_header_files =
+   "Sources/Sentry/Public/*.h"
  end
 
  s.subspec 'HybridSDK' do |sp|
  sp.source_files = "Sources/Sentry/**/*.{h,hpp,m,mm,c,cpp}",
- "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}"
+ "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/Sentry.swift"
 
  sp.public_header_files =
  "Sources/Sentry/Public/*.h", "Sources/Sentry/include/PrivateSentrySDKOnly.h"
  end
-
 end