diff --git a/Cartfile b/Cartfile index 96c5d86..8beba06 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "krzyzanowskim/CryptoSwift" -github "TouchInstinct/LeadKit" "0.9.15" +github "TouchInstinct/LeadKit" "carthage_without_binary" github "petropavel13/SwiftValidator" diff --git a/Cartfile.resolved b/Cartfile.resolved index 057f7d1..6b5032f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,9 +1,10 @@ -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/Alamofire/Alamofire.json" "4.8.1" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxAlamofire/RxAlamofire.json" "4.3.0" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json" "4.5.0" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json" "6.0.3" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/TableKit/TableKit.json" "2.10008.1" -binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json" "1.1.0" -github "TouchInstinct/LeadKit" "0.9.15" +github "Alamofire/Alamofire" "4.9.1" +github "ReactiveX/RxSwift" "4.5.0" +github "RxSwiftCommunity/RxAlamofire" "4.5.0" +github "SnapKit/SnapKit" "4.2.0" +github "TouchInstinct/LeadKit" "1f6370fd73c79aea1dcc5f7e831ed58be834e7b7" +github "TouchInstinct/TableKit" "2.10008.1" github "krzyzanowskim/CryptoSwift" "1.3.0" +github "malcommac/SwiftDate" "6.1.0" github "petropavel13/SwiftValidator" "5.0.0" +github "pronebird/UIScrollView-InfiniteScroll" "1.1.0" diff --git a/LeadKitAdditions.xcodeproj/project.pbxproj b/LeadKitAdditions.xcodeproj/project.pbxproj index 1d65acf..9a328f7 100644 --- a/LeadKitAdditions.xcodeproj/project.pbxproj +++ b/LeadKitAdditions.xcodeproj/project.pbxproj @@ -369,7 +369,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "CONFIG_PATH=${PROJECT_DIR}/build-scripts/xcode/.swiftlint.yml\n\nif which swiftlint >/dev/null; then\nswiftlint autocorrect --path Sources --config ${CONFIG_PATH} && swiftlint --path Sources --config ${CONFIG_PATH}\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + shellScript = "CONFIG_PATH=${PROJECT_DIR}/build-scripts/xcode/.swiftlint.yml\n\n. ${PROJECT_DIR}/download_swiftlint.sh\n\n${PROJECT_DIR}/Downloads/swiftlint autocorrect --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH} && swiftlint --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH}\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/download_swiftlint.sh b/download_swiftlint.sh new file mode 100644 index 0000000..b731b36 --- /dev/null +++ b/download_swiftlint.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +SWIFTLINT_VERSION=0.31.0 +SWIFTLINT_PORTABLE_FILENAME=portable_swiftlint.zip + +SWIFTLINT_PORTABLE_URL=https://github.com/realm/SwiftLint/releases/download/${SWIFTLINT_VERSION}/${SWIFTLINT_PORTABLE_FILENAME} + +rm ${PROJECT_DIR}/Downloads/${SWIFTLINT_PORTABLE_FILENAME} + +. ${PROJECT_DIR}/build-scripts/xcode/aux_scripts/download_file.sh ${SWIFTLINT_PORTABLE_FILENAME} ${SWIFTLINT_PORTABLE_URL} + +cd Downloads && unzip -o ${SWIFTLINT_PORTABLE_FILENAME} \ No newline at end of file