Skip to content

Commit

Permalink
Patches for 5.3.2 from main
Browse files Browse the repository at this point in the history
f501ffcec032606af42860b01f42bae0664c49af
  • Loading branch information
GLinnik21 committed May 8, 2024
1 parent 06cde44 commit d497d7e
Show file tree
Hide file tree
Showing 33 changed files with 128 additions and 68 deletions.
6 changes: 3 additions & 3 deletions AppMetricaAdSupport.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaAdSupport"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Offers seamless access to advertising identifiers, leveraging AdSupport and AppTrackingTransparency for enhanced ad tracking and analytics."

s.homepage = 'https://appmetrica.io'
Expand All @@ -15,8 +15,8 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation', 'AdSupport', 'AppTrackingTransparency'

s.dependency 'AppMetricaCore', '= 5.3.1'
s.dependency 'AppMetricaCoreExtension', '= 5.3.1'
s.dependency 'AppMetricaCore', '= 5.3.2'
s.dependency 'AppMetricaCoreExtension', '= 5.3.2'

s.header_dir = s.name
s.source_files = "#{s.name}/Sources/**/*.{h,m}"
Expand Down
10 changes: 5 additions & 5 deletions AppMetricaAnalytics.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaAnalytics"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Comprehensive suite for mobile analytics, including tracking, web interactions, crash reporting, and advertising functionalities."

s.homepage = 'https://appmetrica.io'
Expand All @@ -13,8 +13,8 @@ Pod::Spec.new do |s|

s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }

s.dependency 'AppMetricaCore', '= 5.3.1'
s.dependency 'AppMetricaAdSupport', '= 5.3.1'
s.dependency 'AppMetricaWebKit', '= 5.3.1'
s.dependency 'AppMetricaCrashes', '= 5.3.1'
s.dependency 'AppMetricaCore', '= 5.3.2'
s.dependency 'AppMetricaAdSupport', '= 5.3.2'
s.dependency 'AppMetricaWebKit', '= 5.3.2'
s.dependency 'AppMetricaCrashes', '= 5.3.2'
end
22 changes: 11 additions & 11 deletions AppMetricaCore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaCore"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Powerful and flexible module offering a wide range of tracking and analytics tools for your application"

s.homepage = 'https://appmetrica.io'
Expand All @@ -16,16 +16,16 @@ Pod::Spec.new do |s|
s.frameworks = 'UIKit', 'Foundation', 'CoreLocation', 'CoreGraphics', 'SystemConfiguration'
s.libraries = 'z', 'sqlite3', 'c++'

s.dependency 'AppMetricaLog', '= 5.3.1'
s.dependency 'AppMetricaNetwork', '= 5.3.1'
s.dependency 'AppMetricaCoreUtils', '= 5.3.1'
s.dependency 'AppMetricaHostState', '= 5.3.1'
s.dependency 'AppMetricaProtobufUtils', '= 5.3.1'
s.dependency 'AppMetricaPlatform', '= 5.3.1'
s.dependency 'AppMetricaStorageUtils', '= 5.3.1'
s.dependency 'AppMetricaEncodingUtils', '= 5.3.1'
s.dependency 'AppMetricaProtobuf', '= 5.3.1'
s.dependency 'AppMetricaFMDB', '= 5.3.1'
s.dependency 'AppMetricaLog', '= 5.3.2'
s.dependency 'AppMetricaNetwork', '= 5.3.2'
s.dependency 'AppMetricaCoreUtils', '= 5.3.2'
s.dependency 'AppMetricaHostState', '= 5.3.2'
s.dependency 'AppMetricaProtobufUtils', '= 5.3.2'
s.dependency 'AppMetricaPlatform', '= 5.3.2'
s.dependency 'AppMetricaStorageUtils', '= 5.3.2'
s.dependency 'AppMetricaEncodingUtils', '= 5.3.2'
s.dependency 'AppMetricaProtobuf', '= 5.3.2'
s.dependency 'AppMetricaFMDB', '= 5.3.2'

s.header_dir = s.name
s.source_files = [
Expand Down
6 changes: 3 additions & 3 deletions AppMetricaCoreExtension.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaCoreExtension"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Extended AppMetrica Core APIs. Not for public use."

s.homepage = 'https://appmetrica.io'
Expand All @@ -15,8 +15,8 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation'

s.dependency 'AppMetricaCore', '= 5.3.1'
s.dependency 'AppMetricaStorageUtils', '= 5.3.1'
s.dependency 'AppMetricaCore', '= 5.3.2'
s.dependency 'AppMetricaStorageUtils', '= 5.3.2'

s.header_dir = s.name
s.source_files = "#{s.name}/Sources/**/*.{h,m}"
Expand Down
4 changes: 2 additions & 2 deletions AppMetricaCoreUtils.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaCoreUtils"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Provides a comprehensive set of diverse utilities"

s.homepage = 'https://appmetrica.io'
Expand All @@ -15,7 +15,7 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation'

s.dependency 'AppMetricaLog', '= 5.3.1'
s.dependency 'AppMetricaLog', '= 5.3.2'

s.header_dir = s.name
s.source_files = "#{s.name}/Sources/**/*.{h,m}"
Expand Down
20 changes: 10 additions & 10 deletions AppMetricaCrashes.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaCrashes"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Provides essential utilities for efficient crash and error handling and reporting"

s.homepage = 'https://appmetrica.io'
Expand All @@ -15,15 +15,15 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation'

s.dependency 'AppMetricaCore', '= 5.3.1'
s.dependency 'AppMetricaCoreExtension', '= 5.3.1'
s.dependency 'AppMetricaCoreUtils', '= 5.3.1'
s.dependency 'AppMetricaHostState', '= 5.3.1'
s.dependency 'AppMetricaProtobufUtils', '= 5.3.1'
s.dependency 'AppMetricaLog', '= 5.3.1'
s.dependency 'AppMetricaPlatform', '= 5.3.1'
s.dependency 'AppMetricaStorageUtils', '= 5.3.1'
s.dependency 'AppMetricaEncodingUtils', '= 5.3.1'
s.dependency 'AppMetricaCore', '= 5.3.2'
s.dependency 'AppMetricaCoreExtension', '= 5.3.2'
s.dependency 'AppMetricaCoreUtils', '= 5.3.2'
s.dependency 'AppMetricaHostState', '= 5.3.2'
s.dependency 'AppMetricaProtobufUtils', '= 5.3.2'
s.dependency 'AppMetricaLog', '= 5.3.2'
s.dependency 'AppMetricaPlatform', '= 5.3.2'
s.dependency 'AppMetricaStorageUtils', '= 5.3.2'
s.dependency 'AppMetricaEncodingUtils', '= 5.3.2'

s.dependency 'KSCrash/Recording', '~> 1.17.0'
s.dependency 'KSCrash/Recording/Tools'
Expand Down
8 changes: 4 additions & 4 deletions AppMetricaEncodingUtils.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaEncodingUtils"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "Provides a set of encoding and crypto utilities"

s.homepage = 'https://appmetrica.io'
Expand All @@ -15,9 +15,9 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation'

s.dependency 'AppMetricaLog', '= 5.3.1'
s.dependency 'AppMetricaPlatform', '= 5.3.1'
s.dependency 'AppMetricaCoreUtils', '= 5.3.1'
s.dependency 'AppMetricaLog', '= 5.3.2'
s.dependency 'AppMetricaPlatform', '= 5.3.2'
s.dependency 'AppMetricaCoreUtils', '= 5.3.2'

s.header_dir = s.name
s.source_files = "#{s.name}/Sources/**/*.{h,m}"
Expand Down
2 changes: 1 addition & 1 deletion AppMetricaFMDB.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaFMDB"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "AppMetrica's adaptation of the original FMDB, enhancing SQLite database interaction for iOS analytics and tracking."

s.homepage = 'https://appmetrica.io'
Expand Down
6 changes: 3 additions & 3 deletions AppMetricaHostState.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaHostState"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "AppMetricaHostState facilitates accessing the state of the host application for other modules"

s.homepage = 'https://appmetrica.io'
Expand All @@ -15,8 +15,8 @@ Pod::Spec.new do |s|

s.frameworks = 'Foundation', 'UIKit'

s.dependency 'AppMetricaLog', '= 5.3.1'
s.dependency 'AppMetricaCoreUtils', '= 5.3.1'
s.dependency 'AppMetricaLog', '= 5.3.2'
s.dependency 'AppMetricaCoreUtils', '= 5.3.2'

s.header_dir = s.name
s.source_files = "#{s.name}/Sources/**/*.{h,m}"
Expand Down
2 changes: 1 addition & 1 deletion AppMetricaLog.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AppMetricaLog"
s.version = '5.3.1'
s.version = '5.3.2'
s.summary = "AppMetricaLog offers modules the capability to log messages at various levels"

s.homepage = 'https://appmetrica.io'
Expand Down
4 changes: 4 additions & 0 deletions AppMetricaLog/Sources/AMAFileLogMiddleware.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@

#import "AMALogMiddleware.h"

#ifdef AMA_ENABLE_FILE_LOG

@interface AMAFileLogMiddleware : NSObject <AMALogMiddleware>

- (instancetype)initWithFileHandle:(NSFileHandle *)fileHandle;

@end

#endif // AMA_ENABLE_FILE_LOG
14 changes: 13 additions & 1 deletion AppMetricaLog/Sources/AMAFileLogMiddleware.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

#import "AMAFileLogMiddleware.h"

#ifdef AMA_ENABLE_FILE_LOG

@interface AMAFileLogMiddleware ()

@property (nonatomic, strong) NSFileHandle *fileHandle;
Expand Down Expand Up @@ -31,7 +33,17 @@ - (void)logMessage:(NSString *)message level:(AMALogLevel)level

NSString *formattedMessage = [NSString stringWithFormat:@"%@%@", message, @"\n"];
NSData *messageData = [formattedMessage dataUsingEncoding:NSUTF8StringEncoding];
[self.fileHandle writeData:messageData];
@try {
// this may throw NSFileHandleOperationException if no space left
// https://nda.ya.ru/t/syha-Zzn75nbP2
[self.fileHandle writeData:messageData];
}
@catch (NSException *exception) {
// do nothing
// TODO: handle "no space left"
}
}

@end

#endif // AMA_ENABLE_FILE_LOG
8 changes: 8 additions & 0 deletions AppMetricaLog/Sources/AMALogConfigurator.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
static const AMALogLevel AMALogControllerDefaultLogLevelMask = AMALogLevelError | AMALogLevelNotify;
static const AMALogLevel AMALogControllerEnabledLogLevelMask = AMALogLevelInfo | AMALogLevelWarning | AMALogLevelError | AMALogLevelNotify;

#ifdef AMA_ENABLE_FILE_LOG
static NSString *const AMALogControllerLogsDirectory = @"io.appmetrica.logs";
static NSString *const AMALogControllerLogPrefix = @"io_appmetrica";

static const NSUInteger AMALogControllerMaxAllowedLogFilesCount = 20;
#endif

@interface AMALogConfigurator ()

Expand Down Expand Up @@ -143,8 +145,10 @@ - (void)setupLogWithChannel:(AMALogChannel)channel
if (shouldAddTTYLog) {
[outputs addObject:[self ttyOutputWithChannel:channel]];
}
#ifdef AMA_ENABLE_FILE_LOG
AMALogOutput *output = [self fileOutputWithChannel:channel];
[outputs addObject:output];
#endif // AMA_ENABLE_FILE_LOG

for (AMALogOutput *output in outputs) {
[self.log addOutput:output];
Expand Down Expand Up @@ -185,6 +189,7 @@ - (AMALogOutput *)ttyOutputWithChannel:(AMALogChannel)channel
return [self outputForChannel:channel format:format middleware:self.ttyMiddleware];
}

#ifdef AMA_ENABLE_FILE_LOG
- (AMALogOutput *)fileOutputWithChannel:(AMALogChannel)channel
{
NSArray *fileFormat = @[
Expand All @@ -195,6 +200,7 @@ - (AMALogOutput *)fileOutputWithChannel:(AMALogChannel)channel
];
return [self outputForChannel:channel format:fileFormat middleware:self.fileMiddleware];
}
#endif // AMA_ENABLE_FILE_LOG

#pragma mark - Middleware

Expand Down Expand Up @@ -237,6 +243,7 @@ - (AMALogOutput *)fileOutputWithChannel:(AMALogChannel)channel
return middleware;
}

#ifdef AMA_ENABLE_FILE_LOG
- (id<AMALogMiddleware>)fileMiddleware
{
@synchronized (self) {
Expand Down Expand Up @@ -270,5 +277,6 @@ - (NSString *)logsDirectory

return _logsDirectory;
}
#endif // AMA_ENABLE_FILE_LOG

@end
4 changes: 4 additions & 0 deletions AppMetricaLog/Sources/AMALogFileFactory.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

#import <Foundation/Foundation.h>

#ifdef AMA_ENABLE_FILE_LOG

@class AMALogFile;

@interface AMALogFileFactory : NSObject
Expand All @@ -11,3 +13,5 @@
- (AMALogFile *)logFileFromFilePath:(NSString *)filePath;

@end

#endif // AMA_ENABLE_FILE_LOG
3 changes: 3 additions & 0 deletions AppMetricaLog/Sources/AMALogFileFactory.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#import "AMALogFileFactory.h"
#import "AMALogFile.h"

#ifdef AMA_ENABLE_FILE_LOG
static NSString *const kAMALogFileSerialNumberSeparator = @"-";
static NSString *const kAMALogFileExtension = @"log";

Expand Down Expand Up @@ -70,3 +71,5 @@ - (AMALogFile *)logFileFromFilePath:(NSString *)filePath


@end

#endif // AMA_ENABLE_FILE_LOG
3 changes: 3 additions & 0 deletions AppMetricaLog/Sources/AMALogFileManager.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

#import <Foundation/Foundation.h>

#ifdef AMA_ENABLE_FILE_LOG
@class AMALogFile;
@class AMALogFileFactory;

Expand All @@ -19,3 +20,5 @@
- (NSFileHandle *)fileHandleForLogFile:(AMALogFile *)logFile;

@end

#endif //AMA_ENABLE_FILE_LOG
3 changes: 3 additions & 0 deletions AppMetricaLog/Sources/AMALogFileManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#import "AMALogFile.h"
#import "AMALogFileFactory.h"

#ifdef AMA_ENABLE_FILE_LOG
@interface AMALogFileManager ()

@property (nonatomic, copy) NSString *logsDirectoryPath;
Expand Down Expand Up @@ -127,3 +128,5 @@ - (NSString *)filePathForLogFile:(AMALogFile *)logFile
}

@end

#endif //AMA_ENABLE_FILE_LOG
4 changes: 4 additions & 0 deletions AppMetricaLog/Sources/AMALogFileRotation.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

#import <Foundation/Foundation.h>

#ifdef AMA_ENABLE_FILE_LOG

@interface AMALogFileRotation : NSObject

@property (nonatomic, copy, readonly) NSArray *filesToRemove;
Expand All @@ -13,3 +15,5 @@
nextSerialNumber:(NSNumber *)serialNumber;

@end

#endif //AMA_ENABLE_FILE_LOG
4 changes: 4 additions & 0 deletions AppMetricaLog/Sources/AMALogFileRotation.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#import "AMALogFileRotation.h"
#import "AMALogFile.h"

#ifdef AMA_ENABLE_FILE_LOG

@interface AMALogFileRotation ()

@property (nonatomic, copy, readwrite) NSArray *filesToRemove;
Expand Down Expand Up @@ -73,3 +75,5 @@ - (NSNumber *)nextSerialNumberForFiles:(NSArray *)logFiles
}

@end

#endif //AMA_ENABLE_FILE_LOG
3 changes: 3 additions & 0 deletions AppMetricaLog/Tests/AMAFileLogMiddlewareTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#import <XCTest/XCTest.h>
#import "AMAFileLogMiddleware.h"

#ifdef AMA_ENABLE_FILE_LOG
static const NSUInteger maxBufferLength = 1024;

@interface AMAFileLogMiddlewareTests : XCTestCase {
Expand Down Expand Up @@ -100,3 +101,5 @@ - (void)testConformance
}

@end

#endif //AMA_ENABLE_FILE_LOG
Loading

0 comments on commit d497d7e

Please sign in to comment.