Skip to content

Commit

Permalink
Обновление подов
Browse files Browse the repository at this point in the history
  • Loading branch information
@SergeyKrupov
SergeyKrupov committed Sep 21, 2019
1 parent 4b79c1b commit c5f9a7b
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 98 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ source "https://rubygems.org"

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

gem 'cocoapods', '~> 1.5.3'
gem 'cocoapods', '~> 1.7.5'
gem 'generamba', github: 'strongself/Generamba', :branch => 'develop'
50 changes: 25 additions & 25 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
GIT
remote: https://github.com/strongself/Generamba
revision: 4c450efc3ea63dd34fa04206194813dbb021441e
revision: 615354cce55d00de253bea93d6808665e785c4e8
branch: develop
specs:
generamba (1.4.1)
cocoapods-core (= 1.5.3)
generamba (1.6.0)
cocoapods-core (>= 1.4.0, < 2.0.0)
git (= 1.2.9.1)
liquid (= 4.0.0)
terminal-table (= 1.4.5)
thor (= 0.19.1)
xcodeproj (= 1.6.0)
xcodeproj (>= 1.6.0, < 2.0.0)

GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.11)
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.5.3)
claide (1.0.3)
cocoapods (1.7.5)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-core (= 1.7.5)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.5)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
cocoapods-trunk (1.4.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
escape (0.0.4)
fourflusher (2.0.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.2.9.1)
Expand All @@ -70,13 +70,13 @@ GEM
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.3.1)
ruby-macho (1.4.0)
terminal-table (1.4.5)
thor (0.19.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.6.0)
xcodeproj (1.12.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -87,8 +87,8 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.5.3)
cocoapods (~> 1.7.5)
generamba!

BUNDLED WITH
1.17.3
2.0.2
10 changes: 5 additions & 5 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ target 'Weather' do

use_frameworks!

pod 'RxSwift', '~> 4.4.0'
pod 'RxCocoa', '~> 4.4.0'
pod 'RxDataSources', '~> 3.1.0'
pod 'RxSwift', '~> 5.0.0'
pod 'RxCocoa', '~> 5.0.0'
pod 'RxDataSources'
pod 'R.swift', '~> 5.0.0'
pod 'Swinject', '~> 2.5.0'
pod 'Swinject', '~> 2.6.2'
pod 'SwinjectStoryboard', '~> 2.1.0'
pod 'Alamofire', '~> 4.8.1'
pod 'Alamofire', '~> 4.8.2'
pod 'SwiftLint'

target 'WeatherTests' do
Expand Down
67 changes: 34 additions & 33 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
PODS:
- Alamofire (4.8.1)
- Differentiator (3.1.0)
- R.swift (5.0.2):
- Alamofire (4.8.2)
- Differentiator (4.0.1)
- R.swift (5.0.3):
- R.swift.Library (~> 5.0.0)
- R.swift.Library (5.0.0)
- RxAtomic (4.4.0)
- RxCocoa (4.4.0):
- RxSwift (~> 4.0)
- RxDataSources (3.1.0):
- Differentiator (~> 3.0)
- RxCocoa (~> 4.0)
- RxSwift (~> 4.0)
- RxSwift (4.4.0):
- RxAtomic (~> 4.4)
- SwiftLint (0.30.1)
- Swinject (2.5.0)
- R.swift.Library (5.0.1)
- RxCocoa (5.0.0):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxDataSources (4.0.1):
- Differentiator (~> 4.0)
- RxCocoa (~> 5.0)
- RxSwift (~> 5.0)
- RxRelay (5.0.0):
- RxSwift (~> 5)
- RxSwift (5.0.0)
- SwiftLint (0.35.0)
- Swinject (2.6.2)
- SwinjectStoryboard (2.1.0):
- Swinject (~> 2.5)

DEPENDENCIES:
- Alamofire (~> 4.8.1)
- Alamofire (~> 4.8.2)
- R.swift (~> 5.0.0)
- RxCocoa (~> 4.4.0)
- RxDataSources (~> 3.1.0)
- RxSwift (~> 4.4.0)
- RxCocoa (~> 5.0.0)
- RxDataSources
- RxSwift (~> 5.0.0)
- SwiftLint
- Swinject (~> 2.5.0)
- Swinject (~> 2.6.2)
- SwinjectStoryboard (~> 2.1.0)

SPEC REPOS:
Expand All @@ -34,27 +35,27 @@ SPEC REPOS:
- Differentiator
- R.swift
- R.swift.Library
- RxAtomic
- RxCocoa
- RxDataSources
- RxRelay
- RxSwift
- SwiftLint
- Swinject
- SwinjectStoryboard

SPEC CHECKSUMS:
Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
Differentiator: be49ca3408f0ecfc761e4c7763d20c62be01b9ad
R.swift: 81455d81467763cbd3f4d79d938d05f4ac4c0228
R.swift.Library: 0bf390e729bc10bb2c9e4fb78bd043164a7be4ff
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
RxDataSources: a843bad90c29817f5923ec8163f4af2de084ceb3
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7
Swinject: 82cdb851f63f91bba974e3eca1d69780f2f7677e
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
Differentiator: 886080237d9f87f322641dedbc5be257061b0602
R.swift: f5a87643b91ea569d23d6afb3eee9c743edde239
R.swift.Library: cfe85d569d9bae6cb262922db130e7c3a7a5fad1
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
SwiftLint: 5553187048b900c91aa03552807681bb6b027846
Swinject: cf7458774b1b00323080a9c67e47a1ee7f9d2af1
SwinjectStoryboard: 688f096033103e66ffcf6ca678211acd7d7be505

PODFILE CHECKSUM: e07856620ae84e1db1a6b49e1cbfbe41a53da4cf
PODFILE CHECKSUM: 4183189221d8ccd33745ac968c9c5b487bc61975

COCOAPODS: 1.5.3
COCOAPODS: 1.7.5
29 changes: 4 additions & 25 deletions Weather.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,36 +769,15 @@
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Weather/Pods-Weather-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework",
"${BUILT_PRODUCTS_DIR}/R.swift.Library/Rswift.framework",
"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
"${BUILT_PRODUCTS_DIR}/RxDataSources/RxDataSources.framework",
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
"${BUILT_PRODUCTS_DIR}/Swinject/Swinject.framework",
"${BUILT_PRODUCTS_DIR}/SwinjectStoryboard/SwinjectStoryboard.framework",
"${PODS_ROOT}/Target Support Files/Pods-Weather/Pods-Weather-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differentiator.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rswift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxDataSources.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Swinject.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwinjectStoryboard.framework",
"${PODS_ROOT}/Target Support Files/Pods-Weather/Pods-Weather-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Weather/Pods-Weather-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Weather/Pods-Weather-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A534B16E22032C5E00077EC5 /* ShellScript */ = {
Expand Down Expand Up @@ -831,7 +810,7 @@
outputFileListPaths = (
);
outputPaths = (
$SRCROOT/R.generated.swift,
"$SRCROOT/R.generated.swift",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
2 changes: 1 addition & 1 deletion Weather/Modules/Forecast/Interactor/ForecastInteractor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class ForecastInteractor: ForecastInteractorProtocol {
.catchError { .just(.failure($0)) }
}
.asDriver(onErrorDriveWith: .empty())
} ()
}()

func refresh() {
refreshSubject.onNext(())
Expand Down
4 changes: 2 additions & 2 deletions Weather/Modules/Main/Interactor/MainInteractor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ final class MainInteractor: MainInteractorProtocol {
.catchError { error in .just(.failure(error)) }
}
.asDriver(onErrorDriveWith: .empty())
} ()
}()

private(set) lazy var city: Driver<String?> = {
return settingsService.currentCity
.retryWhen(errorHandlingService.retryTrigger)
.catchError { _ in .empty() }
.asDriver(onErrorDriveWith: .empty())
.map { $0.name }
} ()
}()

func refresh() {
refreshSubject.onNext(())
Expand Down
2 changes: 1 addition & 1 deletion Weather/Modules/Root/Interactor/RootInteractor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ final class RootInteractor: RootInteractorProtocol {
private(set) lazy var currentError: Driver<(Error, ErrorResolver)?> = {
return errorResolvingService.errors
.asDriver(onErrorJustReturn: nil)
} ()
}()
}
4 changes: 2 additions & 2 deletions Weather/Modules/Settings/Interactor/SettingsInteractor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ final class SettingsInteractor: SettingsInteractorProtocol {
lazy var cities: Driver<[City]> = {
settingsService.allCities
.asDriver(onErrorDriveWith: .empty())
} ()
}()

lazy var selectedCity: Driver<City> = {
settingsService.currentCity
.asDriver(onErrorDriveWith: .empty())
} ()
}()

var selectedCityIDSink: Binder<Int> {
return Binder(self) { this, identifier in
Expand Down
2 changes: 1 addition & 1 deletion Weather/Services/Settings/SettingsService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ final class SettingsComponent: SettingsService {
}
}
.share(replay: 1, scope: .forever)
} ()
}()

var currentCity: Observable<City> {
return Observable.combineLatest(allCities.asObservable(), selectedСityID.asObserver())
Expand Down
4 changes: 2 additions & 2 deletions Weather/Utils/Utils.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ enum Utils {
formatter.minimumFractionDigits = 1
formatter.minimumIntegerDigits = 1
return formatter
} ()
}()

static let dateFormatter: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.locale = Locale(identifier: "ru_RU")
dateFormatter.dateFormat = "HH:mm, dd MMMM"
return dateFormatter
} ()
}()
}

0 comments on commit c5f9a7b

Please sign in to comment.