Skip to content

Commit

Permalink
Update MGAPIService pod
Browse files Browse the repository at this point in the history
  • Loading branch information
tuan188 committed Sep 6, 2020
1 parent 1696354 commit 51fe472
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 40 deletions.
8 changes: 4 additions & 4 deletions CleanArchitecture.xcodeproj/project.pbxproj
Expand Up @@ -1781,7 +1781,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 12;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
Expand All @@ -1795,7 +1795,7 @@
INFOPLIST_FILE = CleanArchitecture/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.framgia.CleanArchitecture;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "CleanArchitecture/Bridging-Header.h";
Expand All @@ -1811,7 +1811,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 12;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
Expand All @@ -1825,7 +1825,7 @@
INFOPLIST_FILE = CleanArchitecture/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 5.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.framgia.CleanArchitecture;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "CleanArchitecture/Bridging-Header.h";
Expand Down
2 changes: 1 addition & 1 deletion CleanArchitecture/Data/API/API+Product.swift
Expand Up @@ -20,7 +20,7 @@ extension API {
init() {
super.init(urlString: API.Urls.getProductList,
parameters: nil,
requestType: .get,
method: .get,
requireAccessToken: true)
}
}
Expand Down
2 changes: 1 addition & 1 deletion CleanArchitecture/Data/API/API+Repo.swift
Expand Up @@ -25,7 +25,7 @@ extension API {
]
super.init(urlString: API.Urls.getRepoList,
parameters: params,
requestType: .get,
method: .get,
requireAccessToken: true)
}
}
Expand Down
4 changes: 2 additions & 2 deletions CleanArchitecture/Data/API/APIInput.swift
Expand Up @@ -11,11 +11,11 @@ import Alamofire
class APIInput: APIInputBase { // swiftlint:disable:this final_class
override init(urlString: String,
parameters: [String: Any]?,
requestType: HTTPMethod,
method: HTTPMethod,
requireAccessToken: Bool) {
super.init(urlString: urlString,
parameters: parameters,
requestType: requestType,
method: method,
requireAccessToken: requireAccessToken)
self.headers = [
"Content-Type": "application/json; charset=utf-8",
Expand Down
2 changes: 1 addition & 1 deletion CleanArchitecture/Data/Gateways/RepoGateway.swift
Expand Up @@ -17,7 +17,7 @@ struct RepoGateway: RepoGatewayType {
let (page, perPage, usingCache) = (dto.page, dto.perPage, dto.usingCache)

let input = API.GetRepoListInput(page: page, perPage: perPage)
input.useCache = usingCache
input.usingCache = usingCache

return API.shared.getRepoList(input)
.map { $0.repos }
Expand Down
2 changes: 1 addition & 1 deletion CleanArchitecture/Scenes/Repos/ReposNavigator.swift
Expand Up @@ -22,7 +22,7 @@ struct ReposNavigator: ReposNavigatorType {
}

func toRepoDetail(repo: Repo) {

print(#function)
}

func toRepoCollection() {
Expand Down
4 changes: 2 additions & 2 deletions CleanArchitecture/Scenes/Storyboards/Repo.storyboard
Expand Up @@ -48,7 +48,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="eB0-Db-WEZ" customClass="PagingCollectionView" customModule="CleanArchitecture" customModuleProvider="target">
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="eB0-Db-WEZ" customClass="PagingCollectionView" customModule="MGLoadMore">
<rect key="frame" x="0.0" y="44" width="375" height="623"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="AyF-2b-CqM">
Expand All @@ -72,7 +72,7 @@
<navigationItem key="navigationItem" id="vpZ-79-hch"/>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
<connections>
<outlet property="collectionView" destination="eB0-Db-WEZ" id="cfj-Er-Ra3"/>
<outlet property="collectionView" destination="eB0-Db-WEZ" id="7yd-Cj-lro"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KQl-W0-F8V" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down
8 changes: 3 additions & 5 deletions Podfile
@@ -1,9 +1,9 @@
platform :ios, '9.0'
platform :ios, '10.0'

def pods
# Clean Architecture
pod 'MGArchitecture', '~> 2.0.0'
pod 'MGAPIService', '~> 2.2.1'
pod 'MGArchitecture', '~> 2.0.1'
pod 'MGAPIService', '~> 3.0.0'
pod 'MGLoadMore', '~> 2.0.0'
pod 'Dto'

Expand All @@ -13,10 +13,8 @@ def pods
pod 'RxViewController'

# Core
pod 'ObjectMapper', '~> 3.5'
pod 'Reusable', '~> 4.1'
pod 'Then', '~> 2.7'
pod 'MJRefresh', '~> 3.4.3'

# Others
pod 'MagicalRecord', '2.3.0'
Expand Down
44 changes: 21 additions & 23 deletions Podfile.lock
@@ -1,23 +1,23 @@
PODS:
- ActionSheetPicker-3.0 (2.3.0)
- Alamofire (4.9.1)
- Alamofire (5.2.2)
- Differentiator (4.0.1)
- Dto (0.1.0):
- ValidatedPropertyKit (~> 0.0.4)
- MagicalRecord (2.3.0)
- MBProgressHUD (1.2.0)
- MGAPIService (2.2.1):
- ObjectMapper (~> 3.5)
- RxAlamofire (~> 5.1)
- MGAPIService (3.0.0):
- ObjectMapper (~> 4.2)
- RxAlamofire (~> 5.6)
- RxSwift (~> 5.1)
- MGArchitecture (2.0.0):
- MGArchitecture (2.0.1):
- RxCocoa (~> 5.1)
- RxSwift (~> 5.1)
- MGLoadMore (2.0.0):
- MJRefresh (~> 3.2)
- RxCocoa (~> 5.1)
- RxSwift (~> 5.1)
- MJRefresh (3.4.3)
- MJRefresh (3.5.0)
- Mockingjay (2.0.1):
- Mockingjay/Core (= 2.0.1)
- Mockingjay/XCTest (= 2.0.1)
Expand All @@ -26,17 +26,17 @@ PODS:
- Mockingjay/Core
- "NSObject+Rx (5.1.0)":
- RxSwift (~> 5.1)
- ObjectMapper (3.5.3)
- ObjectMapper (4.2.0)
- Reusable (4.1.1):
- Reusable/Storyboard (= 4.1.1)
- Reusable/View (= 4.1.1)
- Reusable/Storyboard (4.1.1)
- Reusable/View (4.1.1)
- RxAlamofire (5.1.0):
- RxAlamofire/Core (= 5.1.0)
- RxAlamofire/Core (5.1.0):
- Alamofire (~> 4.8)
- RxSwift (~> 5.0)
- RxAlamofire (5.6.1):
- RxAlamofire/Core (= 5.6.1)
- RxAlamofire/Core (5.6.1):
- Alamofire (~> 5.2)
- RxSwift (~> 5.1)
- RxBlocking (5.1.1):
- RxSwift (~> 5)
- RxCocoa (5.1.1):
Expand Down Expand Up @@ -65,13 +65,11 @@ DEPENDENCIES:
- Dto
- MagicalRecord (= 2.3.0)
- MBProgressHUD (~> 1.2)
- MGAPIService (~> 2.2.1)
- MGArchitecture (~> 2.0.0)
- MGAPIService (~> 3.0.0)
- MGArchitecture (~> 2.0.1)
- MGLoadMore (~> 2.0.0)
- MJRefresh (~> 3.4.3)
- Mockingjay (from `https://github.com/anhnc55/Mockingjay.git`, branch `swift_5`)
- "NSObject+Rx (~> 5.1)"
- ObjectMapper (~> 3.5)
- Reusable (~> 4.1)
- RxBlocking (~> 5.1)
- RxDataSources (~> 4.0)
Expand Down Expand Up @@ -119,20 +117,20 @@ CHECKOUT OPTIONS:

SPEC CHECKSUMS:
ActionSheetPicker-3.0: eef157d75e151f255c5333d26656c7fbfe905a51
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
Alamofire: 814429acc853c6c54ff123fc3d2ef66803823ce0
Differentiator: 886080237d9f87f322641dedbc5be257061b0602
Dto: a17939b7ab00e836040a531a42f517ce7fd527aa
MagicalRecord: 89eb7d7ead39fb37f01c3d010665ee94d17f8dba
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
MGAPIService: 2ea8217d3bb8cde33bf47e6579882a73a9cccebb
MGArchitecture: 03e7e2ebd65575afd028016b8952ed306af44d15
MGAPIService: 83684387a742af98b944f5badfa566cc2e146318
MGArchitecture: 7d586fc5fe15c3fa86dc06b0e6a06d7aafbf8051
MGLoadMore: 2a8732f6a0c26cfe972353a97de5afced8a55f8b
MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
MJRefresh: 6afc955813966afb08305477dd7a0d9ad5e79a16
Mockingjay: 0660815ee4907b2f0c1ac988126061bb3e19b7aa
"NSObject+Rx": fa6bbcc1ab1faa06b01466bc09b1e0692bbc5946
ObjectMapper: 97111c97e054a6ee25917662106689f0b4127b37
ObjectMapper: 1eb41f610210777375fa806bf161dc39fb832b81
Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
RxAlamofire: a2d7621de4c23a0c6e7b476b504acc32838ee341
RxAlamofire: 0531dddf378c84270e97e897333678f1cfaec3ba
RxBlocking: 5f700a78cad61ce253ebd37c9a39b5ccc76477b4
RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
Expand All @@ -144,6 +142,6 @@ SPEC CHECKSUMS:
Then: acfe0be7e98221c6204e12f8161459606d5d822d
ValidatedPropertyKit: 599b32854be66b3eea55c0ad7aa22c52cba4b997

PODFILE CHECKSUM: 1dec47e1af309eaaf70e084bdbc525e487110576
PODFILE CHECKSUM: b1acaab20afec7a1bab032abb0d39880f952ae3d

COCOAPODS: 1.9.3

0 comments on commit 51fe472

Please sign in to comment.