diff options
| author | Allan Wang <me@allanwang.ca> | 2019-06-04 00:29:39 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-06-04 00:29:39 -0400 |
| commit | 6ab827a09022246bf2cf68460fdd442878f2bf5e (patch) | |
| tree | 768e203f5140e97f20bf76905f726b607b52af05 | |
| parent | 17a6a36279f20974e4db8d7355e747f4f59c1af1 (diff) | |
| download | frost-6ab827a09022246bf2cf68460fdd442878f2bf5e.tar.gz frost-6ab827a09022246bf2cf68460fdd442878f2bf5e.tar.bz2 frost-6ab827a09022246bf2cf68460fdd442878f2bf5e.zip | |
Use kts for settings
| -rw-r--r-- | .idea/codeStyles/Project.xml | 25 | ||||
| -rw-r--r-- | .idea/encodings.xml | 4 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | settings.gradle | 1 | ||||
| -rw-r--r-- | settings.gradle.kts | 1 |
6 files changed, 8 insertions, 29 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0290b2f8..be6976dc 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -13,31 +13,6 @@ <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> </JetCodeStyleSettings> - <Objective-C-extensions> - <file> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> - </file> - <class> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> - </class> - <extensions> - <pair source="cpp" header="h" fileNamingConvention="NONE" /> - <pair source="c" header="h" fileNamingConvention="NONE" /> - </extensions> - </Objective-C-extensions> <XML> <option name="XML_KEEP_LINE_BREAKS" value="false" /> <option name="XML_ALIGN_ATTRIBUTES" value="false" /> diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..15a15b21 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Encoding" addBOMForNewFiles="with NO BOM" /> +</project>
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c64655c4..45ceaddf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ KAU=4.0.0 KOTLIN=1.3.31 # https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google -ANDROID_GRADLE=3.3.2 +ANDROID_GRADLE=3.4.1 # https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md SPOTLESS=3.21.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 953390dc..ce46b811 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Dec 23 17:28:36 EST 2018 +#Sat Jun 01 20:58:39 EDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 9d495b34..00000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app'
\ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..8a109a87 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +include(":app")
\ No newline at end of file |