From 1b11ff816ad2ab6804e1c323141a1204be34f440 Mon Sep 17 00:00:00 2001 From: Craig Holliday Date: Sun, 5 Nov 2017 14:51:50 -0600 Subject: [PATCH] Hot Fix 1.2.1 (#42) * v1.2 App Store Release (#39) * Refactor To MVVM (#29) * Reworking classes and adding repositories * Update repository * ViewModelController and Repos are working * Lots of additions and reworking of views - Fixes for repositories - 60fps scrolling - Fixed html encodings - Started switching out some view controllers for cleaner versions * Fixed FilterObject * Fix recommened api request * Added remoteCommandManager toggle change playback position Fix for this issue: https://github.com/SoftwareEngineeringDaily/se-daily-iOS/issues/25 * Build for beta and fixed CollectionView Layout scaling * fixed audio view label * Clean up clean up Fixed User Model Fixed repos and search controller Deleted a lot of old code * Removed and cleaned up code/files Also fixed search controller since there was an issue with calling the api too many times after we returned 0 results * Reworking classes and adding repositories * Update repository * ViewModelController and Repos are working * Lots of additions and reworking of views - Fixes for repositories - 60fps scrolling - Fixed html encodings - Started switching out some view controllers for cleaner versions * Fixed FilterObject * Fix recommened api request * Added remoteCommandManager toggle change playback position Fix for this issue: https://github.com/SoftwareEngineeringDaily/se-daily-iOS/issues/25 * Build for beta and fixed CollectionView Layout scaling * fixed audio view label * Clean up clean up Fixed User Model Fixed repos and search controller Deleted a lot of old code * Removed and cleaned up code/files Also fixed search controller since there was an issue with calling the api too many times after we returned 0 results * After rebase with a few fixes * Remove comment * Review Fixes * Removed Kingfisher in favor for SDWebImage This looks to fix a memory issue with Kingfisher caching all the images and using a lot of memory. * Fixed models and voting on header view * Forgot to push this pod update * Fixed tab bar not selecting first index on load. Fixed Image caching * Fix skeletonCollectionView stopping when leaving a view * 1.2 beta build 11 * v1.2 build 12 * v1.2 build 13 * updated podfile/fix for responsive ui --- Podfile | 44 ++++++------ Podfile.lock | 96 ++++++++++++++------------- SEDaily-IOS.xcodeproj/project.pbxproj | 4 +- SEDaily-IOS/Info.plist | 4 +- SEDaily-IOSTests/Info.plist | 2 +- 5 files changed, 77 insertions(+), 73 deletions(-) diff --git a/Podfile b/Podfile index b699266..04c07cb 100644 --- a/Podfile +++ b/Podfile @@ -6,29 +6,31 @@ target 'SEDaily-IOS' do use_frameworks! # Pods for SEDaily-IOS - pod 'Alamofire' pod 'ActiveLabel', :git => 'https://github.com/optonaut/ActiveLabel.swift.git' - pod 'Crashlytics' - pod 'Disk' - pod 'Eureka' - pod 'Fabric' - pod 'IQKeyboardManagerSwift' - pod 'KoalaTeaFlowLayout' - pod 'KoalaTeaPlayer' - pod 'KTResponsiveUI' - pod 'Reusable' - pod 'SDWebImage' - pod 'SideMenu' - pod 'Skeleton' - pod 'SnapKit' - pod 'SwiftyBeaver' - pod 'SwifterSwift' + pod 'Alamofire', '~> 4.5.1' + pod 'Crashlytics', '~> 3.9.3' + pod 'Disk', '~> 0.3.1' + pod 'Eureka', '~> 4.0.1' + pod 'Fabric', '~> 1.7.2' + pod 'IQKeyboardManagerSwift', '~> 5.0.5' + pod 'KTResponsiveUI', '~> 0.2.4' + pod 'KoalaTeaFlowLayout', '~> 0.3.1' + pod 'KoalaTeaPlayer', '~> 0.1.7' + pod 'Pageboy', '~> 2.0.2' + pod 'PureLayout', '~> 3.0.2' + pod 'Reusable', '~> 4.0.0' + pod 'SDWebImage', '~> 4.2.1' + pod 'SideMenu', '~> 3.1.4' + pod 'Skeleton', '~> 0.1.0' + pod 'SnapKit', '~> 4.0.0' + pod 'SwiftGen', '~> 5.2.1' pod 'SwiftIcons', :git => 'https://github.com/themisterholliday/SwiftIcons.git', :branch => 'swift-4' - pod 'SwiftGen' - pod 'SwiftSoup' - pod 'SwiftyJSON' - pod 'Tabman' - pod 'UIFontComplete' + pod 'SwiftSoup', '~> 1.5.8' + pod 'SwifterSwift', '~> 4.0.1' + pod 'SwiftyBeaver', '~> 1.4.2' + pod 'SwiftyJSON', '~> 3.1.4' + pod 'Tabman', '~> 1.0.5' + pod 'UIFontComplete', '~> 2.0.1' target 'SEDaily-IOSTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index ff40ab0..8ca7b3d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,27 +1,27 @@ PODS: - ActiveLabel (0.7.1) - Alamofire (4.5.1) - - Crashlytics (3.9.0): - - Fabric (~> 1.7.0) + - Crashlytics (3.9.3): + - Fabric (~> 1.7.2) - Disk (0.3.1) - Eureka (4.0.1) - - Fabric (1.7.0) - - IQKeyboardManagerSwift (5.0.3) + - Fabric (1.7.2) + - IQKeyboardManagerSwift (5.0.5) - KoalaTeaFlowLayout (0.3.1) - - KoalaTeaPlayer (0.1.6) - - KTResponsiveUI (0.2.3): + - KoalaTeaPlayer (0.1.7) + - KTResponsiveUI (0.2.4): - SwiftIcons - - Pageboy (2.0.0) + - Pageboy (2.0.2) - PureLayout (3.0.2) - Reusable (4.0.0): - Reusable/Storyboard (= 4.0.0) - Reusable/View (= 4.0.0) - Reusable/Storyboard (4.0.0) - Reusable/View (4.0.0) - - SDWebImage (4.1.2): - - SDWebImage/Core (= 4.1.2) - - SDWebImage/Core (4.1.2) - - SideMenu (3.1.1) + - SDWebImage (4.2.1): + - SDWebImage/Core (= 4.2.1) + - SDWebImage/Core (4.2.1) + - SideMenu (3.1.4) - Skeleton (0.1.0) - SnapKit (4.0.0) - SwifterSwift (4.0.1): @@ -37,40 +37,42 @@ PODS: - SwifterSwift/Foundation (4.0.1) - SwifterSwift/SwiftStdlib (4.0.1) - SwifterSwift/UIKit (4.0.1) - - SwiftGen (5.1.2) + - SwiftGen (5.2.1) - SwiftIcons (1.5.1) - - SwiftSoup (1.5.4) + - SwiftSoup (1.5.8) - SwiftyBeaver (1.4.2) - SwiftyJSON (3.1.4) - - Tabman (1.0.3): + - Tabman (1.0.5): - Pageboy (~> 2.0.0) - PureLayout (~> 3.0.0) - UIFontComplete (2.0.1) DEPENDENCIES: - ActiveLabel (from `https://github.com/optonaut/ActiveLabel.swift.git`) - - Alamofire - - Crashlytics - - Disk - - Eureka - - Fabric - - IQKeyboardManagerSwift - - KoalaTeaFlowLayout - - KoalaTeaPlayer - - KTResponsiveUI - - Reusable - - SDWebImage - - SideMenu - - Skeleton - - SnapKit - - SwifterSwift - - SwiftGen + - Alamofire (~> 4.5.1) + - Crashlytics (~> 3.9.3) + - Disk (~> 0.3.1) + - Eureka (~> 4.0.1) + - Fabric (~> 1.7.2) + - IQKeyboardManagerSwift (~> 5.0.4) + - KoalaTeaFlowLayout (~> 0.3.1) + - KoalaTeaPlayer (~> 0.1.7) + - KTResponsiveUI (~> 0.2.4) + - Pageboy (~> 2.0.2) + - PureLayout (~> 3.0.2) + - Reusable (~> 4.0.0) + - SDWebImage (~> 4.2.1) + - SideMenu (~> 3.1.4) + - Skeleton (~> 0.1.0) + - SnapKit (~> 4.0.0) + - SwifterSwift (~> 4.0.1) + - SwiftGen (~> 5.2.1) - SwiftIcons (from `https://github.com/themisterholliday/SwiftIcons.git`, branch `swift-4`) - - SwiftSoup - - SwiftyBeaver - - SwiftyJSON - - Tabman - - UIFontComplete + - SwiftSoup (~> 1.5.6) + - SwiftyBeaver (~> 1.4.2) + - SwiftyJSON (~> 3.1.4) + - Tabman (~> 1.0.5) + - UIFontComplete (~> 2.0.1) EXTERNAL SOURCES: ActiveLabel: @@ -90,30 +92,30 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: ActiveLabel: faa96b5f50507770536a3e48a4cf291ee88fb7db Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a - Crashlytics: 64aad5dd97249dd3ff94b979fea140144590cdd3 + Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c Disk: 64f0f95a4163314aba6f09f010f17de964762140 Eureka: c8bd5cc07143b6f66268c208d28a246c99b41955 - Fabric: e6be012366472553807dada21243c5ab8d904151 - IQKeyboardManagerSwift: e257e513744cf32123eca7061272acea0246fc83 + Fabric: 9cd6a848efcf1b8b07497e0b6a2e7d336353ba15 + IQKeyboardManagerSwift: ee393093cfb41069a72584a8f599ba5519a7febe KoalaTeaFlowLayout: 219c45709d0873d405b2de1b27080a9c411246b7 - KoalaTeaPlayer: f160b122c1c3f877682ba12518b0e9c2e41f887f - KTResponsiveUI: 6e17f26edb8ccefd935b14de8775e0d97e7ef380 - Pageboy: a43a4e34fad98ebfa415a5d33cd0389e5005a101 + KoalaTeaPlayer: 52b9f24cf3730099164e06767e5d480b0532064e + KTResponsiveUI: 34a7f474fe9fcb8d99597b162b4ad5ca5d56342b + Pageboy: d5b9fe9a59202674c44111e513e67ccc680e18b7 PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd Reusable: 98e5fff1e0e2e00872199699b276dde08ee56c07 - SDWebImage: cb6f9f266a9977741efcbc21e618e8be3734c774 - SideMenu: 1bf32e90afaa2dc0e0ab68e938a0ff85014c4217 + SDWebImage: 1fa4c9edf525b744f002db89f3f5a38b3cd4c541 + SideMenu: 99021e70b3f2eee65b5dd88e4274d09031b1221e Skeleton: b76249b7d6a73a9913e164c8030647a3e005c700 SnapKit: a42d492c16e80209130a3379f73596c3454b7694 SwifterSwift: 5f406a5f831343312d6d5b34282b57ef3f52c40b - SwiftGen: dd2892e7fb008151f30e6ce0cf465b8b8d89e80e + SwiftGen: 444b4c467e512a4812b8a800d731643fd265139e SwiftIcons: b20641adce6b71fcb2e72389b4b5f2e87252df99 - SwiftSoup: f8e924cd65a1d74eb7ba1b6f0a9a61feacaff690 + SwiftSoup: 86a1f5ad07b7e3d14ab1a9324a58c75ae2215e79 SwiftyBeaver: 91057725648ee4980308f1650af077d04b3654a0 SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220 - Tabman: f922ae6412f482234b58213f51caa5f0549a5949 + Tabman: 9f87244fdbbd070fe6a518f445880b2b4a56ea1b UIFontComplete: 7e3ce7f0a12d2529fb07f537e262aabfa87df280 -PODFILE CHECKSUM: 649ceef84ecfcef810f531508569460e85464ae8 +PODFILE CHECKSUM: e649cc76c00874f9e66c64ebc934a8e08528822d COCOAPODS: 1.3.1 diff --git a/SEDaily-IOS.xcodeproj/project.pbxproj b/SEDaily-IOS.xcodeproj/project.pbxproj index db3f6f3..0920655 100644 --- a/SEDaily-IOS.xcodeproj/project.pbxproj +++ b/SEDaily-IOS.xcodeproj/project.pbxproj @@ -808,7 +808,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = 6TY8WC8WPP; INFOPLIST_FILE = "SEDaily-IOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -827,7 +827,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = 6TY8WC8WPP; INFOPLIST_FILE = "SEDaily-IOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/SEDaily-IOS/Info.plist b/SEDaily-IOS/Info.plist index c8366e7..deca87d 100644 --- a/SEDaily-IOS/Info.plist +++ b/SEDaily-IOS/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2 + 1.2.1 CFBundleVersion - 12 + 13 Fabric APIKey diff --git a/SEDaily-IOSTests/Info.plist b/SEDaily-IOSTests/Info.plist index 957fa26..cb626a5 100644 --- a/SEDaily-IOSTests/Info.plist +++ b/SEDaily-IOSTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 12 + 13