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
4 changes: 4 additions & 0 deletions Aardvark.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
3DFD7B5226F551C8000CE4B8 /* FileSystemAttachmentGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DFD7B5026F5519D000CE4B8 /* FileSystemAttachmentGeneratorTests.swift */; };
4551A2D91BDAD10E00F216D0 /* Aardvark.h in Headers */ = {isa = PBXBuildFile; fileRef = EAD1442419E073FB0065A1FF /* Aardvark.h */; settings = {ATTRIBUTES = (Public, ); }; };
4551A30A1BDAF93A00F216D0 /* ARKScreenshotLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4551A3071BDAF93A00F216D0 /* ARKScreenshotLogging.h */; settings = {ATTRIBUTES = (Public, ); }; };
E12EBD572EA0FD5000402892 /* NSFileHandle+ARKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = E12EBD562EA0FD5000402892 /* NSFileHandle+ARKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
EA3C1D961D934A210048C4CD /* CoreAardvark.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF2FEA01D47172400931663 /* CoreAardvark.framework */; };
EA3C1DA51D934A260048C4CD /* Aardvark.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4551A2C21BDACF9000F216D0 /* Aardvark.framework */; };
EA3C1DAC1D934B1D0048C4CD /* ARKDataArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D04D47EC1AB8A0BA00A342E9 /* ARKDataArchiveTests.m */; };
Expand Down Expand Up @@ -192,6 +193,7 @@
BDB50C1E2B2B72F500C134FC /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = Aardvark/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
D04D47EC1AB8A0BA00A342E9 /* ARKDataArchiveTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARKDataArchiveTests.m; sourceTree = "<group>"; };
D04D48041AB9196B00A342E9 /* ARKFileHandleAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARKFileHandleAdditionsTests.m; sourceTree = "<group>"; };
E12EBD562EA0FD5000402892 /* NSFileHandle+ARKAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFileHandle+ARKAdditions.h"; sourceTree = "<group>"; };
EA09D3C41A2E6D2F004C1125 /* ARKDefineTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARKDefineTests.m; sourceTree = "<group>"; };
EA3C1D911D934A210048C4CD /* CoreAardvarkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreAardvarkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
EA3C1DA01D934A260048C4CD /* AardvarkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AardvarkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -410,6 +412,7 @@
25BD1B3C2CB073C00059ACDA /* include */ = {
isa = PBXGroup;
children = (
E12EBD562EA0FD5000402892 /* NSFileHandle+ARKAdditions.h */,
EA98B8B31D4BE80F00B3A390 /* ARKLogTypes.h */,
EA98B8C71D4BE83300B3A390 /* ARKDataArchive.h */,
EA98B9551D4BF88600B3A390 /* ARKLogging.h */,
Expand Down Expand Up @@ -701,6 +704,7 @@
EA98B8DC1D4BE83300B3A390 /* ARKLogDistributor_Testing.h in Headers */,
3D850497215EF21100B3957C /* ARKExceptionLogging_Testing.h in Headers */,
EA98B8E61D4BE83300B3A390 /* ARKLogObserver.h in Headers */,
E12EBD572EA0FD5000402892 /* NSFileHandle+ARKAdditions.h in Headers */,
EA98B8EA1D4BE83300B3A390 /* ARKLogStore.h in Headers */,
EA98B8B91D4BE80F00B3A390 /* ARKLogTypes.h in Headers */,
EA98B8BF1D4BE82100B3A390 /* NSFileHandle+ARKAdditions.h in Headers */,
Expand Down
2 changes: 1 addition & 1 deletion CoreAardvark.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'CoreAardvark'
s.version = '4.0.0'
s.version = '4.0.1'
s.license = 'Apache License, Version 2.0'
s.summary = 'Aardvark is a library that makes it dead simple to create actionable bug reports. Usable by extensions.'
s.homepage = 'https://github.com/square/Aardvark'
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreAardvark/Logging/ARKDataArchive.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#import "ARKDataArchive_Testing.h"

#import "AardvarkDefines.h"
#import "NSFileHandle+ARKAdditions.h"
#import "../private/NSFileHandle+ARKAdditions.h"


NSUInteger const ARKMaximumChunkSizeForTrimOperation = (1024 * 1024);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// limitations under the License.
//

#import "NSFileHandle+ARKAdditions.h"
#import "../private/NSFileHandle+ARKAdditions.h"

#import "AardvarkDefines.h"

Expand Down Expand Up @@ -60,8 +60,12 @@ + (void)ARK_setPreventWritesAfterException:(BOOL)preventWritesAfterException
}
}

@end

#pragma mark -

@implementation NSFileHandle (ARKAdditions_Private)

- (void)ARK_writeDataBlock:(NSData *)dataBlock;
{
bool preventWritesAfterException = atomic_load(&__ARKPreventsWritesAfterException);
Expand Down
2 changes: 2 additions & 0 deletions Sources/CoreAardvark/include/CoreAardvark.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ FOUNDATION_EXPORT const unsigned char CoreAardvark_iOSVersionString[];
#import "ARKLogStore.h"
#import "ARKLogTypes.h"
#import "ARKExceptionLogging.h"
#import "NSFileHandle+ARKAdditions.h"
#else
#import <CoreAardvark/AardvarkDefines.h>
#import <CoreAardvark/ARKDataArchive.h>
Expand All @@ -47,4 +48,5 @@ FOUNDATION_EXPORT const unsigned char CoreAardvark_iOSVersionString[];
#import <CoreAardvark/ARKLogStore.h>
#import <CoreAardvark/ARKLogTypes.h>
#import <CoreAardvark/ARKExceptionLogging.h>
#import <CoreAardvark/NSFileHandle+ARKAdditions.h>
#endif
26 changes: 26 additions & 0 deletions Sources/CoreAardvark/include/NSFileHandle+ARKAdditions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// Copyright 2015 Square, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

@import Foundation;


@interface NSFileHandle (ARKAdditions)

/// Should Aardvark stop logging after catching a `NSException`?
/// Default: `NO` to avoid changing API behavior within the same major (as in major.minor.patch versioning) version
+ (void)ARK_setPreventWritesAfterException:(BOOL)preventWritesAfterException;

@end
7 changes: 1 addition & 6 deletions Sources/CoreAardvark/private/NSFileHandle+ARKAdditions.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@

@import Foundation;


extern NSUInteger const ARKInvalidDataBlockLength;


@interface NSFileHandle (ARKAdditions)

/// Should Aardvark stop logging after catching a `NSException`?
/// Default: `NO` to avoid changing API behavior within the same major (as in major.minor.patch versioning) version
+ (void)ARK_setPreventWritesAfterException:(BOOL)preventWritesAfterException;
@interface NSFileHandle (ARKAdditions_Private)

/// Writes the length of dataBlock, and then its contents. Note: this writes (or over-writes) at the current offsetInFile.
- (void)ARK_writeDataBlock:(nonnull NSData *)dataBlock;
Expand Down
3 changes: 2 additions & 1 deletion Sources/CoreAardvarkTests/ARKFileHandleAdditionsTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

@import XCTest;

#import "NSFileHandle+ARKAdditions.h"
#import "../CoreAardvark/private/NSFileHandle+ARKAdditions.h"
#import "../CoreAardvark/include/NSFileHandle+ARKAdditions.h"

#import "NSURL+ARKAdditions.h"

Expand Down