Skip to content

Commit dd3537e

Browse files
author
Josh Holtz
committed
Project setup fixes that actually build and run tests and podspec ver… (#5)
Project setup fixes that actually build and run tests and podspec version bump
1 parent 7e0f0ce commit dd3537e

File tree

7 files changed

+542
-19
lines changed

7 files changed

+542
-19
lines changed

‎.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
language: objective-c
2+
osx_image: xcode7.3
3+
before_install:
4+
- gem install fastlane
5+
script:
6+
- scan -s SentrySwift-iOS
7+
- scan -s SentrySwift

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# sentry-swift
22

3+
[![Travis](https://img.shields.io/travis/getsentry/sentry-swift.svg?maxAge=2592000)](https://travis-ci.org/getsentry/sentry-swift)
34
![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20OSX-333333.svg)
45
![langauges](https://img.shields.io/badge/languages-Swift%20%7C%20ObjC-333333.svg)
56
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

‎SentrySwift.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SentrySwift"
3-
s.version = "0.1.0"
3+
s.version = "0.1.1"
44
s.summary = "Swift client for Sentry"
55
s.homepage = "https://github.com/getsentry/sentry-swift"
66
s.license = "mit"
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
1212

1313
s.source_files = "Sources/**/*.{h,m,swift}"
1414

15-
s.ios.dependency 'KSCrash', '~> 1.3'
15+
s.ios.dependency 'KSCrash', '~> 1.5'
1616

1717
end

‎SentrySwift.xcodeproj/project.pbxproj

+103-16
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,44 @@
4646
03E3D21F1C3EB20F00F00547 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E3D21E1C3EB20F00F00547 /* Request.swift */; };
4747
03E3D2201C3EB20F00F00547 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E3D21E1C3EB20F00F00547 /* Request.swift */; };
4848
03E94AF71C22595C009F8F29 /* SentrySwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E94AEC1C22595B009F8F29 /* SentrySwift.framework */; };
49-
03E94B151C22596A009F8F29 /* SentrySwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E94B0B1C22596A009F8F29 /* SentrySwift.framework */; };
50-
217A96231CD67746006C681F /* KSCrash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217A961F1CD67736006C681F /* KSCrash.framework */; };
5149
/* End PBXBuildFile section */
5250

5351
/* Begin PBXContainerItemProxy section */
52+
03193C981CD78DF600E8AB83 /* PBXContainerItemProxy */ = {
53+
isa = PBXContainerItemProxy;
54+
containerPortal = 03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */;
55+
proxyType = 2;
56+
remoteGlobalIDString = CB6D132617EB749A00BC2C04;
57+
remoteInfo = KSCrashLib;
58+
};
59+
03193C9A1CD78DF600E8AB83 /* PBXContainerItemProxy */ = {
60+
isa = PBXContainerItemProxy;
61+
containerPortal = 03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */;
62+
proxyType = 2;
63+
remoteGlobalIDString = CB6D133317EB749A00BC2C04;
64+
remoteInfo = KSCrashTests;
65+
};
66+
03193C9C1CD78DF600E8AB83 /* PBXContainerItemProxy */ = {
67+
isa = PBXContainerItemProxy;
68+
containerPortal = 03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */;
69+
proxyType = 2;
70+
remoteGlobalIDString = 03DE7B6A1C84DEF700F789BA;
71+
remoteInfo = KSCrash;
72+
};
73+
03193C9E1CD78DF600E8AB83 /* PBXContainerItemProxy */ = {
74+
isa = PBXContainerItemProxy;
75+
containerPortal = 03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */;
76+
proxyType = 2;
77+
remoteGlobalIDString = EDF2BF211CCF15AD004BADF4;
78+
remoteInfo = KSCrash_static;
79+
};
80+
03193CA01CD78E2100E8AB83 /* PBXContainerItemProxy */ = {
81+
isa = PBXContainerItemProxy;
82+
containerPortal = 03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */;
83+
proxyType = 1;
84+
remoteGlobalIDString = 03DE7B691C84DEF700F789BA;
85+
remoteInfo = KSCrash;
86+
};
5487
03E94AF81C22595C009F8F29 /* PBXContainerItemProxy */ = {
5588
isa = PBXContainerItemProxy;
5689
containerPortal = 03E94AE31C22595B009F8F29 /* Project object */;
@@ -69,6 +102,7 @@
69102

70103
/* Begin PBXFileReference section */
71104
0303BC3E1C29FC3F003E7B16 /* EventSerializable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventSerializable.swift; sourceTree = "<group>"; };
105+
03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "KSCrash-iOS.xcodeproj"; path = "Carthage/Checkouts/KSCrash/iOS/KSCrash-iOS.xcodeproj"; sourceTree = "<group>"; };
72106
033A34281C605B7E00BED5AE /* EventProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventProperties.swift; sourceTree = "<group>"; };
73107
033A342B1C60693400BED5AE /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
74108
035242911C988D2400A65D6D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -95,7 +129,6 @@
95129
03E94AF61C22595C009F8F29 /* SentrySwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SentrySwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
96130
03E94B0B1C22596A009F8F29 /* SentrySwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SentrySwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
97131
03E94B141C22596A009F8F29 /* SentrySwift-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SentrySwift-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
98-
217A961F1CD67736006C681F /* KSCrash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KSCrash.framework; path = Carthage/Build/iOS/KSCrash.framework; sourceTree = "<group>"; };
99132
/* End PBXFileReference section */
100133

101134
/* Begin PBXFrameworksBuildPhase section */
@@ -118,21 +151,30 @@
118151
isa = PBXFrameworksBuildPhase;
119152
buildActionMask = 2147483647;
120153
files = (
121-
217A96231CD67746006C681F /* KSCrash.framework in Frameworks */,
122154
);
123155
runOnlyForDeploymentPostprocessing = 0;
124156
};
125157
03E94B111C22596A009F8F29 /* Frameworks */ = {
126158
isa = PBXFrameworksBuildPhase;
127159
buildActionMask = 2147483647;
128160
files = (
129-
03E94B151C22596A009F8F29 /* SentrySwift.framework in Frameworks */,
130161
);
131162
runOnlyForDeploymentPostprocessing = 0;
132163
};
133164
/* End PBXFrameworksBuildPhase section */
134165

135166
/* Begin PBXGroup section */
167+
03193C921CD78DF600E8AB83 /* Products */ = {
168+
isa = PBXGroup;
169+
children = (
170+
03193C991CD78DF600E8AB83 /* libKSCrashLib.a */,
171+
03193C9B1CD78DF600E8AB83 /* KSCrashTests.xctest */,
172+
03193C9D1CD78DF600E8AB83 /* KSCrash.framework */,
173+
03193C9F1CD78DF600E8AB83 /* KSCrash.framework */,
174+
);
175+
name = Products;
176+
sourceTree = "<group>";
177+
};
136178
035242901C988D2400A65D6D /* SentrySwift */ = {
137179
isa = PBXGroup;
138180
children = (
@@ -234,7 +276,7 @@
234276
217A96221CD6773F006C681F /* iOS */ = {
235277
isa = PBXGroup;
236278
children = (
237-
217A961F1CD67736006C681F /* KSCrash.framework */,
279+
03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */,
238280
);
239281
name = iOS;
240282
sourceTree = "<group>";
@@ -309,6 +351,7 @@
309351
buildRules = (
310352
);
311353
dependencies = (
354+
03193CA11CD78E2100E8AB83 /* PBXTargetDependency */,
312355
);
313356
name = "SentrySwift-iOS";
314357
productName = "RavenSwift-iOS";
@@ -366,6 +409,12 @@
366409
mainGroup = 03E94AE21C22595B009F8F29;
367410
productRefGroup = 03E94AED1C22595B009F8F29 /* Products */;
368411
projectDirPath = "";
412+
projectReferences = (
413+
{
414+
ProductGroup = 03193C921CD78DF600E8AB83 /* Products */;
415+
ProjectRef = 03193C911CD78DF600E8AB83 /* KSCrash-iOS.xcodeproj */;
416+
},
417+
);
369418
projectRoot = "";
370419
targets = (
371420
03E94AEB1C22595B009F8F29 /* SentrySwift */,
@@ -376,6 +425,37 @@
376425
};
377426
/* End PBXProject section */
378427

428+
/* Begin PBXReferenceProxy section */
429+
03193C991CD78DF600E8AB83 /* libKSCrashLib.a */ = {
430+
isa = PBXReferenceProxy;
431+
fileType = archive.ar;
432+
path = libKSCrashLib.a;
433+
remoteRef = 03193C981CD78DF600E8AB83 /* PBXContainerItemProxy */;
434+
sourceTree = BUILT_PRODUCTS_DIR;
435+
};
436+
03193C9B1CD78DF600E8AB83 /* KSCrashTests.xctest */ = {
437+
isa = PBXReferenceProxy;
438+
fileType = wrapper.cfbundle;
439+
path = KSCrashTests.xctest;
440+
remoteRef = 03193C9A1CD78DF600E8AB83 /* PBXContainerItemProxy */;
441+
sourceTree = BUILT_PRODUCTS_DIR;
442+
};
443+
03193C9D1CD78DF600E8AB83 /* KSCrash.framework */ = {
444+
isa = PBXReferenceProxy;
445+
fileType = wrapper.framework;
446+
path = KSCrash.framework;
447+
remoteRef = 03193C9C1CD78DF600E8AB83 /* PBXContainerItemProxy */;
448+
sourceTree = BUILT_PRODUCTS_DIR;
449+
};
450+
03193C9F1CD78DF600E8AB83 /* KSCrash.framework */ = {
451+
isa = PBXReferenceProxy;
452+
fileType = wrapper.framework;
453+
path = KSCrash.framework;
454+
remoteRef = 03193C9E1CD78DF600E8AB83 /* PBXContainerItemProxy */;
455+
sourceTree = BUILT_PRODUCTS_DIR;
456+
};
457+
/* End PBXReferenceProxy section */
458+
379459
/* Begin PBXResourcesBuildPhase section */
380460
03E94AEA1C22595B009F8F29 /* Resources */ = {
381461
isa = PBXResourcesBuildPhase;
@@ -475,6 +555,11 @@
475555
/* End PBXSourcesBuildPhase section */
476556

477557
/* Begin PBXTargetDependency section */
558+
03193CA11CD78E2100E8AB83 /* PBXTargetDependency */ = {
559+
isa = PBXTargetDependency;
560+
name = KSCrash;
561+
targetProxy = 03193CA01CD78E2100E8AB83 /* PBXContainerItemProxy */;
562+
};
478563
03E94AF91C22595C009F8F29 /* PBXTargetDependency */ = {
479564
isa = PBXTargetDependency;
480565
target = 03E94AEB1C22595B009F8F29 /* SentrySwift */;
@@ -578,7 +663,7 @@
578663
isa = XCBuildConfiguration;
579664
buildSettings = {
580665
CLANG_ENABLE_MODULES = YES;
581-
CODE_SIGN_IDENTITY = "Mac Developer";
666+
CODE_SIGN_IDENTITY = "";
582667
COMBINE_HIDPI_IMAGES = YES;
583668
DEFINES_MODULE = YES;
584669
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -600,7 +685,7 @@
600685
isa = XCBuildConfiguration;
601686
buildSettings = {
602687
CLANG_ENABLE_MODULES = YES;
603-
CODE_SIGN_IDENTITY = "Mac Developer";
688+
CODE_SIGN_IDENTITY = "";
604689
COMBINE_HIDPI_IMAGES = YES;
605690
DEFINES_MODULE = YES;
606691
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -658,14 +743,13 @@
658743
DYLIB_COMPATIBILITY_VERSION = 1;
659744
DYLIB_CURRENT_VERSION = 1;
660745
DYLIB_INSTALL_NAME_BASE = "@rpath";
661-
FRAMEWORK_SEARCH_PATHS = (
662-
"$(inherited)",
663-
"$(PROJECT_DIR)/Carthage/Build/iOS",
664-
);
746+
EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
747+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
665748
INFOPLIST_FILE = SentrySwift/Info.plist;
666749
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
667750
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
668751
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
752+
LIBRARY_SEARCH_PATHS = "";
669753
PRODUCT_BUNDLE_IDENTIFIER = "com.getsentry.$(PRODUCT_NAME:rfc1034identifier)";
670754
PRODUCT_NAME = SentrySwift;
671755
SDKROOT = iphoneos;
@@ -685,14 +769,13 @@
685769
DYLIB_COMPATIBILITY_VERSION = 1;
686770
DYLIB_CURRENT_VERSION = 1;
687771
DYLIB_INSTALL_NAME_BASE = "@rpath";
688-
FRAMEWORK_SEARCH_PATHS = (
689-
"$(inherited)",
690-
"$(PROJECT_DIR)/Carthage/Build/iOS",
691-
);
772+
EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
773+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
692774
INFOPLIST_FILE = SentrySwift/Info.plist;
693775
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
694776
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
695777
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
778+
LIBRARY_SEARCH_PATHS = "";
696779
PRODUCT_BUNDLE_IDENTIFIER = "com.getsentry.$(PRODUCT_NAME:rfc1034identifier)";
697780
PRODUCT_NAME = SentrySwift;
698781
SDKROOT = iphoneos;
@@ -706,6 +789,8 @@
706789
isa = XCBuildConfiguration;
707790
buildSettings = {
708791
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
792+
EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
793+
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
709794
INFOPLIST_FILE = SentrySwiftTests/Info.plist;
710795
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
711796
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -719,6 +804,8 @@
719804
isa = XCBuildConfiguration;
720805
buildSettings = {
721806
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
807+
EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
808+
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
722809
INFOPLIST_FILE = SentrySwiftTests/Info.plist;
723810
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
724811
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎SentrySwiftTests/SentrySwiftTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class SentrySwiftTests: XCTestCase {
201201
assert(serialized["message"] as! String == message)
202202
assert(serialized["timestamp"] as? String != nil)
203203
assert(serialized["level"] as! String == "error")
204-
assert(serialized["platform"] as! String == "swift")
204+
assert(serialized["platform"] as! String == "cocoa")
205205
}
206206

207207
func testEventSerializableWithOptional() {

0 commit comments

Comments
 (0)