Update WordPressShared, WordPressKit, and WordPressAuthenticator

Author: crazytonyli

Podfile

@@ -20,9 +20,9 @@ workspace 'WordPress.xcworkspace'
 ## ===================================
 ##
 def wordpress_shared
-  pod 'WordPressShared', '~> 1.18.0'
+  pod 'WordPressShared', '~> 2.0.0-beta.1'
   # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
-  # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
+  # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'delete-cocoalumberjack'
   # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit  => ''
   # pod 'WordPressShared', :path => '../WordPress-iOS-Shared'
 end
@@ -47,7 +47,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-  pod 'WordPressKit', '~> 4.58', '>= 4.58.2'
+  pod 'WordPressKit', '~> 5.0'
   # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
   # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
   # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
@@ -63,7 +63,7 @@ end
 
 def shared_with_all_pods
   wordpress_shared
-  pod 'CocoaLumberjack', '~> 3.0'
+  pod 'CocoaLumberjack/Swift', '~> 3.0'
   pod 'NSObject-SafeExpectations', '~> 0.0.4'
 end
 
@@ -226,8 +226,8 @@ abstract_target 'Apps' do
 
   pod 'Gridicons', '~> 1.1.0'
 
-  pod 'WordPressAuthenticator', '~> 3.2', '>= 3.2.2'
-  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: 'fix/prologue-nav-bar'
+  # pod 'WordPressAuthenticator', '~> 3.2', '>= 3.2.2'
+  pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: 'trunk'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 

Podfile.lock

@@ -27,9 +27,9 @@ PODS:
   - boost (1.76.0)
   - BVLinearGradient (2.5.6-wp-2):
     - React-Core
-  - CocoaLumberjack (3.7.4):
-    - CocoaLumberjack/Core (= 3.7.4)
-  - CocoaLumberjack/Core (3.7.4)
+  - CocoaLumberjack/Core (3.8.0)
+  - CocoaLumberjack/Swift (3.8.0):
+    - CocoaLumberjack/Core
   - CropViewController (2.5.3)
   - DoubleConversion (1.1.5)
   - Down (0.6.6)
@@ -42,9 +42,6 @@ PODS:
     - React-jsi (= 0.66.2)
     - ReactCommon/turbomodule/core (= 0.66.2)
   - fmt (6.2.1)
-  - FormatterKit/Resources (1.9.0)
-  - FormatterKit/TimeIntervalFormatter (1.9.0):
-    - FormatterKit/Resources
   - FSInteractiveMap (0.1.0)
   - Gifu (3.2.0)
   - glog (0.3.5)
@@ -64,15 +61,15 @@ PODS:
     - RNTAztecView
   - JTAppleCalendar (8.0.3)
   - Kanvas (1.4.4)
-  - libwebp (1.2.3):
-    - libwebp/demux (= 1.2.3)
-    - libwebp/mux (= 1.2.3)
-    - libwebp/webp (= 1.2.3)
-  - libwebp/demux (1.2.3):
+  - libwebp (1.2.4):
+    - libwebp/demux (= 1.2.4)
+    - libwebp/mux (= 1.2.4)
+    - libwebp/webp (= 1.2.4)
+  - libwebp/demux (1.2.4):
     - libwebp/webp
-  - libwebp/mux (1.2.3):
+  - libwebp/mux (1.2.4):
     - libwebp/demux
-  - libwebp/webp (1.2.3)
+  - libwebp/webp (1.2.4)
   - MediaEditor (1.2.1):
     - CropViewController (~> 2.5.3)
   - MRProgress (0.8.3):
@@ -491,26 +488,21 @@ PODS:
   - WordPress-Aztec-iOS (1.19.8)
   - WordPress-Editor-iOS (1.19.8):
     - WordPress-Aztec-iOS (= 1.19.8)
-  - WordPressAuthenticator (3.2.2):
-    - Alamofire (~> 4.8)
-    - CocoaLumberjack (~> 3.5)
+  - WordPressAuthenticator (4.3.0):
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
-    - WordPressKit (~> 4.18-beta)
-    - WordPressShared (~> 1.12-beta)
+    - WordPressKit (~> 5.0-beta)
+    - WordPressShared (~> 2.0-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.58.2):
+  - WordPressKit (5.0.0):
     - Alamofire (~> 4.8.0)
-    - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
-    - WordPressShared (~> 1.15-beta)
+    - WordPressShared (~> 2.0-beta)
     - wpxmlrpc (~> 0.9)
-  - WordPressShared (1.18.0):
-    - CocoaLumberjack (~> 3.4)
-    - FormatterKit/TimeIntervalFormatter (~> 1.8)
+  - WordPressShared (2.0.0-beta.2)
   - WordPressUI (1.12.5)
   - WPMediaPicker (1.8.7)
   - wpxmlrpc (0.9.0)
@@ -539,7 +531,7 @@ DEPENDENCIES:
   - Automattic-Tracks-iOS (~> 0.13)
   - boost (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.1/third-party-podspecs/boost.podspec.json`)
   - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.1/third-party-podspecs/BVLinearGradient.podspec.json`)
-  - CocoaLumberjack (~> 3.0)
+  - CocoaLumberjack/Swift (~> 3.0)
   - CropViewController (= 2.5.3)
   - Down (~> 0.6.6)
   - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.1/third-party-podspecs/FBLazyVector.podspec.json`)
@@ -601,19 +593,16 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.8)
-  - WordPressAuthenticator (>= 3.2.2, ~> 3.2)
-  - WordPressKit (>= 4.58.2, ~> 4.58)
-  - WordPressShared (~> 1.18.0)
+  - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `trunk`)
+  - WordPressKit (~> 5.0)
+  - WordPressShared (~> 2.0.0-beta.1)
   - WordPressUI (~> 1.12.5)
   - WPMediaPicker (~> 1.8.7)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.1/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
-  https://github.com/wordpress-mobile/cocoapods-specs.git:
-    - WordPressAuthenticator
-    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -626,7 +615,6 @@ SPEC REPOS:
     - DoubleConversion
     - Down
     - fmt
-    - FormatterKit
     - Gifu
     - GoogleSignIn
     - Gridicons
@@ -651,6 +639,7 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
+    - WordPressKit
     - WordPressShared
     - WordPressUI
     - WPMediaPicker
@@ -764,6 +753,9 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.85.1
+  WordPressAuthenticator:
+    :branch: trunk
+    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.1/third-party-podspecs/Yoga.podspec.json
 
@@ -779,6 +771,9 @@ CHECKOUT OPTIONS:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.85.1
+  WordPressAuthenticator:
+    :commit: 8def4e0e7ae522504a995d7a12872fc13c596141
+    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
 
 SPEC CHECKSUMS:
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
@@ -789,14 +784,13 @@ SPEC CHECKSUMS:
   Automattic-Tracks-iOS: 63e55654f500b3e8fb35087e64575e00d12eb2f5
   boost: 32a63928ef0a5bf8b60f6b930c8864113fa28779
   BVLinearGradient: 9373b32b8f749c00fe59e3482b45091eeacec08b
-  CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
+  CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732
   CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
   Down: 71bf4af3c04fa093e65dffa25c4b64fa61287373
   FBLazyVector: 2bf7b5e351f8e33867210ff6eb9c5c178a035522
   FBReactNativeSpec: c0c61ce6c9aed4a5bf62284c8309995c21cf6b02
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
   FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
   Gifu: 7bcb6427457d85e0b4dff5a84ec5947ac19a93ea
   glog: 67060cb66a7ea4b1e8947dc9936d7fce11b100b0
@@ -807,7 +801,7 @@ SPEC CHECKSUMS:
   Gutenberg: cbeb7133c8a80d21980d92c97287d00c387c3114
   JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99
   Kanvas: f932eaed3d3f47aae8aafb6c2d27c968bdd49030
-  libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
+  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a
   MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09
   NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374
@@ -864,9 +858,9 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: e6a801d25f4f178de5bdf475ffe29050d0148176
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
-  WordPressAuthenticator: 5110c62de1b1b1eb1f2a43fd2599f7f6c7a6659d
-  WordPressKit: d8bc00bce09273fc241cf171b0e61ef8f4f29479
-  WordPressShared: e5a479220643f46dc4d7726ef8dd45f18bf0c53b
+  WordPressAuthenticator: 685dc0ac3812d514e1a0e6b2d9c94eca9c0e07a7
+  WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5
+  WordPressShared: 04403b43f821c4ed2b84a2112ef9f64f1e7cdceb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
   WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
@@ -880,6 +874,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 1244a13ad31cc499410b4901755c8810df5acb33
+PODFILE CHECKSUM: 1d4c08837f0820ee6bf0405e2800ce06f0d329b8
 
 COCOAPODS: 1.11.2

WordPress/Classes/System/WordPress-Bridging-Header.h

@@ -129,3 +129,5 @@
 #import <WordPressShared/WPTableViewCell.h>
 #import <WordPressShared/WPAnalytics.h>
 #import <WordPressUI/UIImage+Util.h>
+
+FOUNDATION_EXTERN void SetCocoaLumberjackObjCLogLevel(NSUInteger ddLogLevelRawValue);

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -71,8 +71,6 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
     private let loggingStack = WPLoggingStack()
 
-    private lazy var tracksLogger = TracksLogger()
-
     /// Access the crash logging type
     class var crashLogging: CrashLogging? {
         shared?.loggingStack.crashLogging
@@ -295,7 +293,11 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         configureAppCenterSDK()
         configureAppRatingUtility()
 
-        TracksLogging.delegate = tracksLogger
+        let libraryLogger = WordPressLibraryLogger()
+        TracksLogging.delegate = libraryLogger
+        WPSharedSetLoggingDelegate(libraryLogger)
+        WPKitSetLoggingDelegate(libraryLogger)
+        WPAuthenticatorSetLoggingDelegate(libraryLogger)
 
         printDebugLaunchInfoWithLaunchOptions(launchOptions)
         toggleExtraDebuggingIfNeeded()
@@ -766,8 +768,8 @@ extension WordPressAppDelegate {
     }
 
     @objc class func setLogLevel(_ level: DDLogLevel) {
-        WPSharedSetLoggingLevel(level)
-        WPAuthenticatorSetLoggingLevel(level)
+        SetCocoaLumberjackObjCLogLevel(level.rawValue)
+        CocoaLumberjack.dynamicLogLevel = level
     }
 }
 

WordPress/Classes/Utility/Logging/CocoaLumberjack.swift

@@ -1,108 +1,27 @@
 import Foundation
 import CocoaLumberjack
 
-// June 14 2017 - @astralbodies
-// Taken from CocoaLumberjack repository - reproduced to prevent issue with 
-// CocoaPods and some weird bug with frameworks
-
-// Software License Agreement (BSD License)
-//
-// Copyright (c) 2014-2016, Deusty, LLC
-// All rights reserved.
-//
-// Redistribution and use of this software in source and binary forms,
-// with or without modification, are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice,
-//   this list of conditions and the following disclaimer.
-//
-// * Neither the name of Deusty nor the names of its contributors may be used
-//   to endorse or promote products derived from this software without specific
-//   prior written permission of Deusty, LLC.
-
-extension DDLogFlag {
-    public static func from(_ logLevel: DDLogLevel) -> DDLogFlag {
-        return DDLogFlag(rawValue: logLevel.rawValue)
-    }
-
-    public init(_ logLevel: DDLogLevel) {
-        self = DDLogFlag(rawValue: logLevel.rawValue)
-    }
-
-    ///returns the log level, or the lowest equivalant.
-    public func toLogLevel() -> DDLogLevel {
-        if let ourValid = DDLogLevel(rawValue: rawValue) {
-            return ourValid
-        } else {
-            if contains(.verbose) {
-                return .verbose
-            } else if contains(.debug) {
-                return .debug
-            } else if contains(.info) {
-                return .info
-            } else if contains(.warning) {
-                return .warning
-            } else if contains(.error) {
-                return .error
-            } else {
-                return .off
-            }
-        }
-    }
-}
-
-public var defaultDebugLevel = DDLogLevel.verbose
-
-public func resetDefaultDebugLevel() {
-    defaultDebugLevel = DDLogLevel.verbose
-}
-
-public func _DDLogMessage(_ message: @autoclosure () -> String, level: DDLogLevel, flag: DDLogFlag, context: Int, file: StaticString, function: StaticString, line: UInt, tag: Any?, asynchronous: Bool, ddlog: DDLog) {
-    if level.rawValue & flag.rawValue != 0 {
-        // Tell the DDLogMessage constructor to copy the C strings that get passed to it.
-        let logMessage = DDLogMessage(message: message(), level: level, flag: flag, context: context, file: String(describing: file), function: String(describing: function), line: line, tag: tag, options: [.copyFile, .copyFunction], timestamp: nil)
-        ddlog.log(asynchronous: asynchronous, message: logMessage)
-    }
-}
-
-public func DDLogDebug(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
-    _DDLogMessage(message(), level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
-}
-
-public func DDLogInfo(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
-    _DDLogMessage(message(), level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
+@inlinable
+public func DDLogVerbose(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
+    CocoaLumberjack.DDLogVerbose(message(), file: file, function: function, line: line)
 }
 
-public func DDLogWarn(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
-    _DDLogMessage(message(), level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
+@inlinable
+public func DDLogDebug(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
+    CocoaLumberjack.DDLogDebug(message(), file: file, function: function, line: line)
 }
 
-public func DDLogVerbose(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
-    _DDLogMessage(message(), level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
+@inlinable
+public func DDLogInfo(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
+    CocoaLumberjack.DDLogInfo(message(), file: file, function: function, line: line)
 }
 
-public func DDLogError(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = false, ddlog: DDLog = DDLog.sharedInstance) {
-    _DDLogMessage(message(), level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
+@inlinable
+public func DDLogWarn(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
+    CocoaLumberjack.DDLogWarn(message(), file: file, function: function, line: line)
 }
 
-/// Returns a String of the current filename, without full path or extension.
-///
-/// Analogous to the C preprocessor macro `THIS_FILE`.
-public func CurrentFileName(_ fileName: StaticString = #file) -> String {
-    var str = String(describing: fileName)
-    if let idx = str.range(of: "/", options: .backwards)?.upperBound {
-#if swift(>=4.0)
-        str = String(str[idx...])
-#else
-        str = str.substring(from: idx)
-#endif
-    }
-    if let idx = str.range(of: ".", options: .backwards)?.lowerBound {
-#if swift(>=4.0)
-        str = String(str.prefix(upTo: idx))
-#else
-        str = str.substring(to: idx)
-#endif
-    }
-    return str
+@inlinable
+public func DDLogError(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
+    CocoaLumberjack.DDLogError(message(), file: file, function: function, line: line)
 }