From 2939fb3112e318b2f75ee4d2dceadfd77f99b1c2 Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 7 Jan 2021 14:33:00 +0100 Subject: [PATCH 1/2] Update pods from podfile and update keyboardmanager to 6.0 Change-Id: Icd1430df75e12fba20e4db441b29963f78d76247 --- ADFormController.podspec | 2 +- Modules/Logger/Logger.swift | 4 +-- Podfile.lock | 50 ++++++++++++++++++------------------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/ADFormController.podspec b/ADFormController.podspec index 85e0025..2cf8853 100644 --- a/ADFormController.podspec +++ b/ADFormController.podspec @@ -12,6 +12,6 @@ Pod::Spec.new do |spec| spec.resource_bundle = {'ADFormController' => 'Modules/ADFormController/Ressources/InputAccessoryView.xcassets'} spec.framework = 'Foundation', 'UIKit' spec.requires_arc = true - spec.dependency 'ADKeyboardManager', '~> 4.0' + spec.dependency 'ADKeyboardManager', '~> 6.0' spec.swift_version = '5.0' end diff --git a/Modules/Logger/Logger.swift b/Modules/Logger/Logger.swift index 3fb7471..8b8ec20 100644 --- a/Modules/Logger/Logger.swift +++ b/Modules/Logger/Logger.swift @@ -28,9 +28,7 @@ class Logger { xCodeConsoleLogger.colorsEnabled = true DDLog.add(xCodeConsoleLogger, with: logLevel) } - if let appleSystemLogger = DDASLLogger.sharedInstance { - DDLog.add(appleSystemLogger, with: logLevel) - } + DDLog.add(DDOSLogger.sharedInstance, with: logLevel) if let fileLogger = fileLogger { DDLog.add(fileLogger, with: DDLogLevel.all) } diff --git a/Podfile.lock b/Podfile.lock index 82b79d5..ddcdefb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,34 +1,34 @@ PODS: - - ADDynamicLogLevel (2.0.0): + - ADDynamicLogLevel (2.1.0): - CocoaLumberjack (~> 3.0) - ADFormController (6.0.2): - - ADKeyboardManager (~> 4.0) - - ADKeyboardManager (4.0.2) - - ADUtils (9.3.0): - - ADUtils/objc (= 9.3.0) - - ADUtils/objc (9.3.0): + - ADKeyboardManager (~> 6.0) + - ADKeyboardManager (6.0.0) + - ADUtils (9.4.0): + - ADUtils/objc (= 9.4.0) + - ADUtils/objc (9.4.0): - ADUtils/Swift - - ADUtils/Swift (9.3.0) - - Alamofire (4.8.2) - - CocoaLumberjack (3.5.3): - - CocoaLumberjack/Core (= 3.5.3) - - CocoaLumberjack/Core (3.5.3) - - CocoaLumberjack/Swift (3.5.3): + - ADUtils/Swift (9.4.0) + - Alamofire (4.9.1) + - CocoaLumberjack (3.7.0): + - CocoaLumberjack/Core (= 3.7.0) + - CocoaLumberjack/Core (3.7.0) + - CocoaLumberjack/Swift (3.7.0): - CocoaLumberjack/Core - FBSnapshotTestCase (2.1.4): - FBSnapshotTestCase/SwiftSupport (= 2.1.4) - FBSnapshotTestCase/Core (2.1.4) - FBSnapshotTestCase/SwiftSupport (2.1.4): - FBSnapshotTestCase/Core - - Nimble (8.0.2) + - Nimble (8.1.2) - Nimble-Snapshots (4.3.0): - Nimble-Snapshots/Core (= 4.3.0) - Nimble-Snapshots/Core (4.3.0): - FBSnapshotTestCase (~> 2.0) - Nimble - Quick - - OCMock (3.3.1) - - Quick (2.1.0) + - OCMock (3.8.1) + - Quick (2.2.1) - Watchdog (4.0) DEPENDENCIES: @@ -46,6 +46,7 @@ DEPENDENCIES: SPEC REPOS: https://github.com/CocoaPods/Specs.git: + - ADKeyboardManager - ADUtils - Alamofire - CocoaLumberjack @@ -57,24 +58,23 @@ SPEC REPOS: - Watchdog "ssh://git@codereview.technologies.fabernovel.com:29418/CocoaPodsSpecs": - ADDynamicLogLevel - - ADKeyboardManager EXTERNAL SOURCES: ADFormController: :path: "./" SPEC CHECKSUMS: - ADDynamicLogLevel: 446f21d2c807ad898bd6868513ac9f7b21253066 - ADFormController: 2161fa213b5a9259a03d7e27580934e4acfb8d82 - ADKeyboardManager: bc6cb82541878f9bd926c273b0e27f7f085bb4ec - ADUtils: 5414f38fff4a2cdbd73c06eb82608079c7372efe - Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 - CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 + ADDynamicLogLevel: 7b576c84ef7a96ae1aa115e66516fc68f1e86de1 + ADFormController: c23de1c3a40ba66f696e83ee9ee97404342df6a2 + ADKeyboardManager: a9dce48b8d2306c1fca5deb46d04fa8472516fe2 + ADUtils: c3521517403e01ae41ea9e37235fd637777f574c + Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 + CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5 FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a - Nimble: 622629381bda1dd5678162f21f1368cec7cbba60 + Nimble: 3864815b4703c7ebffba875973c70e854489fbae Nimble-Snapshots: 4ba722c35b73a680cbd856e4bc22076dfb8085d4 - OCMock: f3f61e6eaa16038c30caa5798c5e49d3307b6f22 - Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d + OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934 + Quick: f5754d69b7013f5864c29aab9ae6f0c79c5bc200 Watchdog: 370d2c2a58c9bede0e3f9b8cc26bf297745c31c2 PODFILE CHECKSUM: dadcf27961b92a3718adc4924741ea82ddfcfa37 From b25ca8f9bb4975de697a05f86b0b3c3f7fe3a361 Mon Sep 17 00:00:00 2001 From: Jenkins Applidium Date: Thu, 7 Jan 2021 14:40:31 +0100 Subject: [PATCH 2/2] Bump to version 6.0.3 --- ADFormController.podspec | 2 +- Podfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ADFormController.podspec b/ADFormController.podspec index 2cf8853..507e9bb 100644 --- a/ADFormController.podspec +++ b/ADFormController.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'ADFormController' - spec.version = '6.0.2' + spec.version = '6.0.3' spec.authors = 'Applidium' spec.license = 'none' spec.homepage = 'http://applidium.com' diff --git a/Podfile.lock b/Podfile.lock index ddcdefb..cc6b34f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,7 +1,7 @@ PODS: - ADDynamicLogLevel (2.1.0): - CocoaLumberjack (~> 3.0) - - ADFormController (6.0.2): + - ADFormController (6.0.3): - ADKeyboardManager (~> 6.0) - ADKeyboardManager (6.0.0) - ADUtils (9.4.0): @@ -65,7 +65,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: ADDynamicLogLevel: 7b576c84ef7a96ae1aa115e66516fc68f1e86de1 - ADFormController: c23de1c3a40ba66f696e83ee9ee97404342df6a2 + ADFormController: 95290c99fc0264e0335d090e61cf595c0b324009 ADKeyboardManager: a9dce48b8d2306c1fca5deb46d04fa8472516fe2 ADUtils: c3521517403e01ae41ea9e37235fd637777f574c Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18