Skip to content

Commit a6e322e

Browse files
committed
Deal with project-swiftlint for Unit tests
1 parent 06a2e20 commit a6e322e

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

SwiftLint/copy-and-run-swiftlint-config.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,19 @@ if [ $isFramework = true ]; then
239239
mv "$tmpFile.frameworks" "$tmpFile"
240240

241241
if [ -e "$projectDir/Unit-Tests" ]; then
242-
cp "swiftlint+frameworksUnitTest.yml" "$projectDir/Unit-Tests/.swiftlint.yml"
242+
if [ -f "$projectDir/Unit-Tests/.project-swiftlint.yml" ]; then
243+
rm "$projectDir/Unit-Tests/.swiftlint.yml"
244+
merge_swiftlint_configuration "$projectDir/Unit-Tests/.project-swiftlint.yml" "swiftlint+frameworksUnitTest.yml" "--write-to-file" "$projectDir/Unit-Tests/.swiftlint.yml"
245+
else
246+
cp "swiftlint+frameworksUnitTest.yml" "$projectDir/Unit-Tests/.swiftlint.yml"
247+
fi
243248
elif [ -e "$projectDir/UnitTests" ]; then
244-
cp "swiftlint+frameworksUnitTest.yml" "$projectDir/UnitTests/.swiftlint.yml"
249+
if [ -f "$projectDir/UnitTests/.project-swiftlint.yml" ]; then
250+
rm "$projectDir/UnitTests/.swiftlint.yml"
251+
merge_swiftlint_configuration "$projectDir/UnitTests/.project-swiftlint.yml" "swiftlint+frameworksUnitTest.yml" "--write-to-file" "$projectDir/UnitTests/.swiftlint.yml"
252+
else
253+
cp "swiftlint+frameworksUnitTest.yml" "$projectDir/UnitTests/.swiftlint.yml"
254+
fi
245255
fi
246256
fi
247257

0 commit comments

Comments
 (0)