这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ jobs:
- name: Validate Podspec
run: ./scripts/pod-lib-lint.sh ${{ matrix.platform }} ${{ matrix.podspec}} ${{ matrix.library_type}}

lint-hybrid-sdk-podspec:
name: pod lint Sentry/HybridSDK
runs-on: macos-13

steps:
- uses: actions/checkout@v3
- run: ./scripts/ci-select-xcode.sh '14.3'
- run: pod repo update
- name: Validate HybridPod Podspec
run: pod lib lint ./Tests/HybridSDKTest/HybridPod.podspec --allow-warnings --verbose --platforms=ios "--include-podspecs={SentryPrivate.podspec,Sentry.podspec}"

validate-high-risk-files:
name: No changes in high risk files
Expand Down
12 changes: 12 additions & 0 deletions Sentry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1727,6 +1727,8 @@
D8CB742C294B294B00A5F964 /* MockUIScene.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockUIScene.h; sourceTree = "<group>"; };
D8CB742D294B294B00A5F964 /* MockUIScene.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockUIScene.m; sourceTree = "<group>"; };
D8CE69BB277E39C700C6EC5C /* SentryFileIOTrackingIntegrationObjCTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryFileIOTrackingIntegrationObjCTests.m; sourceTree = "<group>"; };
D8F01DE42A126B62008F4996 /* HybridPod.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = HybridPod.podspec; sourceTree = "<group>"; };
D8F01DE52A126BF5008F4996 /* HybridTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HybridTest.swift; sourceTree = "<group>"; };
D8F6A2452885512100320515 /* SentryPredicateDescriptor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryPredicateDescriptor.m; sourceTree = "<group>"; };
D8F6A24A2885515B00320515 /* SentryPredicateDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryPredicateDescriptor.h; path = include/SentryPredicateDescriptor.h; sourceTree = "<group>"; };
D8F6A24C2885534E00320515 /* SentryPredicateDescriptorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryPredicateDescriptorTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2174,6 +2176,7 @@
63AA76AA1EB9D5CD00D153DE /* Configuration */,
63AA75931EB8AEDB00D153DE /* SentryTests */,
8431EFDB29B27B3D00D8DC56 /* SentryProfilerTests */,
D8F01DE32A125D7B008F4996 /* HybridSDKTest */,
);
path = Tests;
sourceTree = "<group>";
Expand Down Expand Up @@ -3329,6 +3332,15 @@
name = IO;
sourceTree = "<group>";
};
D8F01DE32A125D7B008F4996 /* HybridSDKTest */ = {
isa = PBXGroup;
children = (
D8F01DE42A126B62008F4996 /* HybridPod.podspec */,
D8F01DE52A126BF5008F4996 /* HybridTest.swift */,
);
path = HybridSDKTest;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down
18 changes: 18 additions & 0 deletions Tests/HybridSDKTest/HybridPod.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Pod::Spec.new do |s|
s.name = "HybridPod"
s.version = "1.0.0"
s.summary = "Test for HybridSDK pod"
s.homepage = "https://github.com/getsentry/sentry-cocoa"
s.license = "mit"
s.authors = "Sentry"
s.source = { :git => "https://github.com/getsentry/sentry-cocoa.git",
:tag => s.version.to_s }

s.ios.deployment_target = "11.0"
s.module_name = "SentryHybridTest"
s.requires_arc = true
s.frameworks = 'Foundation'
s.swift_versions = "5.5"
s.dependency "Sentry/HybridSDK", "8.7.2"
s.source_files = "HybridTest.swift"
end
8 changes: 8 additions & 0 deletions Tests/HybridSDKTest/HybridTest.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Foundation
import Sentry

public class HybridTest {

var sentry: SentrySDK?

}
3 changes: 2 additions & 1 deletion Utils/VersionBump/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ let files = [
"./Sources/Configuration/Sentry.xcconfig",
"./Sources/Configuration/SentryPrivate.xcconfig",
"./Sources/Configuration/SentrySwiftUI.xcconfig",
"./Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj"
"./Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj",
"./Tests/HybridSDKTest/HybridPod.podspec"
]

let args = CommandLine.arguments
Expand Down
2 changes: 1 addition & 1 deletion scripts/pod-lib-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ case $POD_SPEC in
;;

"SentrySwiftUI")
INCLUDE_POD_SPECS="--include-podspecs=Sentry.podspec,SentryPrivate.podspec"
INCLUDE_POD_SPECS="--include-podspecs={Sentry.podspec,SentryPrivate.podspec}"
;;

*)
Expand Down