Merge pull request #2379 from microsoft/develop

Merge develop to master for release 4.4.0

AppCenter.podspec

@@ -1,6 +1,7 @@
 Pod::Spec.new do |s|
+  s.cocoapods_version = '>= 1.10'
   s.name              = 'AppCenter'
-  s.version           = '4.3.0'
+  s.version           = '4.4.0'
 
   s.summary           = 'Visual Studio App Center is your continuous integration, delivery and learning solution for iOS and macOS apps.'
   s.description       = <<-DESC

AppCenter/AppCenter/AppCenter.h

@@ -11,7 +11,6 @@
 #import <AppCenter/MSACChannelProtocol.h>
 #import <AppCenter/MSACConstants+Flags.h>
 #import <AppCenter/MSACConstants.h>
-#import <AppCenter/MSACCustomProperties.h>
 #import <AppCenter/MSACDevice.h>
 #import <AppCenter/MSACEnable.h>
 #import <AppCenter/MSACLog.h>
@@ -30,7 +29,6 @@
 #import "MSACChannelProtocol.h"
 #import "MSACConstants+Flags.h"
 #import "MSACConstants.h"
-#import "MSACCustomProperties.h"
 #import "MSACDevice.h"
 #import "MSACEnable.h"
 #import "MSACLog.h"

AppCenter/AppCenter/Internals/Channel/MSACChannelUnitDefault.m

@@ -49,6 +49,7 @@ - (instancetype)initWithIngestion:(nullable id<MSACIngestionProtocol>)ingestion
     _storage = storage;
     _configuration = configuration;
     _logsDispatchQueue = logsDispatchQueue;
+    _itemsCount = [_storage countLogs];
   }
   return self;
 }

AppCenter/AppCenter/Internals/Context/Device/MSACDeviceTracker.m

@@ -155,7 +155,7 @@ - (MSACDevice *)device {
 - (MSACDevice *)updatedDevice {
   @synchronized(self) {
     MSACDevice *newDevice = [MSACDevice new];
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
     CTTelephonyNetworkInfo *telephonyNetworkInfo = [CTTelephonyNetworkInfo new];
     CTCarrier *carrier;
 
@@ -198,7 +198,7 @@ - (MSACDevice *)updatedDevice {
     newDevice.timeZoneOffset = [self timeZoneOffset:[NSTimeZone localTimeZone]];
     newDevice.screenSize = [self screenSize];
     newDevice.appVersion = [self appVersion:MSAC_APP_MAIN_BUNDLE];
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
     newDevice.carrierCountry = [self carrierCountry:carrier] ?: overriddenCountryCode;
     newDevice.carrierName = [self carrierName:carrier];
 #else
@@ -414,7 +414,7 @@ - (NSString *)screenSize {
 #endif
 }
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 - (NSString *)carrierName:(CTCarrier *)carrier {
   return [self isValidCarrierName:carrier.carrierName] ? carrier.carrierName : nil;
 }

AppCenter/AppCenter/Internals/Context/Device/MSACDeviceTrackerPrivate.h

@@ -4,7 +4,7 @@
 #ifndef MSAC_DEVICE_TRACKER_PRIVATE_H
 #define MSAC_DEVICE_TRACKER_PRIVATE_H
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 #import <CoreTelephony/CTCarrier.h>
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #endif
@@ -114,7 +114,7 @@ static NSString *const kMSACPastDevicesKey = @"PastDevices";
  */
 - (NSString *)screenSize;
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 /**
  * Get the network carrier name.
  *

AppCenter/AppCenter/Internals/HttpClient/MSACHttpCall.m

@@ -8,16 +8,17 @@
 
 @implementation MSACHttpCall
 
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
 - (instancetype)initWithUrl:(NSURL *)url
                      method:(NSString *)method
                     headers:(NSDictionary<NSString *, NSString *> *)headers
                        data:(NSData *)data
              retryIntervals:(NSArray *)retryIntervals
          compressionEnabled:(BOOL)compressionEnabled
           completionHandler:(MSACHttpRequestCompletionHandler)completionHandler
-#if defined(__IPHONE_15_0)
-NS_SWIFT_DISABLE_ASYNC
-#endif
 {
   if ((self = [super init])) {
     _url = url;
@@ -43,6 +44,7 @@ - (instancetype)initWithUrl:(NSURL *)url
   }
   return self;
 }
+#pragma clang diagnostic pop
 
 - (BOOL)hasReachedMaxRetries {
   @synchronized(self) {

AppCenter/AppCenter/Internals/HttpClient/MSACHttpClient.m

@@ -11,8 +11,6 @@
 #import "MSACHttpUtil.h"
 #import "MSAC_Reachability.h"
 
-#define DEFAULT_RETRY_INTERVALS @[ @10, @(5 * 60), @(20 * 60) ]
-
 @implementation MSACHttpClient
 
 @synthesize delegate = _delegate;

AppCenter/AppCenter/Internals/HttpClient/Util/MSACHttpUtil.h

@@ -3,6 +3,8 @@
 
 #import <Foundation/Foundation.h>
 
+#define DEFAULT_RETRY_INTERVALS @[ @10, @(5 * 60), @(20 * 60) ]
+
 static short const kMSACMaxCharactersDisplayedForAppSecret = 8;
 static NSString *const kMSACHidingStringForAppSecret = @"*";
 

AppCenter/AppCenter/Internals/Ingestion/MSACAppCenterIngestion.m

@@ -30,10 +30,11 @@ - (BOOL)isReadyToSend {
   return self.appSecret != nil;
 }
 
-- (void)sendAsync:(NSObject *)data completionHandler:(MSACSendAsyncCompletionHandler)handler
-#if defined(__IPHONE_15_0)
-NS_SWIFT_DISABLE_ASYNC
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
 #endif
+- (void)sendAsync:(NSObject *)data completionHandler:(MSACSendAsyncCompletionHandler)handler
 {
   MSACLogContainer *container = (MSACLogContainer *)data;
   NSString *batchId = container.batchId;
@@ -62,6 +63,7 @@ - (void)sendAsync:(NSObject *)data completionHandler:(MSACSendAsyncCompletionHan
         handler(batchId, response, responseBody, error);
       }];
 }
+#pragma clang diagnostic pop
 
 - (NSDictionary *)getHeadersWithData:(nullable NSObject *__unused)data eTag:(nullable NSString *__unused)eTag {
   NSMutableDictionary *httpHeaders = [self.httpHeaders mutableCopy];

AppCenter/AppCenter/Internals/Ingestion/MSACHttpIngestion.m

@@ -30,7 +30,7 @@ - (id)initWithHttpClient:(id<MSACHttpClientProtocol>)httpClient
                           apiPath:apiPath
                           headers:headers
                      queryStrings:queryStrings
-                   retryIntervals:@[ @(10), @(5 * 60), @(20 * 60) ]];
+                   retryIntervals:DEFAULT_RETRY_INTERVALS];
 }
 
 - (id)initWithHttpClient:(id<MSACHttpClientProtocol>)httpClient

AppCenter/AppCenter/Internals/Ingestion/MSACOneCollectorIngestion.m

@@ -25,7 +25,7 @@ - (id)initWithHttpClient:(id<MSACHttpClientProtocol>)httpClient baseUrl:(NSStrin
                                  [NSString stringWithFormat:kMSACOneCollectorClientVersionFormat, [MSACUtility sdkVersion]]
                            }
                       queryStrings:nil
-                    retryIntervals:@[ @(10), @(5 * 60), @(20 * 60) ]
+                    retryIntervals:DEFAULT_RETRY_INTERVALS
             maxNumberOfConnections:2];
   return self;
 }

AppCenter/AppCenter/Internals/Model/MSACStartServiceLog.h

@@ -9,8 +9,13 @@
 @interface MSACStartServiceLog : MSACAbstractLog <MSACNoAutoAssignSessionIdLog>
 
 /**
- * Services which started with SDK
+ * Services which started with SDK.
  */
 @property(nonatomic) NSArray<NSString *> *services;
 
+/**
+ * OneCollector usage status.
+ */
+@property(nonatomic) BOOL isOneCollectorEnabled;
+
 @end

AppCenter/AppCenter/Internals/Model/MSACStartServiceLog.m

@@ -5,10 +5,12 @@
 
 static NSString *const kMSACStartService = @"startService";
 static NSString *const kMSACServices = @"services";
+static NSString *const kMSACIsOneCollectorEnabled = @"isOneCollectorEnabled";
 
 @implementation MSACStartServiceLog
 
 @synthesize services = _services;
+@synthesize isOneCollectorEnabled = _isOneCollectorEnabled;
 
 - (instancetype)init {
   if ((self = [super init])) {
@@ -31,6 +33,7 @@ - (NSMutableDictionary *)serializeToDictionary {
   NSMutableDictionary *dict = [super serializeToDictionary];
   if (self.services) {
     dict[kMSACServices] = self.services;
+    dict[kMSACIsOneCollectorEnabled] = @(self.isOneCollectorEnabled);
   }
   return dict;
 }
@@ -40,13 +43,15 @@ - (NSMutableDictionary *)serializeToDictionary {
 - (instancetype)initWithCoder:(NSCoder *)coder {
   if ((self = [super initWithCoder:coder])) {
     self.services = [coder decodeObjectForKey:kMSACServices];
+    self.isOneCollectorEnabled = [coder decodeBoolForKey:kMSACIsOneCollectorEnabled];
   }
   return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)coder {
   [super encodeWithCoder:coder];
   [coder encodeObject:self.services forKey:kMSACServices];
+  [coder encodeBool:self.isOneCollectorEnabled forKey:kMSACIsOneCollectorEnabled];
 }
 
 @end