From ea627823ca38244373bf62ada3ba3c9d8e528464 Mon Sep 17 00:00:00 2001 From: Dmitry Overchuk Date: Mon, 25 Jan 2021 14:59:05 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20Swift=20Package=20Manager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Example/Podfile.lock | 2 +- Package.swift | 28 ++++++++++++++++++ {Development/Source => Sources}/API/API.swift | 0 .../API/Dispatcher/Dispatcher.swift | 0 .../Source => Sources}/API/IAPI.swift | 0 .../API/RequestBuilder/IRequestBuilder.swift | 0 .../API/RequestBuilder/RequestBuilder.swift | 0 .../IURLRequestProcessor.swift | 0 .../IAppLauncher/IAppLauncher.swift | 0 .../IAppLauncher/URLSchemeAppLauncher.swift | 0 .../Utils/Router/IURLRouter.swift | 1 + .../URLScheme/Builder/IURLSchemeBuilder.swift | 0 .../URLScheme/Builder/URLSchemeBuilder.swift | 0 .../Models/AppLaunchOptions.swift | 0 .../CallbackURLParser/CallbackURLParser.swift | 0 .../ICallbackURLParser.swift | 0 .../Extensions/Bundle+Resources.swift | 15 +++++----- ...Environment+EnvironmentConfiguration.swift | 0 .../Extensions/String+Base64.swift | 0 .../TinkoffApp+TargetAppConfiguration.swift | 0 .../Models/Internal/AuthProcess.swift | 0 .../Models/Internal/SignOutResponse.swift | 0 .../Models/Public/SignOutTokenTypeHint.swift | 0 .../Models/Public/TinkoffApp.swift | 0 .../Models/Public/TinkoffAuthError.swift | 0 .../Models/Public/TinkoffEnvironment.swift | 0 .../Models/Public/TinkoffTokenPayload.swift | 0 .../IPKCEPayloadGenerator.swift | 0 .../ICodeVerifierGenerator.swift | 0 .../RFC7636PKCECodeVerifierGenerator.swift | 0 .../IPKCECodeChallengeDerivator.swift | 0 .../RFC7636PKCECodeChallengeDerivator.swift | 0 .../PKCEPayloadGenerator.swift | 0 .../PKCE/PKCECodePayload.swift | 0 .../TinkoffID.xcassets/Contents.json | 0 .../logo.imageset/Contents.json | 0 .../TinkoffID.xcassets/logo.imageset/logo.pdf | Bin .../Resources/en.lproj/TinkoffID.strings | 0 .../Resources/ru.lproj/TinkoffID.strings | 0 .../SDK/Builder/TinkoffIDBuilder.swift | 1 + .../EnvironmentConfiguration.swift | 0 .../TargetAppConfiguration.swift | 0 .../Source => Sources}/SDK/ITinkoffID.swift | 0 .../Source => Sources}/SDK/TinkoffID.swift | 0 .../UI/Button/TinkoffIDButton.swift | 2 +- .../UI/Button/TinkoffIDButtonBuilder.swift | 2 +- TinkoffID.podspec | 6 ++-- 47 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 Package.swift rename {Development/Source => Sources}/API/API.swift (100%) rename {Development/Source => Sources}/API/Dispatcher/Dispatcher.swift (100%) rename {Development/Source => Sources}/API/IAPI.swift (100%) rename {Development/Source => Sources}/API/RequestBuilder/IRequestBuilder.swift (100%) rename {Development/Source => Sources}/API/RequestBuilder/RequestBuilder.swift (100%) rename {Development/Source => Sources}/API/RequestProcessor/IURLRequestProcessor.swift (100%) rename {Development/Source => Sources}/AppLaunching/IAppLauncher/IAppLauncher.swift (100%) rename {Development/Source => Sources}/AppLaunching/IAppLauncher/URLSchemeAppLauncher.swift (100%) rename {Development/Source => Sources}/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift (98%) rename {Development/Source => Sources}/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/IURLSchemeBuilder.swift (100%) rename {Development/Source => Sources}/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/URLSchemeBuilder.swift (100%) rename {Development/Source => Sources}/AppLaunching/Models/AppLaunchOptions.swift (100%) rename {Development/Source => Sources}/CallbackURLParser/CallbackURLParser.swift (100%) rename {Development/Source => Sources}/CallbackURLParser/ICallbackURLParser.swift (100%) rename {Development/Source => Sources}/Extensions/Bundle+Resources.swift (62%) rename {Development/Source => Sources}/Extensions/Environment+EnvironmentConfiguration.swift (100%) rename {Development/Source => Sources}/Extensions/String+Base64.swift (100%) rename {Development/Source => Sources}/Extensions/TinkoffApp+TargetAppConfiguration.swift (100%) rename {Development/Source => Sources}/Models/Internal/AuthProcess.swift (100%) rename {Development/Source => Sources}/Models/Internal/SignOutResponse.swift (100%) rename {Development/Source => Sources}/Models/Public/SignOutTokenTypeHint.swift (100%) rename {Development/Source => Sources}/Models/Public/TinkoffApp.swift (100%) rename {Development/Source => Sources}/Models/Public/TinkoffAuthError.swift (100%) rename {Development/Source => Sources}/Models/Public/TinkoffEnvironment.swift (100%) rename {Development/Source => Sources}/Models/Public/TinkoffTokenPayload.swift (100%) rename {Development/Source => Sources}/PKCE/IPKCEPayloadGenerator/IPKCEPayloadGenerator.swift (100%) rename {Development/Source => Sources}/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/ICodeVerifierGenerator.swift (100%) rename {Development/Source => Sources}/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/RFC7636PKCECodeVerifierGenerator.swift (100%) rename {Development/Source => Sources}/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/IPKCECodeChallengeDerivator.swift (100%) rename {Development/Source => Sources}/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/RFC7636PKCECodeChallengeDerivator.swift (100%) rename {Development/Source => Sources}/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/PKCEPayloadGenerator.swift (100%) rename {Development/Source => Sources}/PKCE/PKCECodePayload.swift (100%) rename {Development => Sources}/Resources/TinkoffID.xcassets/Contents.json (100%) rename {Development => Sources}/Resources/TinkoffID.xcassets/logo.imageset/Contents.json (100%) rename {Development => Sources}/Resources/TinkoffID.xcassets/logo.imageset/logo.pdf (100%) rename {Development => Sources}/Resources/en.lproj/TinkoffID.strings (100%) rename {Development => Sources}/Resources/ru.lproj/TinkoffID.strings (100%) rename {Development/Source => Sources}/SDK/Builder/TinkoffIDBuilder.swift (99%) rename {Development/Source => Sources}/SDK/Configuration/EnvironmentConfiguration.swift (100%) rename {Development/Source => Sources}/SDK/Configuration/TargetAppConfiguration.swift (100%) rename {Development/Source => Sources}/SDK/ITinkoffID.swift (100%) rename {Development/Source => Sources}/SDK/TinkoffID.swift (100%) rename {Development/Source => Sources}/UI/Button/TinkoffIDButton.swift (99%) rename {Development/Source => Sources}/UI/Button/TinkoffIDButtonBuilder.swift (97%) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index ea34a23..ac2e50b 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -18,7 +18,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb - TinkoffID: 67a2c6dac8becf1417311a003814b73d39b2a567 + TinkoffID: ac03552becea632de0f13d9461621770444ae0b8 PODFILE CHECKSUM: d1e73e199c553c711c8552e3d915b504119d4beb diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..c5b9b8d --- /dev/null +++ b/Package.swift @@ -0,0 +1,28 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "TinkoffID", + defaultLocalization: "ru", + platforms: [.iOS(.v10)], + products: [ + .library( + name: "TinkoffID", + targets: ["TinkoffID"] + ), + ], + targets: [ + .target( + name: "TinkoffID", + dependencies: [], + path: "Sources" + ), + .testTarget( + name: "TinkoffIDTests", + dependencies: ["TinkoffID"], + path: "Tests" + ), + ] +) diff --git a/Development/Source/API/API.swift b/Sources/API/API.swift similarity index 100% rename from Development/Source/API/API.swift rename to Sources/API/API.swift diff --git a/Development/Source/API/Dispatcher/Dispatcher.swift b/Sources/API/Dispatcher/Dispatcher.swift similarity index 100% rename from Development/Source/API/Dispatcher/Dispatcher.swift rename to Sources/API/Dispatcher/Dispatcher.swift diff --git a/Development/Source/API/IAPI.swift b/Sources/API/IAPI.swift similarity index 100% rename from Development/Source/API/IAPI.swift rename to Sources/API/IAPI.swift diff --git a/Development/Source/API/RequestBuilder/IRequestBuilder.swift b/Sources/API/RequestBuilder/IRequestBuilder.swift similarity index 100% rename from Development/Source/API/RequestBuilder/IRequestBuilder.swift rename to Sources/API/RequestBuilder/IRequestBuilder.swift diff --git a/Development/Source/API/RequestBuilder/RequestBuilder.swift b/Sources/API/RequestBuilder/RequestBuilder.swift similarity index 100% rename from Development/Source/API/RequestBuilder/RequestBuilder.swift rename to Sources/API/RequestBuilder/RequestBuilder.swift diff --git a/Development/Source/API/RequestProcessor/IURLRequestProcessor.swift b/Sources/API/RequestProcessor/IURLRequestProcessor.swift similarity index 100% rename from Development/Source/API/RequestProcessor/IURLRequestProcessor.swift rename to Sources/API/RequestProcessor/IURLRequestProcessor.swift diff --git a/Development/Source/AppLaunching/IAppLauncher/IAppLauncher.swift b/Sources/AppLaunching/IAppLauncher/IAppLauncher.swift similarity index 100% rename from Development/Source/AppLaunching/IAppLauncher/IAppLauncher.swift rename to Sources/AppLaunching/IAppLauncher/IAppLauncher.swift diff --git a/Development/Source/AppLaunching/IAppLauncher/URLSchemeAppLauncher.swift b/Sources/AppLaunching/IAppLauncher/URLSchemeAppLauncher.swift similarity index 100% rename from Development/Source/AppLaunching/IAppLauncher/URLSchemeAppLauncher.swift rename to Sources/AppLaunching/IAppLauncher/URLSchemeAppLauncher.swift diff --git a/Development/Source/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift b/Sources/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift similarity index 98% rename from Development/Source/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift rename to Sources/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift index 315569a..605d6fb 100644 --- a/Development/Source/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift +++ b/Sources/AppLaunching/IAppLauncher/Utils/Router/IURLRouter.swift @@ -6,6 +6,7 @@ // import Foundation +import UIKit /// Роутер URL protocol IURLRouter { diff --git a/Development/Source/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/IURLSchemeBuilder.swift b/Sources/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/IURLSchemeBuilder.swift similarity index 100% rename from Development/Source/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/IURLSchemeBuilder.swift rename to Sources/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/IURLSchemeBuilder.swift diff --git a/Development/Source/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/URLSchemeBuilder.swift b/Sources/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/URLSchemeBuilder.swift similarity index 100% rename from Development/Source/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/URLSchemeBuilder.swift rename to Sources/AppLaunching/IAppLauncher/Utils/URLScheme/Builder/URLSchemeBuilder.swift diff --git a/Development/Source/AppLaunching/Models/AppLaunchOptions.swift b/Sources/AppLaunching/Models/AppLaunchOptions.swift similarity index 100% rename from Development/Source/AppLaunching/Models/AppLaunchOptions.swift rename to Sources/AppLaunching/Models/AppLaunchOptions.swift diff --git a/Development/Source/CallbackURLParser/CallbackURLParser.swift b/Sources/CallbackURLParser/CallbackURLParser.swift similarity index 100% rename from Development/Source/CallbackURLParser/CallbackURLParser.swift rename to Sources/CallbackURLParser/CallbackURLParser.swift diff --git a/Development/Source/CallbackURLParser/ICallbackURLParser.swift b/Sources/CallbackURLParser/ICallbackURLParser.swift similarity index 100% rename from Development/Source/CallbackURLParser/ICallbackURLParser.swift rename to Sources/CallbackURLParser/ICallbackURLParser.swift diff --git a/Development/Source/Extensions/Bundle+Resources.swift b/Sources/Extensions/Bundle+Resources.swift similarity index 62% rename from Development/Source/Extensions/Bundle+Resources.swift rename to Sources/Extensions/Bundle+Resources.swift index afeeb1d..84cf500 100644 --- a/Development/Source/Extensions/Bundle+Resources.swift +++ b/Sources/Extensions/Bundle+Resources.swift @@ -6,16 +6,17 @@ // import Foundation +import UIKit extension Bundle { static var resourcesBundle: Bundle? { - let bundle = Bundle(for: TinkoffIDButton.self) - - guard let resourcesBundleUrl = bundle.resourceURL?.appendingPathComponent("TinkoffIdResources.bundle") else { - return nil - } - - return Bundle(url: resourcesBundleUrl) + #if SWIFT_PACKAGE + return Bundle.module + #else + return Bundle(for: TinkoffIDButton.self) + .resourceURL + .flatMap(Bundle.init(url:)) + #endif } func imageNamed(_ name: String) -> UIImage? { diff --git a/Development/Source/Extensions/Environment+EnvironmentConfiguration.swift b/Sources/Extensions/Environment+EnvironmentConfiguration.swift similarity index 100% rename from Development/Source/Extensions/Environment+EnvironmentConfiguration.swift rename to Sources/Extensions/Environment+EnvironmentConfiguration.swift diff --git a/Development/Source/Extensions/String+Base64.swift b/Sources/Extensions/String+Base64.swift similarity index 100% rename from Development/Source/Extensions/String+Base64.swift rename to Sources/Extensions/String+Base64.swift diff --git a/Development/Source/Extensions/TinkoffApp+TargetAppConfiguration.swift b/Sources/Extensions/TinkoffApp+TargetAppConfiguration.swift similarity index 100% rename from Development/Source/Extensions/TinkoffApp+TargetAppConfiguration.swift rename to Sources/Extensions/TinkoffApp+TargetAppConfiguration.swift diff --git a/Development/Source/Models/Internal/AuthProcess.swift b/Sources/Models/Internal/AuthProcess.swift similarity index 100% rename from Development/Source/Models/Internal/AuthProcess.swift rename to Sources/Models/Internal/AuthProcess.swift diff --git a/Development/Source/Models/Internal/SignOutResponse.swift b/Sources/Models/Internal/SignOutResponse.swift similarity index 100% rename from Development/Source/Models/Internal/SignOutResponse.swift rename to Sources/Models/Internal/SignOutResponse.swift diff --git a/Development/Source/Models/Public/SignOutTokenTypeHint.swift b/Sources/Models/Public/SignOutTokenTypeHint.swift similarity index 100% rename from Development/Source/Models/Public/SignOutTokenTypeHint.swift rename to Sources/Models/Public/SignOutTokenTypeHint.swift diff --git a/Development/Source/Models/Public/TinkoffApp.swift b/Sources/Models/Public/TinkoffApp.swift similarity index 100% rename from Development/Source/Models/Public/TinkoffApp.swift rename to Sources/Models/Public/TinkoffApp.swift diff --git a/Development/Source/Models/Public/TinkoffAuthError.swift b/Sources/Models/Public/TinkoffAuthError.swift similarity index 100% rename from Development/Source/Models/Public/TinkoffAuthError.swift rename to Sources/Models/Public/TinkoffAuthError.swift diff --git a/Development/Source/Models/Public/TinkoffEnvironment.swift b/Sources/Models/Public/TinkoffEnvironment.swift similarity index 100% rename from Development/Source/Models/Public/TinkoffEnvironment.swift rename to Sources/Models/Public/TinkoffEnvironment.swift diff --git a/Development/Source/Models/Public/TinkoffTokenPayload.swift b/Sources/Models/Public/TinkoffTokenPayload.swift similarity index 100% rename from Development/Source/Models/Public/TinkoffTokenPayload.swift rename to Sources/Models/Public/TinkoffTokenPayload.swift diff --git a/Development/Source/PKCE/IPKCEPayloadGenerator/IPKCEPayloadGenerator.swift b/Sources/PKCE/IPKCEPayloadGenerator/IPKCEPayloadGenerator.swift similarity index 100% rename from Development/Source/PKCE/IPKCEPayloadGenerator/IPKCEPayloadGenerator.swift rename to Sources/PKCE/IPKCEPayloadGenerator/IPKCEPayloadGenerator.swift diff --git a/Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/ICodeVerifierGenerator.swift b/Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/ICodeVerifierGenerator.swift similarity index 100% rename from Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/ICodeVerifierGenerator.swift rename to Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/ICodeVerifierGenerator.swift diff --git a/Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/RFC7636PKCECodeVerifierGenerator.swift b/Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/RFC7636PKCECodeVerifierGenerator.swift similarity index 100% rename from Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/RFC7636PKCECodeVerifierGenerator.swift rename to Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/ICodeVerifierGenerator/RFC7636PKCECodeVerifierGenerator.swift diff --git a/Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/IPKCECodeChallengeDerivator.swift b/Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/IPKCECodeChallengeDerivator.swift similarity index 100% rename from Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/IPKCECodeChallengeDerivator.swift rename to Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/IPKCECodeChallengeDerivator.swift diff --git a/Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/RFC7636PKCECodeChallengeDerivator.swift b/Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/RFC7636PKCECodeChallengeDerivator.swift similarity index 100% rename from Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/RFC7636PKCECodeChallengeDerivator.swift rename to Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/IPKCECodeChallengeDerivator/RFC7636PKCECodeChallengeDerivator.swift diff --git a/Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/PKCEPayloadGenerator.swift b/Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/PKCEPayloadGenerator.swift similarity index 100% rename from Development/Source/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/PKCEPayloadGenerator.swift rename to Sources/PKCE/IPKCEPayloadGenerator/PKCEPayloadGenerator/PKCEPayloadGenerator.swift diff --git a/Development/Source/PKCE/PKCECodePayload.swift b/Sources/PKCE/PKCECodePayload.swift similarity index 100% rename from Development/Source/PKCE/PKCECodePayload.swift rename to Sources/PKCE/PKCECodePayload.swift diff --git a/Development/Resources/TinkoffID.xcassets/Contents.json b/Sources/Resources/TinkoffID.xcassets/Contents.json similarity index 100% rename from Development/Resources/TinkoffID.xcassets/Contents.json rename to Sources/Resources/TinkoffID.xcassets/Contents.json diff --git a/Development/Resources/TinkoffID.xcassets/logo.imageset/Contents.json b/Sources/Resources/TinkoffID.xcassets/logo.imageset/Contents.json similarity index 100% rename from Development/Resources/TinkoffID.xcassets/logo.imageset/Contents.json rename to Sources/Resources/TinkoffID.xcassets/logo.imageset/Contents.json diff --git a/Development/Resources/TinkoffID.xcassets/logo.imageset/logo.pdf b/Sources/Resources/TinkoffID.xcassets/logo.imageset/logo.pdf similarity index 100% rename from Development/Resources/TinkoffID.xcassets/logo.imageset/logo.pdf rename to Sources/Resources/TinkoffID.xcassets/logo.imageset/logo.pdf diff --git a/Development/Resources/en.lproj/TinkoffID.strings b/Sources/Resources/en.lproj/TinkoffID.strings similarity index 100% rename from Development/Resources/en.lproj/TinkoffID.strings rename to Sources/Resources/en.lproj/TinkoffID.strings diff --git a/Development/Resources/ru.lproj/TinkoffID.strings b/Sources/Resources/ru.lproj/TinkoffID.strings similarity index 100% rename from Development/Resources/ru.lproj/TinkoffID.strings rename to Sources/Resources/ru.lproj/TinkoffID.strings diff --git a/Development/Source/SDK/Builder/TinkoffIDBuilder.swift b/Sources/SDK/Builder/TinkoffIDBuilder.swift similarity index 99% rename from Development/Source/SDK/Builder/TinkoffIDBuilder.swift rename to Sources/SDK/Builder/TinkoffIDBuilder.swift index 93220d7..fed136a 100644 --- a/Development/Source/SDK/Builder/TinkoffIDBuilder.swift +++ b/Sources/SDK/Builder/TinkoffIDBuilder.swift @@ -6,6 +6,7 @@ // import Foundation +import UIKit public final class TinkoffIDBuilder { diff --git a/Development/Source/SDK/Configuration/EnvironmentConfiguration.swift b/Sources/SDK/Configuration/EnvironmentConfiguration.swift similarity index 100% rename from Development/Source/SDK/Configuration/EnvironmentConfiguration.swift rename to Sources/SDK/Configuration/EnvironmentConfiguration.swift diff --git a/Development/Source/SDK/Configuration/TargetAppConfiguration.swift b/Sources/SDK/Configuration/TargetAppConfiguration.swift similarity index 100% rename from Development/Source/SDK/Configuration/TargetAppConfiguration.swift rename to Sources/SDK/Configuration/TargetAppConfiguration.swift diff --git a/Development/Source/SDK/ITinkoffID.swift b/Sources/SDK/ITinkoffID.swift similarity index 100% rename from Development/Source/SDK/ITinkoffID.swift rename to Sources/SDK/ITinkoffID.swift diff --git a/Development/Source/SDK/TinkoffID.swift b/Sources/SDK/TinkoffID.swift similarity index 100% rename from Development/Source/SDK/TinkoffID.swift rename to Sources/SDK/TinkoffID.swift diff --git a/Development/Source/UI/Button/TinkoffIDButton.swift b/Sources/UI/Button/TinkoffIDButton.swift similarity index 99% rename from Development/Source/UI/Button/TinkoffIDButton.swift rename to Sources/UI/Button/TinkoffIDButton.swift index c81febd..d223ef7 100644 --- a/Development/Source/UI/Button/TinkoffIDButton.swift +++ b/Sources/UI/Button/TinkoffIDButton.swift @@ -5,7 +5,7 @@ // Created by Dmitry on 17.12.2020. // -import Foundation +import UIKit final class TinkoffIDButton: UIButton { diff --git a/Development/Source/UI/Button/TinkoffIDButtonBuilder.swift b/Sources/UI/Button/TinkoffIDButtonBuilder.swift similarity index 97% rename from Development/Source/UI/Button/TinkoffIDButtonBuilder.swift rename to Sources/UI/Button/TinkoffIDButtonBuilder.swift index 6387c19..092faae 100644 --- a/Development/Source/UI/Button/TinkoffIDButtonBuilder.swift +++ b/Sources/UI/Button/TinkoffIDButtonBuilder.swift @@ -5,7 +5,7 @@ // Created by Dmitry on 18.12.2020. // -import Foundation +import UIKit /// Стиль кнопки входа public enum TinkoffIDButtonStyle { diff --git a/TinkoffID.podspec b/TinkoffID.podspec index e480de5..7ffd290 100644 --- a/TinkoffID.podspec +++ b/TinkoffID.podspec @@ -8,10 +8,8 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/tinkoff-mobile-tech/TinkoffID.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.swift_version = '5.0' - s.source_files = 'Development/Source/**/*' - s.resource_bundles = { - 'TinkoffIdResources' => ['Development/Resources/**/*.{strings,xcassets}'] - } + s.source_files = 'Sources/**/*.swift' + s.resources = 'Sources/**/*.{xcassets,lproj}' s.test_spec 'Tests' do |test_spec| test_spec.source_files = 'Tests/**/*.{swift}' From d1ead1ce19a1c397d71658b192de397bc85aa81f Mon Sep 17 00:00:00 2001 From: Dmitry Overchuk Date: Mon, 25 Jan 2021 15:38:22 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e06cdbd..e3ee16b 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,16 @@ ## Установка -TinkoffID доступен через [CocoaPods](https://cocoapods.org). Для установки просто добавьте следующую строчку в ваш `Podfile`: +### Swift Package Manager +`TinkoffID` поддерживает Swift Package Manager. Инструкцию по настройке SPM для вашего проекта можно найти [здесь](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app). +После настройки проекта просто добавьте ссылку на репозиторий как зависимость: + +``` +https://github.com/tinkoff-mobile-tech/TinkoffID-iOS +``` + +### Cocoapods +Для установки `TinkoffID` с помощью [CocoaPods](https://cocoapods.org) необходимо добавить следующую строчку в ваш `Podfile`: ```ruby pod 'TinkoffID'