pod & carthage 更新

caicaicaich · Apr 10, 2018 · 92a7ff8 · 92a7ff8
1 parent b2af478
commit 92a7ff8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "libgit2/objective-git" "0.12.0"
+github "libgit2/objective-git" "0.13.0"
diff --git a/CodingMart/AppDelegate.m b/CodingMart/AppDelegate.m
@@ -48,7 +48,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 //    推送
     [self registerRemoteNotification];
 //    友盟统计
-    [MobClick startWithAppkey:kUmeng_AppKey reportPolicy:BATCH channelId:nil];
+    //    UMENG 统计
+    UMConfigInstance.appKey = kUmeng_AppKey;
+    [MobClick startWithConfigure:UMConfigInstance];
+
 //    友盟分享
     [self registerSocialData];
 //    Google Analytics

diff --git a/CodingMart/Util/Manager/EADeviceToServerLog/EADeviceToServerLog.m b/CodingMart/Util/Manager/EADeviceToServerLog/EADeviceToServerLog.m
@@ -390,10 +390,8 @@ - (void)getGitsBlock:(void(^)(NSDictionary *dictGits))block{
     NSMutableDictionary *dictGits = @{kEALogKey_StartTime: [self p_curTime]}.mutableCopy;
     dictGits[@"url"] = repoURL.absoluteString;
     NSError* error = nil;
-    GTRepository *repo = [GTRepository cloneFromURL:repoURL toWorkingDirectory:localURL options:@{GTRepositoryCloneOptionsCheckout: @NO} error:&error transferProgressBlock:^(const git_transfer_progress *progress, BOOL *stop) {
+    GTRepository *repo = [GTRepository cloneFromURL:repoURL toWorkingDirectory:localURL options:@{GTRepositoryCloneOptionsPerformCheckout: @NO} error:&error transferProgressBlock:^(const git_transfer_progress *progress, BOOL *stop) {
         DebugLog(@"received_objects_count: %d", progress->received_objects);
-    } checkoutProgressBlock:^(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps) {//{Checkout: @NO}，所以这里不会执行
-        DebugLog(@"checkout_progress:%.2f", (float)completedSteps/totalSteps);
     }];
 
     dictGits[kEALogKey_FinishTime] = [self p_curTime];

diff --git a/Podfile b/Podfile
@@ -18,7 +18,7 @@ pod 'UITableView+FDTemplateLayoutCell'
 pod 'RDHCollectionViewGridLayout', '~> 1.2'
 
 pod 'UMengSocial', '4.3'
-pod 'UMengAnalytics-NO-IDFA', '3.6.5'
+pod 'UMengAnalytics-NO-IDFA', '~> 4.2.5'
 
 pod 'QQ_XGPush', '~> 2.5.0'
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -51,7 +51,7 @@ PODS:
   - TPKeyboardAvoiding (1.2.9)
   - TTTAttributedLabel (1.10.1)
   - UITableView+FDTemplateLayoutCell (1.3)
-  - UMengAnalytics-NO-IDFA (3.6.5)
+  - UMengAnalytics-NO-IDFA (4.2.5)
   - UMengSocial (4.3)
 
 DEPENDENCIES:
@@ -71,7 +71,7 @@ DEPENDENCIES:
   - TPKeyboardAvoiding (= 1.2.9)
   - TTTAttributedLabel (= 1.10.1)
   - UITableView+FDTemplateLayoutCell
-  - UMengAnalytics-NO-IDFA (= 3.6.5)
+  - UMengAnalytics-NO-IDFA (~> 4.2.5)
   - UMengSocial (= 4.3)
 
 SPEC CHECKSUMS:
@@ -96,9 +96,9 @@ SPEC CHECKSUMS:
   TPKeyboardAvoiding: ff1ee4e5a5a0c119b965552af8f183868ea20207
   TTTAttributedLabel: c8f3801a6463b9c9b82b0c84c465fdda9751892a
   UITableView+FDTemplateLayoutCell: d5be6056b5060313f5955a2590ecd33142ad713d
-  UMengAnalytics-NO-IDFA: 279e28990a08efb56cff1821d2954bb00aa6975a
+  UMengAnalytics-NO-IDFA: 16666e32edce5be44ae5b14aaaa7f3582e09d6ab
   UMengSocial: e649f30dd9a3686c74daba880e83f818f66bd890
 
-PODFILE CHECKSUM: d406289249784461dafc2cf582013b5fef6259a8
+PODFILE CHECKSUM: f129240d364de2705a6bc3d3784497fc3ade1888
 
 COCOAPODS: 1.3.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "libgit2/objective-git" "0.12.0"
		github "libgit2/objective-git" "0.13.0"