Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building iOS with Carthage #3

Merged
merged 6 commits into from
May 2, 2016
Merged

Fix building iOS with Carthage #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df31f66
Use @soffes' fork of KSCrash
soffes May 1, 2016
d7d4d20
Fix deprecated Swift features
soffes May 1, 2016
a76d102
Update project settings
soffes May 1, 2016
4b4c23b
Use @kstenerud's release of KSCrash!
soffes May 1, 2016
0615ef4
Clean up
soffes May 1, 2016
cc1b6e1
Properly link KSCrash
soffes May 1, 2016
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Carthage/Checkouts/KSCrash"]
path = Carthage/Checkouts/KSCrash
url = https://d1894ef214ee876e4fbb0b65f56a733a87d1afaa@github.com/kstenerud/KSCrash.git
url = https://github.com/kstenerud/KSCrash.git
3 changes: 1 addition & 2 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
github "kstenerud/KSCrash" ~> 1.3

github "kstenerud/KSCrash" ~> 1.5.5
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "kstenerud/KSCrash" "1.3.4"
github "kstenerud/KSCrash" "1.5.5"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/KSCrash
Open in desktop
Submodule KSCrash updated 88 files
+2 −1 KSCrash.podspec
+4 −2 Mac/Example-Apps-Mac.xcodeproj/project.pbxproj
+30 −0 Mac/KSCrash-Mac.xcodeproj/project.pbxproj
+1 −0 Mac/Simple-Example/AppDelegate.m
+1 −0 Source/Framework/KSCrashFramework.h
+1 −0 Source/KSCrash-Tests/KSCrashInstallationEmail_Tests.m
+6 −6 Source/KSCrash-Tests/KSCrashReportFilterGZip_Tests.m
+7 −7 Source/KSCrash-Tests/KSCrashReportFilterJSON_Tests.m
+15 −15 Source/KSCrash-Tests/KSCrashReportFilter_Tests.m
+1 −1 Source/KSCrash-Tests/RFC3339DateTool_Tests.m
+53 −0 Source/KSCrash/Installations/KSCrashInstallation+Alert.h
+59 −0 Source/KSCrash/Installations/KSCrashInstallation+Alert.m
+7 −24 Source/KSCrash/Installations/KSCrashInstallation.h
+8 −34 Source/KSCrash/Installations/KSCrashInstallation.m
+0 −2 Source/KSCrash/Installations/KSCrashInstallationEmail.m
+1 −1 Source/KSCrash/Recording/KSCrash.h
+13 −7 Source/KSCrash/Recording/KSCrash.m
+3 −0 Source/KSCrash/Recording/KSCrashAdvanced.h
+2 −17 Source/KSCrash/Recording/KSCrashC.c
+80 −75 Source/KSCrash/Recording/KSCrashReport.c
+2 −0 Source/KSCrash/Recording/KSCrashType.h
+79 −0 Source/KSCrash/Recording/KSSystemCapabilities.h
+25 −6 Source/KSCrash/Recording/KSSystemInfo.m
+13 −1 Source/KSCrash/Recording/Sentry/KSCrashSentry.c
+15 −11 Source/KSCrash/Recording/Sentry/KSCrashSentry_CPPException.mm
+3 −4 Source/KSCrash/Recording/Sentry/KSCrashSentry_MachException.c
+4 −0 Source/KSCrash/Recording/Tools/KSJSONCodec.c
+5 −1 Source/KSCrash/Recording/Tools/KSJSONCodec.h
+156 −79 Source/KSCrash/Recording/Tools/KSObjC.c
+17 −0 Source/KSCrash/Recording/Tools/KSObjC.h
+21 −17 Source/KSCrash/Recording/Tools/KSZombie.m
+2 −0 Source/KSCrash/Reporting/Filters/KSCrashReportFilter.h
+11 −3 Source/KSCrash/Reporting/Filters/KSCrashReportFilter.m
+12 −13 Source/KSCrash/Reporting/Filters/KSCrashReportFilterAlert.m
+43 −35 Source/KSCrash/Reporting/Filters/KSCrashReportFilterAppleFmt.m
+2 −1 Source/KSCrash/Reporting/Sinks/KSCrashReportSinkEMail.m
+4 −8 Source/KSCrash/Reporting/Sinks/KSCrashReportSinkQuincyHockey.m
+4 −3 Source/KSCrash/Reporting/Sinks/KSCrashReportSinkVictory.m
+26 −12 Source/KSCrash/Reporting/Tools/KSHTTPMultipartPostBody.m
+0 −22 Source/KSCrash/Reporting/Tools/KSHTTPRequestSender.h
+65 −61 Source/KSCrash/Reporting/Tools/KSHTTPRequestSender.m
+1 −1 Source/KSCrash/Reporting/Tools/KSReachabilityKSCrash.m
+33 −0 Source/KSCrash/Reporting/Tools/NSString+URLEncode.h
+40 −0 Source/KSCrash/Reporting/Tools/NSString+URLEncode.m
+10 −0 TVOS.xcworkspace/contents.xcworkspacedata
+327 −0 TVOS/Example-Apps-TVOS.xcodeproj/project.pbxproj
+91 −0 TVOS/Example-Apps-TVOS.xcodeproj/xcshareddata/xcschemes/SimpleExample.xcscheme
+1,128 −0 TVOS/KSCrash-TVOS.xcodeproj/project.pbxproj
+80 −0 TVOS/KSCrash-TVOS.xcodeproj/xcshareddata/xcschemes/KSCrash-TVOS.xcscheme
+26 −0 TVOS/KSCrash-TVOS/Info.plist
+17 −0 TVOS/SimpleExample/AppDelegate.h
+39 −0 TVOS/SimpleExample/AppDelegate.m
+12 −0 ...Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
+6 −0 ...ssets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json
+17 −0 ...pleExample/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json
+12 −0 ...op Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
+6 −0 ...sets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json
+12 −0 ...p Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
+6 −0 ...ets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json
+12 −0 ...Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
+6 −0 ...ssets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json
+17 −0 ...pleExample/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json
+12 −0 ...op Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
+6 −0 ...sets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json
+12 −0 ...p Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
+6 −0 ...ets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json
+26 −0 TVOS/SimpleExample/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
+12 −0 ...SimpleExample/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
+6 −0 TVOS/SimpleExample/Assets.xcassets/Contents.json
+15 −0 TVOS/SimpleExample/Assets.xcassets/LaunchImage.launchimage/Contents.json
+39 −0 TVOS/SimpleExample/Base.lproj/Main.storyboard
+32 −0 TVOS/SimpleExample/Info.plist
+15 −0 TVOS/SimpleExample/ViewController.h
+22 −0 TVOS/SimpleExample/ViewController.m
+16 −0 TVOS/SimpleExample/main.m
+1 −0 iOS/Advanced-Example/AppDelegate.m
+30 −2 iOS/Example-Apps-iOS.xcodeproj/project.pbxproj
+1 −1 iOS/Example-Apps-iOS.xcodeproj/xcshareddata/xcschemes/Advanced-Example.xcscheme
+1 −1 iOS/Example-Apps-iOS.xcodeproj/xcshareddata/xcschemes/Crash-Tester.xcscheme
+1 −1 iOS/Example-Apps-iOS.xcodeproj/xcshareddata/xcschemes/Simple-Example.xcscheme
+1 −1 iOS/Example-Apps-iOS.xcodeproj/xcshareddata/xcschemes/Swift-Tester.xcscheme
+480 −1 iOS/KSCrash-iOS.xcodeproj/project.pbxproj
+1 −1 iOS/KSCrash-iOS.xcodeproj/xcshareddata/xcschemes/KSCrash.xcscheme
+1 −1 iOS/KSCrash-iOS.xcodeproj/xcshareddata/xcschemes/KSCrashLib.xcscheme
+80 −0 iOS/KSCrash-iOS.xcodeproj/xcshareddata/xcschemes/KSCrash_static.xcscheme
+26 −0 iOS/KSCrash/KSCrash_static-Info.plist
+1 −0 iOS/Simple-Example/AppDelegate.m
+1 −0 iOS/Swift-Tester/AppDelegate.swift
97 changes: 29 additions & 68 deletions SentrySwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
033A342A1C605B7E00BED5AE /* EventProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 033A34281C605B7E00BED5AE /* EventProperties.swift */; };
033A342C1C60693400BED5AE /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 033A342B1C60693400BED5AE /* User.swift */; };
033A342D1C60693400BED5AE /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 033A342B1C60693400BED5AE /* User.swift */; };
035242921C988D2400A65D6D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 035242911C988D2400A65D6D /* Info.plist */; };
035242981C988D2F00A65D6D /* Abort.json in Resources */ = {isa = PBXBuildFile; fileRef = 035242941C988D2F00A65D6D /* Abort.json */; };
035242991C988D2F00A65D6D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 035242951C988D2F00A65D6D /* Info.plist */; };
035242A61C9892A700A65D6D /* SentrySwiftCrashTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035242961C988D2F00A65D6D /* SentrySwiftCrashTests.swift */; };
Expand Down Expand Up @@ -41,38 +40,17 @@
03D4D9FA1CA48FA800799CC9 /* Breadcrumb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D4D9F81CA48FA800799CC9 /* Breadcrumb.swift */; };
03D4DA001CA586EF00799CC9 /* SentrySwiftBreadcrumbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D4D9FF1CA586EF00799CC9 /* SentrySwiftBreadcrumbTests.swift */; };
03D4DA011CA586EF00799CC9 /* SentrySwiftBreadcrumbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D4D9FF1CA586EF00799CC9 /* SentrySwiftBreadcrumbTests.swift */; };
03DE7D811C876E3200F789BA /* KSCrash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DE7D801C876DEF00F789BA /* KSCrash.framework */; };
03E3D1D81C3E166800F00547 /* EventSerializable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0303BC3E1C29FC3F003E7B16 /* EventSerializable.swift */; };
03E3D1F81C3E1A2800F00547 /* DSN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E3D1F71C3E1A2800F00547 /* DSN.swift */; };
03E3D1F91C3E1A2800F00547 /* DSN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E3D1F71C3E1A2800F00547 /* DSN.swift */; };
03E3D21F1C3EB20F00F00547 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E3D21E1C3EB20F00F00547 /* Request.swift */; };
03E3D2201C3EB20F00F00547 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E3D21E1C3EB20F00F00547 /* Request.swift */; };
03E94AF71C22595C009F8F29 /* SentrySwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E94AEC1C22595B009F8F29 /* SentrySwift.framework */; };
03E94B151C22596A009F8F29 /* SentrySwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E94B0B1C22596A009F8F29 /* SentrySwift.framework */; };
217A96231CD67746006C681F /* KSCrash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217A961F1CD67736006C681F /* KSCrash.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
03DE7D7B1C876DEF00F789BA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 03DE7D751C876DEF00F789BA /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = CB6D132617EB749A00BC2C04;
remoteInfo = KSCrashLib;
};
03DE7D7D1C876DEF00F789BA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 03DE7D751C876DEF00F789BA /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = CB6D133317EB749A00BC2C04;
remoteInfo = KSCrashTests;
};
03DE7D7F1C876DEF00F789BA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 03DE7D751C876DEF00F789BA /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 03DE7B6A1C84DEF700F789BA;
remoteInfo = KSCrash;
};
03E94AF81C22595C009F8F29 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 03E94AE31C22595B009F8F29 /* Project object */;
Expand Down Expand Up @@ -111,13 +89,13 @@
03CFCEC01C612F3E00999EB7 /* KSCrashHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KSCrashHandler.swift; sourceTree = "<group>"; };
03D4D9F81CA48FA800799CC9 /* Breadcrumb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Breadcrumb.swift; sourceTree = "<group>"; };
03D4D9FF1CA586EF00799CC9 /* SentrySwiftBreadcrumbTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentrySwiftBreadcrumbTests.swift; sourceTree = "<group>"; };
03DE7D751C876DEF00F789BA /* KSCrash-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "KSCrash-iOS.xcodeproj"; path = "Carthage/Checkouts/KSCrash/iOS/KSCrash-iOS.xcodeproj"; sourceTree = "<group>"; };
03E3D1F71C3E1A2800F00547 /* DSN.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DSN.swift; sourceTree = "<group>"; };
03E3D21E1C3EB20F00F00547 /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
03E94AEC1C22595B009F8F29 /* SentrySwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SentrySwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
03E94AF61C22595C009F8F29 /* SentrySwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SentrySwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
03E94B0B1C22596A009F8F29 /* SentrySwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SentrySwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
03E94B141C22596A009F8F29 /* SentrySwift-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SentrySwift-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
217A961F1CD67736006C681F /* KSCrash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KSCrash.framework; path = Carthage/Build/iOS/KSCrash.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -140,7 +118,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
03DE7D811C876E3200F789BA /* KSCrash.framework in Frameworks */,
217A96231CD67746006C681F /* KSCrash.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -223,23 +201,13 @@
name = Crash;
sourceTree = "<group>";
};
03DE7D761C876DEF00F789BA /* Products */ = {
isa = PBXGroup;
children = (
03DE7D7C1C876DEF00F789BA /* libKSCrashLib.a */,
03DE7D7E1C876DEF00F789BA /* KSCrashTests.xctest */,
03DE7D801C876DEF00F789BA /* KSCrash.framework */,
);
name = Products;
sourceTree = "<group>";
};
03E94AE21C22595B009F8F29 = {
isa = PBXGroup;
children = (
03DE7D751C876DEF00F789BA /* KSCrash-iOS.xcodeproj */,
036378271C225D5200644C01 /* Sources */,
035242901C988D2400A65D6D /* SentrySwift */,
035242931C988D2F00A65D6D /* SentrySwiftTests */,
217A96211CD67739006C681F /* Frameworks */,
03E94AED1C22595B009F8F29 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -255,6 +223,22 @@
name = Products;
sourceTree = "<group>";
};
217A96211CD67739006C681F /* Frameworks */ = {
isa = PBXGroup;
children = (
217A96221CD6773F006C681F /* iOS */,
);
name = Frameworks;
sourceTree = "<group>";
};
217A96221CD6773F006C681F /* iOS */ = {
isa = PBXGroup;
children = (
217A961F1CD67736006C681F /* KSCrash.framework */,
);
name = iOS;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -356,7 +340,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0730;
TargetAttributes = {
03E94AEB1C22595B009F8F29 = {
CreatedOnToolsVersion = 7.2;
Expand All @@ -382,12 +366,6 @@
mainGroup = 03E94AE21C22595B009F8F29;
productRefGroup = 03E94AED1C22595B009F8F29 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 03DE7D761C876DEF00F789BA /* Products */;
ProjectRef = 03DE7D751C876DEF00F789BA /* KSCrash-iOS.xcodeproj */;
},
);
projectRoot = "";
targets = (
03E94AEB1C22595B009F8F29 /* SentrySwift */,
Expand All @@ -398,37 +376,12 @@
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
03DE7D7C1C876DEF00F789BA /* libKSCrashLib.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libKSCrashLib.a;
remoteRef = 03DE7D7B1C876DEF00F789BA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
03DE7D7E1C876DEF00F789BA /* KSCrashTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = KSCrashTests.xctest;
remoteRef = 03DE7D7D1C876DEF00F789BA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
03DE7D801C876DEF00F789BA /* KSCrash.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = KSCrash.framework;
remoteRef = 03DE7D7F1C876DEF00F789BA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
03E94AEA1C22595B009F8F29 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
035242981C988D2F00A65D6D /* Abort.json in Resources */,
035242921C988D2400A65D6D /* Info.plist in Resources */,
035242991C988D2F00A65D6D /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -705,6 +658,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = SentrySwift/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -728,6 +685,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = SentrySwift/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand Down
2 changes: 1 addition & 1 deletion SentrySwift.xcodeproj/xcshareddata/xcschemes/SentrySwift-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion SentrySwift.xcodeproj/xcshareddata/xcschemes/SentrySwift.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 1 addition & 2 deletions Sources/AppleCrashReport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,4 @@ extension AppleCrashReport: EventSerializable {
"system": system
]
}

}
}
3 changes: 1 addition & 2 deletions Sources/Breadcrumb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,4 @@ extension Breadcrumb: EventSerializable {
"data": data
]
}

}
}
3 changes: 1 addition & 2 deletions Sources/BreadcrumbStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,4 @@ extension BreadcrumbStore: EventSerializable {
public var serialized: SerializedType {
return crumbs.values.flatMap{$0.map{$0.serialized}}.flatMap{$0}
}

}
}
2 changes: 1 addition & 1 deletion Sources/CrashHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ import Foundation
@objc public protocol CrashHandler: EventProperties {
var breadcrumbsSerialized: BreadcrumbStore.SerializedType? { get set }
func startCrashReporting(createdEvent: (event: Event) -> ())
}
}
1 change: 0 additions & 1 deletion Sources/DSN.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,4 @@ import Foundation
// Removing first and getting second
return url.pathComponents?.dropFirst().first
}

}
13 changes: 5 additions & 8 deletions Sources/Event.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,16 @@ extension Event: EventSerializable {
]

// Reduce attributes so only non-nill attribute are sent
return attributes.reduce(SerializedType()) { (var serializedType, attribute) -> SerializedType in
return attributes.reduce(SerializedType()) { serializedType, attribute in
var output = serializedType
if let value = attribute.value {
serializedType[attribute.key] = value
output[attribute.key] = value
}
return serializedType
return output
}
}


}



@objc public enum SentrySeverity: Int {
case Fatal
case Error
Expand Down Expand Up @@ -174,4 +171,4 @@ extension NSDate {
public var iso8601: String {
return dateFormatter.stringFromDate(self)
}
}
}
2 changes: 0 additions & 2 deletions Sources/EventOffline.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,4 @@ extension SentryClient {
let data = try NSJSONSerialization.dataWithJSONObject(event.serialized, options: [])
return NSString(data: data, encoding: NSUTF8StringEncoding) as? String
}

}

1 change: 0 additions & 1 deletion Sources/EventProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,4 @@ extension EventProperties {

return base
}

}
2 changes: 1 addition & 1 deletion Sources/EventSerializable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ public typealias SerializedTypeArray = [SerializedTypeDictionary]
/// A protocol used for complex structures (ex: Event, User, AppleCrashReport)
/// on how to serialize them.
public protocol EventSerializable {
typealias SerializedType
associatedtype SerializedType
var serialized: SerializedType { get }
}
3 changes: 1 addition & 2 deletions Sources/KSCrashHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ extension SentryClient {
}
}


installation?.install()
}

Expand Down Expand Up @@ -172,4 +171,4 @@ extension SentryClient {
userInfo?[keyBreadcrumbsSerialized] as? BreadcrumbStore.SerializedType
)
}
}
}
3 changes: 1 addition & 2 deletions Sources/Request.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,4 @@ extension SentryClient {
});
task.resume()
}

}
}
2 changes: 1 addition & 1 deletion Sources/Sentry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,4 @@ public struct SentryInfo {
/// Platforms that this client is running on
public enum OS {
case IOS, OSX, Other
}
}
5 changes: 0 additions & 5 deletions Sources/SentrySwift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
@import KSCrash;
#endif

//! Project version number for SentrySwift.
FOUNDATION_EXPORT double SentrySwiftVersionNumber;

//! Project version string for SentrySwift.
FOUNDATION_EXPORT const unsigned char SentrySwiftVersionString[];

3 changes: 1 addition & 2 deletions Sources/User.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ extension User: EventSerializable {

return info
}

}
}