From 257f616b0f785293daed1ee1c1aafce4669bda76 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 14 Apr 2021 10:29:12 +0200 Subject: [PATCH 1/3] ktLint check in library --- .editorconfig | 5 +++++ build.gradle | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..09e59494 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +[*] +max_line_length = 150 + +[*.{kt, kts}] +disabled_rules=no-consecutive-blank-lines,no-wildcard-imports,import-ordering,max-line-length,import-ordering,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping diff --git a/build.gradle b/build.gradle index ecebf9ed..b9eccb02 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,10 @@ buildscript { repositories { google() jcenter() + maven { url "https://plugins.gradle.org/m2/" } } dependencies { + classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0" classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } @@ -21,3 +23,7 @@ allprojects { maven { url 'https://jitpack.io' } } } + +subprojects { + apply plugin: "org.jlleitschuh.gradle.ktlint" +} \ No newline at end of file From 845b61ea4d2293b51bccc3bdee47fe6e12798d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= Date: Wed, 21 Apr 2021 18:44:48 +0200 Subject: [PATCH 2/3] Enable import ordering rule --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 09e59494..1496f65e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,4 +2,4 @@ max_line_length = 150 [*.{kt, kts}] -disabled_rules=no-consecutive-blank-lines,no-wildcard-imports,import-ordering,max-line-length,import-ordering,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping +disabled_rules=no-consecutive-blank-lines,no-wildcard-imports,max-line-length,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping From 13344ae62247fc1fc3799a719e4d3347117475df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= Date: Wed, 21 Apr 2021 18:59:17 +0200 Subject: [PATCH 3/3] Fix lint errors --- .../lib/resources/status/GetRemoteCapabilitiesOperation.kt | 2 +- .../status/services/implementation/OCCapabilityService.kt | 2 +- .../lib/resources/shares/responses/ShareeResponseTest.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt index 806440be..2c352d19 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt @@ -34,8 +34,8 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK -import com.owncloud.android.lib.resources.status.responses.CapabilityResponse import com.owncloud.android.lib.resources.CommonOcsResponse +import com.owncloud.android.lib.resources.status.responses.CapabilityResponse import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi import com.squareup.moshi.Types diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt index d2161b05..8d8c9d95 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt @@ -22,9 +22,9 @@ package com.owncloud.android.lib.resources.status.services.implementation import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.operations.RemoteOperationResult -import com.owncloud.android.lib.resources.status.services.CapabilityService import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation import com.owncloud.android.lib.resources.status.RemoteCapability +import com.owncloud.android.lib.resources.status.services.CapabilityService class OCCapabilityService(override val client: OwnCloudClient) : CapabilityService { diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt index ee88839d..3981ab5b 100644 --- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt +++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt @@ -28,8 +28,8 @@ import com.owncloud.android.lib.resources.CommonOcsResponse import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi import com.squareup.moshi.Types -import org.junit.Assert.assertNull import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test