Skip to content

Commit f623c4f

Browse files
committed
Update gradle version to 6.5 and klint
* Update `gradle` to `6.5` * Update `klint` version and add `klint-idea` plugin to generate IDEA specific tasks * Disable `import-ordering` klint check (see [PR](pinterest/ktlint#527) for details.
1 parent db6b3c6 commit f623c4f

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

server/.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ insert_final_newline=true
88
# possible values: number (e.g. 120) (package name, imports & comments are ignored), "off"
99
# it's automatically set to 100 on `ktlint --android ...` (per Android Kotlin Style Guide)
1010
max_line_length=off
11+
disabled_rules=import-ordering

server/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import org.jetbrains.dokka.gradle.DokkaTask
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43

@@ -18,7 +17,8 @@ plugins {
1817
id("org.jetbrains.dokka") version "0.10.0" apply false
1918

2019
// We apply this so that ktlint can format the top level buildscript
21-
id("org.jlleitschuh.gradle.ktlint") version "7.2.1"
20+
id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
21+
id("org.jlleitschuh.gradle.ktlint-idea") version "9.2.1"
2222
}
2323

2424
allprojects {
1.17 KB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

server/gradlew

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

0 commit comments

Comments
 (0)