TouchInstinct
/
LeadKit
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix swiftlint issues

This commit is contained in:
Ivan Smolin 2020-01-22 14:10:15 +03:00
parent 1f6370fd73
commit 54bb41e5ff
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LeadKit.xcodeproj/project.pbxproj
View File

@ -2300,7 +2300,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = ". run_swiftlint.sh\n";
};
6782BBBC1EB31ED90086E0B8 /* SwiftLint */ = {
isa = PBXShellScriptBuildPhase;
@ -2314,7 +2314,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = ". run_swiftlint.sh\n";
};
6782BBBE1EB31F210086E0B8 /* SwiftLint */ = {
isa = PBXShellScriptBuildPhase;
@ -2328,7 +2328,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = ". run_swiftlint.sh\n";
};
67887A0E1ECC856F008A9E1D /* CopyPaste Detection */ = {
isa = PBXShellScriptBuildPhase;

1
Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift
View File

@ -23,7 +23,6 @@
import RxSwift
/// Data loading model for PaginationDataLoadingState with ResettableRxDataSourceCursor as data source.
// swiftlint:disable:next colon
public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor>:
RxDataLoadingModel<PaginationDataLoadingState<Cursor>> {

2
build-scripts

@ -1 +1 @@
Subproject commit 12f908a01bdb26184a413d6d293ccd14d462645e
Subproject commit 1f83bf5d08bbc2c2346141621a42b2d2e0dd6517

12
download_swiftlint.sh
View File

@ -1,12 +0,0 @@
#!/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}

14
run_swiftlint.sh Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh
readonly CONFIG_PATH=${PROJECT_DIR}/build-scripts/xcode/.swiftlint.yml
readonly SWIFTLINT_VERSION=0.31.0
readonly SWIFTLINT_PORTABLE_FILENAME=portable_swiftlint.zip
readonly SWIFTLINT_PORTABLE_URL=https://github.com/realm/SwiftLint/releases/download/${SWIFTLINT_VERSION}/${SWIFTLINT_PORTABLE_FILENAME}
. build-scripts/xcode/aux_scripts/download_file.sh ${SWIFTLINT_PORTABLE_FILENAME} ${SWIFTLINT_PORTABLE_URL} Downloads --remove-cached
cd Downloads && unzip -o ${SWIFTLINT_PORTABLE_FILENAME}
${PROJECT_DIR}/Downloads/swiftlint autocorrect --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH} && ${PROJECT_DIR}/Downloads/swiftlint --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH}