Use same indentation for witness.gradle in AS and script.

This commit is contained in:
akwizgran
2023-09-29 12:05:19 +01:00
parent ea1c58110f
commit f683d4f3a9
13 changed files with 621 additions and 621 deletions

View File

@@ -28,15 +28,11 @@
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" /> <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
</JavaCodeStyleSettings> </JavaCodeStyleSettings>
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value />
</option>
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings> </JetCodeStyleSettings>
<codeStyleSettings language="Groovy"> <codeStyleSettings language="Groovy">
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="true" /> <option name="USE_TAB_CHARACTER" value="true" />
<option name="SMART_TABS" value="true" /> <option name="SMART_TABS" value="true" />
</indentOptions> </indentOptions>

View File

@@ -48,7 +48,8 @@ buildscript {
} }
} }
if ((project.hasProperty("briar.mailbox_integration_tests") && project.property("briar.mailbox_integration_tests") == "true") if ((project.hasProperty("briar.mailbox_integration_tests")
&& project.property("briar.mailbox_integration_tests") == "true")
|| System.env.MAILBOX_INTEGRATION_TESTS) { || System.env.MAILBOX_INTEGRATION_TESTS) {
configure([project(':mailbox-core'), project(':mailbox-lib')]) { configure([project(':mailbox-core'), project(':mailbox-lib')]) {
apply from: "../gradle/variables.gradle" apply from: "../gradle/variables.gradle"

View File

@@ -22,5 +22,8 @@ done
for project in ${PROJECTS[@]} for project in ${PROJECTS[@]}
do do
echo "Calculating new checksums for ${project} ..." echo "Calculating new checksums for ${project} ..."
./gradlew -q --configure-on-demand ${project}:calculateChecksums | grep -v '^\(Skipping\|Verifying\|Welcome to Gradle\)' > ${project}/witness.gradle ./gradlew -q --configure-on-demand ${project}:calculateChecksums \
| grep -v '^\(Skipping\|Verifying\|Welcome to Gradle\)' \
| sed "s/ /\t/g" \
> ${project}/witness.gradle
done done