Reformat code

This commit is contained in:
AsamK 2021-06-12 08:53:37 +02:00
parent 795b73df87
commit d1e760f447
6 changed files with 130 additions and 140 deletions

View file

@ -1,6 +1,6 @@
name: signal-cli CI name: signal-cli CI
on: [push, pull_request] on: [ push, pull_request ]
jobs: jobs:
build: build:

View file

@ -2,10 +2,10 @@ name: "CodeQL"
on: on:
push: push:
branches: [master, ] branches: [ master ]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [master] branches: [ master ]
schedule: schedule:
- cron: '0 7 * * 4' - cron: '0 7 * * 4'

View file

@ -29,22 +29,7 @@
<option name="JD_P_AT_EMPTY_LINES" value="false" /> <option name="JD_P_AT_EMPTY_LINES" value="false" />
</JavaCodeStyleSettings> </JavaCodeStyleSettings>
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS"> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
<value>
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
</JetCodeStyleSettings> </JetCodeStyleSettings>
<XML> <XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@ -74,5 +59,8 @@
<rules /> <rules />
</arrangement> </arrangement>
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>

View file

@ -81,7 +81,8 @@ val assembleNativeImage by tasks.registering {
exec { exec {
workingDir = File(".") workingDir = File(".")
commandLine("$graalVMHome/bin/native-image", commandLine(
"$graalVMHome/bin/native-image",
"-H:Path=$nativeBinaryOutputPath", "-H:Path=$nativeBinaryOutputPath",
"-H:Name=$nativeBinaryName", "-H:Name=$nativeBinaryName",
"-H:JNIConfigurationFiles=graalvm-config-dir/jni-config.json", "-H:JNIConfigurationFiles=graalvm-config-dir/jni-config.json",
@ -96,7 +97,8 @@ val assembleNativeImage by tasks.registering {
"--enable-all-security-services", "--enable-all-security-services",
"-cp", "-cp",
sourceSets.main.get().runtimeClasspath.asPath, sourceSets.main.get().runtimeClasspath.asPath,
application.mainClass.get()) application.mainClass.get()
)
} }
} }
} }

View file

@ -9,7 +9,8 @@ import org.gradle.api.artifacts.Dependency
class CheckLibVersionsPlugin : Plugin<Project> { class CheckLibVersionsPlugin : Plugin<Project> {
override fun apply(project: Project) { override fun apply(project: Project) {
project.task("checkLibVersions") { project.task("checkLibVersions") {
description = "Find any 3rd party libraries which have released new versions to the central Maven repo since we last upgraded." description =
"Find any 3rd party libraries which have released new versions to the central Maven repo since we last upgraded."
doLast { doLast {
project.configurations.flatMap { it.allDependencies } project.configurations.flatMap { it.allDependencies }
.toSet() .toSet()

View file

@ -57,8 +57,8 @@ function link() {
LINK_CODE_FILE="$PATH_TEST_CONFIG/link_code" LINK_CODE_FILE="$PATH_TEST_CONFIG/link_code"
rm -f "$LINK_CODE_FILE" rm -f "$LINK_CODE_FILE"
mkfifo "$LINK_CODE_FILE" mkfifo "$LINK_CODE_FILE"
run_linked link -n "test-device" > "$LINK_CODE_FILE" & run_linked link -n "test-device" >"$LINK_CODE_FILE" &
read LINK_CODE < "$LINK_CODE_FILE" read LINK_CODE <"$LINK_CODE_FILE"
run_main -u "$NUMBER" addDevice --uri "$LINK_CODE" run_main -u "$NUMBER" addDevice --uri "$LINK_CODE"
wait wait
run_linked -u "$NUMBER" send --note-to-self -m hi run_linked -u "$NUMBER" send --note-to-self -m hi
@ -128,7 +128,6 @@ done
## Profile ## Profile
run_main -u "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE run_main -u "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE
## Provisioning ## Provisioning
link "$NUMBER_1" link "$NUMBER_1"
link "$NUMBER_2" link "$NUMBER_2"