File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
246256fi
247257
You can’t perform that action at this time.
0 commit comments