Переглянути джерело

Migrate Hockey to AppCenter

This bumps tvOS minimum deployment target to 11.0
Soomin Lee 5 роки тому
батько
коміт
fdaf9d273b
5 змінених файлів з 33 додано та 32 видалено
  1. 8 6
      Apple-TV/AppleTVAppDelegate.m
  2. 2 3
      Podfile
  3. 12 9
      Podfile.lock
  4. 8 7
      Sources/VLCAppDelegate.m
  5. 3 7
      VLC.xcodeproj/project.pbxproj

+ 8 - 6
Apple-TV/AppleTVAppDelegate.m

@@ -16,7 +16,10 @@
 #import "VLCCloudServicesTVViewController.h"
 #import "VLCHTTPUploaderController.h"
 #import "VLCRemotePlaybackViewController.h"
-#import <HockeySDK/HockeySDK.h>
+
+#import <AppCenter/AppCenter.h>
+#import <AppCenterAnalytics/AppCenterAnalytics.h>
+#import <AppCenterCrashes/AppCenterCrashes.h>
 
 @interface AppleTVAppDelegate ()
 {
@@ -61,11 +64,10 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    BITHockeyManager *hockeyManager = [BITHockeyManager sharedHockeyManager];
-    [hockeyManager configureWithIdentifier:@"f8697706993b44bba1c03cb7016cc325"];
-
-    // Configure the SDK in here only!
-    [hockeyManager startManager];
+    [MSAppCenter start:@"f8697706-993b-44bb-a1c0-3cb7016cc325" withServices:@[
+                                                                              [MSAnalytics class],
+                                                                              [MSCrashes class]
+                                                                              ]];
 
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     _localNetworkVC = [[VLCServerListTVViewController alloc] initWithNibName:nil bundle:nil];

+ 2 - 3
Podfile

@@ -10,6 +10,7 @@ def shared_pods
   pod 'VLC-WhiteRaccoon'
   pod 'ObjectiveDropboxOfficial', :git => 'git://github.com/Mikanbu/dropbox-sdk-obj-c.git' #update ios platform version
 
+  pod 'AppCenter', '2.3.0'
   # debug
   pod 'SwiftLint', '~> 0.25.0', :configurations => ['Debug']
 end
@@ -19,7 +20,6 @@ target 'VLC-iOS' do
   shared_pods
   pod 'OBSlider', '1.1.0'
   pod 'InAppSettingsKit', :git => 'git://github.com/fkuehne/InAppSettingsKit.git', :commit => '415ea6bb' #tvOS fix
-  pod 'HockeySDK', '~>5.1.4', :subspecs => ['CrashOnlyLib']
   pod 'PAPasscode', '~>1.0'
   pod 'GoogleAPIClientForREST/Drive'
   pod 'MobileVLCKit', '3.3.3'
@@ -38,12 +38,11 @@ target 'VLC-iOS' do
 end
 
 target 'VLC-tvOS' do
-  platform :tvos, '10.2'
+  platform :tvos, '11.0'
   shared_pods
   pod 'MetaDataFetcherKit', '~>0.3.1'
   pod "OROpenSubtitleDownloader", :git => 'https://github.com/orta/OROpenSubtitleDownloader.git', :commit => '0509eac2'
   pod 'GRKArrayDiff', '~> 2.1'
-  pod 'HockeySDK-tvOS', '~>5.1.0'
   pod 'TVVLCKit', '3.3.3'
 end
 

+ 12 - 9
Podfile.lock

@@ -16,6 +16,14 @@ PODS:
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
   - AppAuth (0.95.1)
+  - AppCenter (2.3.0):
+    - AppCenter/Analytics (= 2.3.0)
+    - AppCenter/Crashes (= 2.3.0)
+  - AppCenter/Analytics (2.3.0):
+    - AppCenter/Core
+  - AppCenter/Core (2.3.0)
+  - AppCenter/Crashes (2.3.0):
+    - AppCenter/Core
   - Base32 (1.1.2)
   - box-ios-sdk-v2 (1.2.3):
     - box-ios-sdk-v2/no-arc (= 1.2.3)
@@ -35,8 +43,6 @@ PODS:
   - GTMSessionFetcher/Core (1.2.2)
   - GTMSessionFetcher/Full (1.2.2):
     - GTMSessionFetcher/Core (= 1.2.2)
-  - HockeySDK-tvOS (5.1.0)
-  - HockeySDK/CrashOnlyLib (5.1.4)
   - InAppSettingsKit (2.2.2)
   - MediaLibraryKit-prod (2.6.9):
     - MobileVLCKit (~> 3.3.0)
@@ -82,13 +88,12 @@ PODS:
     - "NSData+Base64 (~> 1.0.0)"
 
 DEPENDENCIES:
+  - AppCenter (= 2.3.0)
   - box-ios-sdk-v2 (from `git://github.com/fkuehne/box-ios-sdk-v2.git`)
   - CocoaHTTPServer (from `git://github.com/fkuehne/CocoaHTTPServer.git`)
   - GoogleAPIClientForREST/Drive
   - GRKArrayDiff (~> 2.1)
   - GTMAppAuth (= 0.7.1)
-  - HockeySDK-tvOS (~> 5.1.0)
-  - HockeySDK/CrashOnlyLib (~> 5.1.4)
   - InAppSettingsKit (from `git://github.com/fkuehne/InAppSettingsKit.git`, commit `415ea6bb`)
   - MediaLibraryKit-prod
   - MetaDataFetcherKit (~> 0.3.1)
@@ -111,13 +116,12 @@ SPEC REPOS:
     - ADAL
     - AFNetworking
     - AppAuth
+    - AppCenter
     - Base32
     - GoogleAPIClientForREST
     - GRKArrayDiff
     - GTMAppAuth
     - GTMSessionFetcher
-    - HockeySDK
-    - HockeySDK-tvOS
     - MediaLibraryKit-prod
     - MetaDataFetcherKit
     - MobileVLCKit
@@ -169,6 +173,7 @@ SPEC CHECKSUMS:
   ADAL: f2eb2158b9bcd2c8416ff2d026c176b98ea6651f
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   AppAuth: cd34aac431e5c77c46ec7f03935377faa8c5808b
+  AppCenter: 9784d2fc998c9bd0b8fbaf4fb9ed69526d12ce1a
   Base32: 163c298644d184e89ca4e00a996bad6bf5166390
   box-ios-sdk-v2: 9423bd75373350ea40b92f3d2d6e89f81d96d634
   CocoaHTTPServer: 07df8b05a8bde406fe367d22c90a24a2fd4ca49f
@@ -176,8 +181,6 @@ SPEC CHECKSUMS:
   GRKArrayDiff: 7522e374edcc55c1731a219e428847164b04cfab
   GTMAppAuth: c5e41aaf039ac1ccc41543e6ea2ef7abd255ad41
   GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
-  HockeySDK: 15afe6bc0a5bfe3a531fd73dbf082095f37dac3b
-  HockeySDK-tvOS: 62e86233bfa7356c5ac5cd946816d1ca0e9033f6
   InAppSettingsKit: 76d5cfbaa3e3f8aa53fe3628516da7eb1aa6a5cb
   MediaLibraryKit-prod: 718b52b55cb40b479eeae29fb5cc0cfbbbce0191
   MetaDataFetcherKit: d1d61b061bf74268aaffb6bf08a70396672163df
@@ -197,6 +200,6 @@ SPEC CHECKSUMS:
   XKKeychain: 852ef663c56a7194c73d3c68e8d9d4f07b121d4f
   xmlrpc: 109bb21d15ed6d108b2c1ac5973a6a223a50f5f4
 
-PODFILE CHECKSUM: 464007ac15ea52e85e63c1906c16abe2b02ca506
+PODFILE CHECKSUM: 055f5a7e4806daeced97a578b88f99967d8abf06
 
 COCOAPODS: 1.7.5

+ 8 - 7
Sources/VLCAppDelegate.m

@@ -25,7 +25,6 @@
 #import "VLCPlaybackService.h"
 #import "VLCPlaybackService+MediaLibrary.h"
 #import <MediaPlayer/MediaPlayer.h>
-#import <HockeySDK/HockeySDK.h>
 #import "VLCActivityManager.h"
 #import "VLCDropboxConstants.h"
 #import "VLCPlaybackNavigationController.h"
@@ -34,6 +33,10 @@
 #import <OneDriveSDK.h>
 #import "VLCOneDriveConstants.h"
 
+#import <AppCenter/AppCenter.h>
+#import <AppCenterAnalytics/AppCenterAnalytics.h>
+#import <AppCenterCrashes/AppCenterCrashes.h>
+
 #define BETA_DISTRIBUTION 1
 
 @interface VLCAppDelegate ()
@@ -96,12 +99,10 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    BITHockeyManager *hockeyManager = [BITHockeyManager sharedHockeyManager];
-    [hockeyManager configureWithBetaIdentifier:@"0114ca8e265244ce588d2ebd035c3577"
-                                liveIdentifier:@"c95f4227dff96c61f8b3a46a25edc584"
-                                      delegate:nil];
-    [hockeyManager startManager];
-
+    [MSAppCenter start:@"0114ca8e-2652-44ce-588d-2ebd035c3577" withServices:@[
+                                                                              [MSAnalytics class],
+                                                                              [MSCrashes class]
+                                                                              ]];
     // Configure Dropbox
     [DBClientsManager setupWithAppKey:kVLCDropboxAppKey];
 

+ 3 - 7
VLC.xcodeproj/project.pbxproj

@@ -2638,12 +2638,10 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-VLC-tvOS/Pods-VLC-tvOS-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/XKKeychain-tvOS/XKKeychain.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/HockeySDK-tvOS/HockeySDKResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XKKeychain.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HockeySDKResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -2744,7 +2742,6 @@
 				"${PODS_ROOT}/Target Support Files/Pods-VLC-iOS/Pods-VLC-iOS-resources.sh",
 				"${PODS_ROOT}/ADAL/ADALiOS/ADALiOS/ADAL_iPad_Storyboard.storyboard",
 				"${PODS_ROOT}/ADAL/ADALiOS/ADALiOS/ADAL_iPhone_Storyboard.storyboard",
-				"${PODS_CONFIGURATION_BUILD_DIR}/HockeySDK/HockeySDKResources.bundle",
 				"${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/Base.lproj",
 				"${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/de.lproj",
 				"${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/el.lproj",
@@ -2768,7 +2765,6 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ADAL_iPad_Storyboard.storyboardc",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ADAL_iPhone_Storyboard.storyboardc",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HockeySDKResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Base.lproj",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/de.lproj",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/el.lproj",
@@ -3664,7 +3660,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 10.2;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Debug;
 		};
@@ -3707,7 +3703,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Apple-TV/VLC-tvOS-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 10.2;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Release;
 		};
@@ -3750,7 +3746,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Apple-TV/VLC-tvOS-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 10.2;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Distribution;
 		};