From 2061050c785648a4a513b5b3b2b763043066272c Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Sun, 5 Mar 2023 17:52:00 +0300 Subject: [PATCH 1/3] fix: removed custom logger wrapper --- TILogging/Sources/Logger/Logger.swift | 77 ------------------- .../Sources/Logger/LoggerRepresentable.swift | 27 ------- TILogging/TILogging.podspec | 2 +- 3 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 TILogging/Sources/Logger/Logger.swift delete mode 100644 TILogging/Sources/Logger/LoggerRepresentable.swift diff --git a/TILogging/Sources/Logger/Logger.swift b/TILogging/Sources/Logger/Logger.swift deleted file mode 100644 index 07507989..00000000 --- a/TILogging/Sources/Logger/Logger.swift +++ /dev/null @@ -1,77 +0,0 @@ -// -// Copyright (c) 2022 Touch Instinct -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the Software), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -import Foundation -import os - -public struct TILogger: LoggerRepresentable { - - // MARK: - Properties - - @available(iOS 12, *) - public static let defaultLogger = TILogger(subsystem: .defaultSubsystem ?? "", category: .pointsOfInterest) - - public let logInfo: OSLog - - // MARK: - Init - - public init(subsystem: String, category: String) { - self.logInfo = .init(subsystem: subsystem, category: category) - } - - @available(iOS 12, *) - public init(subsystem: String, category: OSLog.Category) { - self.logInfo = .init(subsystem: subsystem, category: category) - } - - // MARK: - LoggerRepresentable - - public func log(_ message: StaticString, log: OSLog?, type: OSLogType, _ arguments: CVarArg...) { - os_log(message, log: log ?? logInfo, type: type, arguments) - } - - // MARK: - Public methods - - public func verbose(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .default, arguments) - } - - public func info(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .info, arguments) - } - - public func debug(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .debug, arguments) - } - - public func error(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .error, arguments) - } - - public func fault(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .fault, arguments) - } -} - -private extension String { - static let defaultSubsystem = Bundle.main.bundleIdentifier -} diff --git a/TILogging/Sources/Logger/LoggerRepresentable.swift b/TILogging/Sources/Logger/LoggerRepresentable.swift deleted file mode 100644 index 5337fcfe..00000000 --- a/TILogging/Sources/Logger/LoggerRepresentable.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// Copyright (c) 2022 Touch Instinct -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the Software), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -import os - -public protocol LoggerRepresentable { - func log(_ message: StaticString, log: OSLog?, type: OSLogType, _ arguments: CVarArg...) -} diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec index 95368dfe..0dd4b5e3 100644 --- a/TILogging/TILogging.podspec +++ b/TILogging/TILogging.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| 'castlele' => 'nikita.semenov@touchin.ru' } s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } - s.ios.deployment_target = '11.0' + s.ios.deployment_target = '15.0' s.swift_versions = ['5.3'] s.source_files = s.name + '/Sources/**/*' From 5ea58f3746b0671638411a8424e239e97f946ab5 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Mon, 6 Mar 2023 10:47:09 +0300 Subject: [PATCH 2/3] feat: update TIDeveloperUtils module, removed TILogger module --- CHANGELOG.md | 5 +++++ Package.swift | 2 -- TIAppleMapUtils/TIAppleMapUtils.podspec | 2 +- TIAuth/TIAuth.podspec | 2 +- .../LoggingPresenter}/LoggingPresenter.swift | 0 .../Views/LoggerList/LogEntryCellView.swift | 0 .../LoggerList/LogEntryTableViewCell.swift | 0 .../LoggerList/LogsListViewController.swift | 0 .../LoggingTogglingViewController.swift | 0 .../LoggerWindow/LoggingTogglingWindow.swift | 0 .../Views/ViewModels/FileCreator.swift | 0 .../Helpers/DefaultLogsListManipulator.swift | 0 .../Helpers/LogsListManipulatorProtocol.swift | 0 .../Views/ViewModels/LogsListViewOutput.swift | 0 .../ViewModels/LogsStorageViewModel.swift | 0 TIDeveloperUtils/TIDeveloperUtils.podspec | 2 +- TIEcommerce/TIEcommerce.podspec | 2 +- TIFoundationUtils/TIFoundationUtils.podspec | 2 +- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 2 +- TIKeychainUtils/TIKeychainUtils.podspec | 2 +- TILogging/TILogging.podspec | 20 ------------------- TIMapUtils/TIMapUtils.podspec | 2 +- TIMoyaNetworking/TIMoyaNetworking.podspec | 2 +- TINetworking/TINetworking.podspec | 2 +- TINetworkingCache/TINetworkingCache.podspec | 2 +- TIPagination/TIPagination.podspec | 2 +- TISwiftUICore/TISwiftUICore.podspec | 2 +- TISwiftUtils/TISwiftUtils.podspec | 2 +- TITableKitUtils/TITableKitUtils.podspec | 2 +- TIUIElements/TIUIElements.podspec | 2 +- TIUIKitCore/TIUIKitCore.podspec | 2 +- TIWebView/TIWebView.podspec | 2 +- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- project-scripts/ordered_modules_list.txt | 3 +-- 34 files changed, 25 insertions(+), 43 deletions(-) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/LoggingPresenter.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerList/LogEntryCellView.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerList/LogEntryTableViewCell.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerList/LogsListViewController.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerWindow/LoggingTogglingViewController.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerWindow/LoggingTogglingWindow.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/FileCreator.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/LogsListViewOutput.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/LogsStorageViewModel.swift (100%) delete mode 100644 TILogging/TILogging.podspec diff --git a/CHANGELOG.md b/CHANGELOG.md index 939213b8..615150b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### 1.36.0 + +- **Removed**: `TILogger`module +- **Updated**: moved `LoggingPresenter` to `TIDeveloperUtils` module. + ### 1.35.1 - **Added**: Auto documentation generation for `TIFoundationUtils` playground and compile checks for playground before release diff --git a/Package.swift b/Package.swift index 32aff137..f6a8d8f4 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,6 @@ let package = Package( .library(name: "TIFoundationUtils", targets: ["TIFoundationUtils"]), .library(name: "TIKeychainUtils", targets: ["TIKeychainUtils"]), .library(name: "TITableKitUtils", targets: ["TITableKitUtils"]), - .library(name: "TILogging", targets: ["TILogging"]), .library(name: "TIDeveloperUtils", targets: ["TIDeveloperUtils"]), // MARK: - Networking @@ -67,7 +66,6 @@ let package = Package( .target(name: "TIFoundationUtils", dependencies: ["TISwiftUtils"], path: "TIFoundationUtils", exclude: ["TIFoundationUtils.app"]), .target(name: "TIKeychainUtils", dependencies: ["TIFoundationUtils", "KeychainAccess"], path: "TIKeychainUtils/Sources"), .target(name: "TITableKitUtils", dependencies: ["TIUIElements", "TableKit"], path: "TITableKitUtils/Sources"), - .target(name: "TILogging", dependencies: ["TIUIElements", "TISwiftUtils", "TIUIKitCore"], path: "TILogging/Sources"), .target(name: "TIDeveloperUtils", dependencies: [], path: "TIDeveloperUtils/Sources"), // MARK: - Networking diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index d0d5e984..c0516d66 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index 9a69cbc3..0f8cbf2d 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAuth' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Login, registration, confirmation and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/Sources/LoggingPresenter.swift b/TIDeveloperUtils/Sources/LoggingPresenter/LoggingPresenter.swift similarity index 100% rename from TILogging/Sources/LoggingPresenter.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/LoggingPresenter.swift diff --git a/TILogging/Sources/Views/LoggerList/LogEntryCellView.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryCellView.swift similarity index 100% rename from TILogging/Sources/Views/LoggerList/LogEntryCellView.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryCellView.swift diff --git a/TILogging/Sources/Views/LoggerList/LogEntryTableViewCell.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryTableViewCell.swift similarity index 100% rename from TILogging/Sources/Views/LoggerList/LogEntryTableViewCell.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryTableViewCell.swift diff --git a/TILogging/Sources/Views/LoggerList/LogsListViewController.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogsListViewController.swift similarity index 100% rename from TILogging/Sources/Views/LoggerList/LogsListViewController.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogsListViewController.swift diff --git a/TILogging/Sources/Views/LoggerWindow/LoggingTogglingViewController.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingViewController.swift similarity index 100% rename from TILogging/Sources/Views/LoggerWindow/LoggingTogglingViewController.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingViewController.swift diff --git a/TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingWindow.swift similarity index 100% rename from TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingWindow.swift diff --git a/TILogging/Sources/Views/ViewModels/FileCreator.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/FileCreator.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/FileCreator.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/FileCreator.swift diff --git a/TILogging/Sources/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift diff --git a/TILogging/Sources/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift diff --git a/TILogging/Sources/Views/ViewModels/LogsListViewOutput.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsListViewOutput.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/LogsListViewOutput.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsListViewOutput.swift diff --git a/TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsStorageViewModel.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsStorageViewModel.swift diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index 27cc7c15..9eb4b19b 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index 834b3236..80684688 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Cart, products, promocodes, bonuses and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index 87ddb6e6..814dae4d 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index 449f1470..3a31c891 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index 584a620b..9dcc348d 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec deleted file mode 100644 index 0dd4b5e3..00000000 --- a/TILogging/TILogging.podspec +++ /dev/null @@ -1,20 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'TILogging' - s.version = '1.35.1' - s.summary = 'Logging API' - s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name - s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', - 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } - - s.ios.deployment_target = '15.0' - s.swift_versions = ['5.3'] - - s.source_files = s.name + '/Sources/**/*' - - s.dependency 'TIUIKitCore', s.version.to_s - s.dependency 'TISwiftUtils', s.version.to_s - s.dependency 'TIUIElements', s.version.to_s - -end diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index ac90666a..bd226a6b 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index 8e9fea8c..1ccd3939 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Moya + Swagger network service.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index d54ef10f..1b35c434 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworking' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Swagger-frendly networking layer helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index 5d53d102..f2a1ad6c 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Caching results of EndpointRequests.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index 15c14ae4..faa154dd 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIPagination' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Generic pagination component.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index c2bc98c0..dca66b9c 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index 8c1de45d..b171f9b3 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index bdae8fba..fdcca1e6 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index 37a6e323..7b76d25c 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index e268fc5b..f8bc46cc 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index 528a2e94..4ad75015 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIWebView' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index 3160811e..908e1c20 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/project-scripts/ordered_modules_list.txt b/project-scripts/ordered_modules_list.txt index 46127ea8..71f5d1ca 100644 --- a/project-scripts/ordered_modules_list.txt +++ b/project-scripts/ordered_modules_list.txt @@ -5,7 +5,6 @@ TIKeychainUtils TIUIKitCore TISwiftUICore TIUIElements -TILogging TIAuth TITableKitUtils TINetworking @@ -17,4 +16,4 @@ TIGoogleMapUtils TIYandexMapUtils TIEcommerce TIWebView -TIDeveloperUtils \ No newline at end of file +TIDeveloperUtils From dda06ece3c5895a8bbcaf56df655c2cb460ba1da Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Mon, 6 Mar 2023 10:59:55 +0300 Subject: [PATCH 3/3] fix: dependencies of TIDeveloperUtils module --- Package.swift | 2 +- TIDeveloperUtils/TIDeveloperUtils.podspec | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index f6a8d8f4..642b75ae 100644 --- a/Package.swift +++ b/Package.swift @@ -66,7 +66,7 @@ let package = Package( .target(name: "TIFoundationUtils", dependencies: ["TISwiftUtils"], path: "TIFoundationUtils", exclude: ["TIFoundationUtils.app"]), .target(name: "TIKeychainUtils", dependencies: ["TIFoundationUtils", "KeychainAccess"], path: "TIKeychainUtils/Sources"), .target(name: "TITableKitUtils", dependencies: ["TIUIElements", "TableKit"], path: "TITableKitUtils/Sources"), - .target(name: "TIDeveloperUtils", dependencies: [], path: "TIDeveloperUtils/Sources"), + .target(name: "TIDeveloperUtils", dependencies: ["TISwiftUtils", "TIUIKitCore", "TIUIElements"], path: "TIDeveloperUtils/Sources"), // MARK: - Networking .target(name: "TINetworking", dependencies: ["TIFoundationUtils", "Alamofire"], path: "TINetworking/Sources"), diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index 9eb4b19b..aa6495a1 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -13,4 +13,8 @@ Pod::Spec.new do |s| s.source_files = s.name + '/Sources/**/*' + s.dependency 'TIUIKitCore', s.version.to_s + s.dependency 'TIUIElements', s.version.to_s + s.dependency 'TISwiftUtils', s.version.to_s + end