Update other config files.

This commit is contained in:
Piv
2020-09-12 16:25:43 +09:30
parent c97df7bbaa
commit cbe2a48f0c
4 changed files with 57 additions and 18 deletions

2
.gitignore vendored
View File

@@ -33,3 +33,5 @@ xcuserdata/
.settings .settings
.project .project
.classpath .classpath
.vscode/settings.json

View File

@@ -1,5 +1,23 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<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>
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" />

3
.idea/gradle.xml generated
View File

@@ -11,9 +11,10 @@
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/CarControlleriOS" /> <option value="$PROJECT_DIR$/CarControlleriOS" />
<option value="$PROJECT_DIR$/SwiftyCar" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/car" />
<option value="$PROJECT_DIR$/protobuf" /> <option value="$PROJECT_DIR$/protobuf" />
<option value="$PROJECT_DIR$/pycar" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />

View File

@@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/grpc/grpc-swift.git", "repositoryURL": "https://github.com/grpc/grpc-swift.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "b83ee1ee2caa0660eb02444977b9b6e353c2adbf", "revision": "640b0ef1d0be63bda0ada86786cfda678ab2aae9",
"version": "1.0.0-alpha.12" "version": "1.0.0-alpha.19"
} }
}, },
{ {
@@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/apple/swift-log.git", "repositoryURL": "https://github.com/apple/swift-log.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "74d7b91ceebc85daf387ebb206003f78813f71aa", "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",
"version": "1.2.0" "version": "1.4.0"
} }
}, },
{ {
@@ -24,8 +24,8 @@
"repositoryURL": "https://github.com/apple/swift-nio.git", "repositoryURL": "https://github.com/apple/swift-nio.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "40bdad80882d307abe2c0bb36cf3bd4d3e03fe04", "revision": "5fc24345f92ec4c274121776c215ab0aa1ed4d50",
"version": "2.16.1" "version": "2.22.0"
} }
}, },
{ {
@@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/apple/swift-nio-http2.git", "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "82eb3fa0974b838358ee46bc6c5381e5ae5de6b9", "revision": "1e68e51752be0b43c5a0ef35818c1dd24d13e77c",
"version": "1.11.0" "version": "1.14.1"
} }
}, },
{ {
@@ -42,8 +42,8 @@
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "ae213938e151964aa691f0e902462fbe06baeeb6", "revision": "ea1dfd64193bf5af4490635a4a44c4fb43b1e1ae",
"version": "2.7.1" "version": "2.9.1"
} }
}, },
{ {
@@ -51,8 +51,8 @@
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "85a67aea7caf5396ed599543dd23cffeb6dbbf96", "revision": "bb56586c4cab9a79dce6ec4738baddb5802c5de7",
"version": "1.5.1" "version": "1.9.0"
} }
}, },
{ {
@@ -60,8 +60,26 @@
"repositoryURL": "https://github.com/apple/swift-protobuf.git", "repositoryURL": "https://github.com/apple/swift-protobuf.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "7790acf0a81d08429cb20375bf42a8c7d279c5fe", "revision": "0279688c9fc5a40028e1b5bb0cb56534a45a6020",
"version": "1.8.0" "version": "1.12.0"
}
},
{
"package": "SwiftRPLidar",
"repositoryURL": "https://vato.ddns.net/gitlab/vato007/swiftrplidar.git",
"state": {
"branch": "master",
"revision": "761eb0bc1a00b4627a7870ffac121a542ff0cd6b",
"version": null
}
},
{
"package": "SwiftSerial",
"repositoryURL": "https://vato.ddns.net/gitlab/vato007/SwiftSerial.git",
"state": {
"branch": "dtr_support",
"revision": "2cb65bc2ff508acc05c165d1a05381cc681f7591",
"version": null
} }
}, },
{ {
@@ -69,8 +87,8 @@
"repositoryURL": "https://github.com/uraimo/SwiftyGPIO.git", "repositoryURL": "https://github.com/uraimo/SwiftyGPIO.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "4127ff9dd5c6aa8acb6be34b7ce2af2f6e0b942d", "revision": "2038228e020cf12a62012b1ebe36bb9b8e6fdb6a",
"version": "1.1.14" "version": "1.2.5"
} }
} }
] ]