Skip to content

Commit f9830d5

Browse files
krml19krml19
authored
Merge pull request #50 from backtrace-labs/develop
Out of memory support
2 parents 3a764f8 + a7a030a commit f9830d5

37 files changed

+526
-177
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Deploy to Cocoapods
2+
3+
on:
4+
push:
5+
tags: '[0-9]+.[0-9]+.[0-9]+*'
6+
7+
jobs:
8+
build:
9+
runs-on: macos-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Install dependencies
13+
run: sh scripts/install.sh
14+
- name: Run tests
15+
run: sh scripts/test.sh
16+
- name: Deploy to Cocoapods
17+
run: sh scripts/deploy.sh
18+
env:
19+
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

‎.github/workflows/test.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Run tests
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
- master
8+
9+
jobs:
10+
build:
11+
runs-on: macos-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Install dependencies
15+
run: sh scripts/install.sh
16+
- name: Run tests
17+
run: sh scripts/test.sh

‎.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.swiftlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ force_try:
2828
severity: warning # explicitly
2929
# rules that have both warning and error levels, can set just the warning level
3030
# implicitly
31-
line_length: 120
31+
line_length: 130
3232
# they can set both implicitly with an array
3333
type_body_length:
3434
- 300 # warning

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: swift
22
os: osx
3-
osx_image: xcode11.6
3+
osx_image: xcode12
44
script:
55
- sh scripts/install.sh
66
- sh scripts/test.sh

‎Backtrace.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Pod::Spec.new do |s|
1010

1111
s.name = "Backtrace"
12-
s.version = "1.5.6"
12+
s.version = "1.6.0"
1313
s.summary = "Backtrace's integration with iOS, macOS and tvOS"
1414
s.description = "Reliable crash and hang reporting for iOS, macOS and tvOS."
1515
s.homepage = "https://backtrace.io/"

‎Backtrace.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0B6B4CFD25CD8331002DA15C /* BacktraceOomWatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B6B4CFC25CD8331002DA15C /* BacktraceOomWatcher.swift */; };
11+
0B6B4CFE25CD8331002DA15C /* BacktraceOomWatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B6B4CFC25CD8331002DA15C /* BacktraceOomWatcher.swift */; };
12+
0B6B4CFF25CD8331002DA15C /* BacktraceOomWatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B6B4CFC25CD8331002DA15C /* BacktraceOomWatcher.swift */; };
1013
282C85E7223FD8E70014FE75 /* BacktraceCrashExceptionApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 282C85E6223FD8E70014FE75 /* BacktraceCrashExceptionApplication.swift */; };
1114
282C85EA22419C560014FE75 /* BacktraceWatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 282C85E822419BB10014FE75 /* BacktraceWatcherTests.swift */; };
1215
282C85EB22419C600014FE75 /* BacktraceWatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 282C85E822419BB10014FE75 /* BacktraceWatcherTests.swift */; };
@@ -305,6 +308,7 @@
305308
/* End PBXCopyFilesBuildPhase section */
306309

307310
/* Begin PBXFileReference section */
311+
0B6B4CFC25CD8331002DA15C /* BacktraceOomWatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BacktraceOomWatcher.swift; sourceTree = "<group>"; };
308312
0DFF5AC24C0AC4EF3E2F5307 /* Pods-Example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-Example-tvOS/Pods-Example-tvOS.release.xcconfig"; sourceTree = "<group>"; };
309313
266E3F27CBA1D3CE7E2CCCB2 /* Pods_Backtrace_macOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Backtrace_macOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
310314
282C85E6223FD8E70014FE75 /* BacktraceCrashExceptionApplication.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BacktraceCrashExceptionApplication.swift; sourceTree = "<group>"; };
@@ -701,6 +705,7 @@
701705
children = (
702706
F28F164521E28441008E4B96 /* BacktraceReporter.swift */,
703707
F28162F921EFD6AD00A12B7A /* BacktraceResponse.swift */,
708+
0B6B4CFC25CD8331002DA15C /* BacktraceOomWatcher.swift */,
704709
);
705710
path = Client;
706711
sourceTree = "<group>";
@@ -1779,6 +1784,7 @@
17791784
28F95BDB22526088003936E0 /* SignalContext.swift in Sources */,
17801785
28F95BD122526068003936E0 /* BacktraceResult.swift in Sources */,
17811786
28F95BE7225260B0003936E0 /* Attachment.swift in Sources */,
1787+
0B6B4CFF25CD8331002DA15C /* BacktraceOomWatcher.swift in Sources */,
17821788
28F95BCB22526045003936E0 /* Dispatching.swift in Sources */,
17831789
28F95BDD2252608E003936E0 /* BacktraceReportStatus.swift in Sources */,
17841790
28F95BDE22526091003936E0 /* ReportingPolicy.swift in Sources */,
@@ -1864,6 +1870,7 @@
18641870
F282075C21CEA37A0017367F /* Repository.swift in Sources */,
18651871
F26EBF3B23F21BC700A64218 /* BacktraceRateLimiter.swift in Sources */,
18661872
F28F165221E2A08F008E4B96 /* HttpMethod.swift in Sources */,
1873+
0B6B4CFE25CD8331002DA15C /* BacktraceOomWatcher.swift in Sources */,
18671874
F29CD78E21FC6BC700216C59 /* BacktraceFileManager.swift in Sources */,
18681875
F2D7122221F10C45002D2A26 /* BacktraceClientConfiguration.swift in Sources */,
18691876
F29CD79221FCC25600216C59 /* BacktraceWatcher.swift in Sources */,
@@ -1938,6 +1945,7 @@
19381945
F2D7122421F10E78002D2A26 /* BacktraceCredentials.swift in Sources */,
19391946
F28F164621E28441008E4B96 /* BacktraceReporter.swift in Sources */,
19401947
F21211A5222348AC000B3692 /* BacktraceCrashReporter.swift in Sources */,
1948+
0B6B4CFD25CD8331002DA15C /* BacktraceOomWatcher.swift in Sources */,
19411949
F2C1514221F7D8E30014F1B3 /* PersistentRepository.swift in Sources */,
19421950
F2D8BE3821BD7894007CFEFA /* BacktraceError.swift in Sources */,
19431951
F282075821CEA31F0017367F /* BacktraceReport.swift in Sources */,

‎Backtrace.xcodeproj/xcshareddata/xcschemes/Backtrace-tvOS.xcscheme‎ renamed to ‎Backtrace.xcodeproj/xcshareddata/xcschemes/Backtrace-tvOS-lib.xcscheme‎

File renamed without changes.

‎Brewfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
brew "fastlane"
1+
brew "fastlane"
2+
brew 'cocoapods'
3+
brew 'swiftlint'

‎Brewfile.lock.json‎

Lines changed: 76 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,78 @@
22
"entries": {
33
"brew": {
44
"fastlane": {
5-
"version": "2.161.0",
5+
"version": "2.174.0",
66
"bottle": {
7+
"rebuild": 0,
78
"cellar": ":any",
89
"prefix": "/usr/local",
10+
"root_url": "https://homebrew.bintray.com/bottles",
911
"files": {
12+
"arm64_big_sur": {
13+
"url": "https://homebrew.bintray.com/bottles/fastlane-2.174.0.arm64_big_sur.bottle.tar.gz",
14+
"sha256": "f426b0fb779e80de18de67b52f9552ee666ae8b9d1eac2c0631be59a33429b1b"
15+
},
16+
"big_sur": {
17+
"url": "https://homebrew.bintray.com/bottles/fastlane-2.174.0.big_sur.bottle.tar.gz",
18+
"sha256": "4eac8c1706c541acbfa838b6aea84cf39b74c242e2aadefd0a09ac185a2f24c9"
19+
},
20+
"catalina": {
21+
"url": "https://homebrew.bintray.com/bottles/fastlane-2.174.0.catalina.bottle.tar.gz",
22+
"sha256": "35c4d2b53eda31363256febf927c9b7a305ec7c27173651cc87adf0b4dc5316e"
23+
},
24+
"mojave": {
25+
"url": "https://homebrew.bintray.com/bottles/fastlane-2.174.0.mojave.bottle.tar.gz",
26+
"sha256": "6047bf36c5cd07630d35ee2e12b79782f12550a1b5acdd22badf7c4fcc826cf4"
27+
}
28+
}
29+
}
30+
},
31+
"cocoapods": {
32+
"version": "1.10.1",
33+
"bottle": {
34+
"rebuild": 0,
35+
"cellar": "/usr/local/Cellar",
36+
"prefix": "/usr/local",
37+
"root_url": "https://homebrew.bintray.com/bottles",
38+
"files": {
39+
"arm64_big_sur": {
40+
"url": "https://homebrew.bintray.com/bottles/cocoapods-1.10.1.arm64_big_sur.bottle.tar.gz",
41+
"sha256": "08794cfd260bf206eed3496805816661da367bffdf9af748cd812b1c40a0de75"
42+
},
43+
"big_sur": {
44+
"url": "https://homebrew.bintray.com/bottles/cocoapods-1.10.1.big_sur.bottle.tar.gz",
45+
"sha256": "0caa8953926c827f62d53f9767aed0a904604c0425ea0557b24d738240db809a"
46+
},
1047
"catalina": {
11-
"url": "https://homebrew.bintray.com/bottles/fastlane-2.161.0.catalina.bottle.tar.gz",
12-
"sha256": "fa9092e388bca3b32807eddcc1c6514e92f3e5e20da966f82bd7670c3e0d42d3"
48+
"url": "https://homebrew.bintray.com/bottles/cocoapods-1.10.1.catalina.bottle.tar.gz",
49+
"sha256": "3a05cecba1a15c8cad8baa04b4e6be6eef8159c061b37096012de75132e7cd74"
1350
},
1451
"mojave": {
15-
"url": "https://homebrew.bintray.com/bottles/fastlane-2.161.0.mojave.bottle.tar.gz",
16-
"sha256": "431e169597585884f93781f00c17c64fd779d6ea311602891567236146473c5f"
52+
"url": "https://homebrew.bintray.com/bottles/cocoapods-1.10.1.mojave.bottle.tar.gz",
53+
"sha256": "0883b18c75e7cade594eced3d828ccacefafbbb3ead61667bca21e1fbc94970d"
54+
}
55+
}
56+
}
57+
},
58+
"swiftlint": {
59+
"version": "0.42.0",
60+
"bottle": {
61+
"rebuild": 0,
62+
"cellar": ":any_skip_relocation",
63+
"prefix": "/usr/local",
64+
"root_url": "https://homebrew.bintray.com/bottles",
65+
"files": {
66+
"arm64_big_sur": {
67+
"url": "https://homebrew.bintray.com/bottles/swiftlint-0.42.0.arm64_big_sur.bottle.tar.gz",
68+
"sha256": "a9cf09a414fd3b8a5cb3d94e682a725f654a4d1caef19497a500d6dbb926ba7c"
69+
},
70+
"big_sur": {
71+
"url": "https://homebrew.bintray.com/bottles/swiftlint-0.42.0.big_sur.bottle.tar.gz",
72+
"sha256": "1a0540f0ff6cac2da0a51672db7963aef71cc58954c34791e9b01dafd63c5898"
1773
},
18-
"high_sierra": {
19-
"url": "https://homebrew.bintray.com/bottles/fastlane-2.161.0.high_sierra.bottle.tar.gz",
20-
"sha256": "39bdfc80e896775b45617f1b7bb9f209cad91b91a5bb0a3cbeae0ed0080f45cc"
74+
"catalina": {
75+
"url": "https://homebrew.bintray.com/bottles/swiftlint-0.42.0.catalina.bottle.tar.gz",
76+
"sha256": "e9023ed754eb8cb78a9f2b469a90875ca42a7afffd3e96f8142252e81d889793"
2177
}
2278
}
2379
}
@@ -27,12 +83,20 @@
2783
"system": {
2884
"macos": {
2985
"catalina": {
30-
"HOMEBREW_VERSION": "2.5.2",
86+
"HOMEBREW_VERSION": "2.7.7",
3187
"HOMEBREW_PREFIX": "/usr/local",
32-
"Homebrew/homebrew-core": "3cc2bc2196267adcdaa2e256cd8af6c30207c049",
88+
"Homebrew/homebrew-core": "7c08a98e781448b9a80c9db887c5cb66839f12c8",
3389
"CLT": "1103.0.32.62",
34-
"Xcode": "11.7",
35-
"macOS": "10.15.6"
90+
"Xcode": "12.4",
91+
"macOS": "10.15.7"
92+
},
93+
"big_sur": {
94+
"HOMEBREW_VERSION": "3.0.1",
95+
"HOMEBREW_PREFIX": "/usr/local",
96+
"Homebrew/homebrew-core": "703451fe242d959d029d867909ffd92f0d522ffd",
97+
"CLT": "12.4.0.0.1.1610135815",
98+
"Xcode": "12.4",
99+
"macOS": "11.2.1"
36100
}
37101
}
38102
}

0 commit comments

Comments
 (0)