Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 3f8ddd0

Browse files
authored
Merge pull request #391 from owncloud/ktLintLibraryCheck
ktLint check in library
2 parents 7dc81fb + 13344ae commit 3f8ddd0

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[*]
2+
max_line_length = 150
3+
4+
[*.{kt, kts}]
5+
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

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ buildscript {
77
repositories {
88
google()
99
jcenter()
10+
maven { url "https://plugins.gradle.org/m2/" }
1011
}
1112
dependencies {
13+
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
1214
classpath 'com.android.tools.build:gradle:4.1.3'
1315
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1416
}
@@ -21,3 +23,7 @@ allprojects {
2123
maven { url 'https://jitpack.io' }
2224
}
2325
}
26+
27+
subprojects {
28+
apply plugin: "org.jlleitschuh.gradle.ktlint"
29+
}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
3434
import com.owncloud.android.lib.common.operations.RemoteOperation
3535
import com.owncloud.android.lib.common.operations.RemoteOperationResult
3636
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK
37-
import com.owncloud.android.lib.resources.status.responses.CapabilityResponse
3837
import com.owncloud.android.lib.resources.CommonOcsResponse
38+
import com.owncloud.android.lib.resources.status.responses.CapabilityResponse
3939
import com.squareup.moshi.JsonAdapter
4040
import com.squareup.moshi.Moshi
4141
import com.squareup.moshi.Types

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ package com.owncloud.android.lib.resources.status.services.implementation
2222

2323
import com.owncloud.android.lib.common.OwnCloudClient
2424
import com.owncloud.android.lib.common.operations.RemoteOperationResult
25-
import com.owncloud.android.lib.resources.status.services.CapabilityService
2625
import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation
2726
import com.owncloud.android.lib.resources.status.RemoteCapability
27+
import com.owncloud.android.lib.resources.status.services.CapabilityService
2828

2929
class OCCapabilityService(override val client: OwnCloudClient) :
3030
CapabilityService {

owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import com.owncloud.android.lib.resources.CommonOcsResponse
2828
import com.squareup.moshi.JsonAdapter
2929
import com.squareup.moshi.Moshi
3030
import com.squareup.moshi.Types
31-
import org.junit.Assert.assertNull
3231
import org.junit.Assert.assertEquals
32+
import org.junit.Assert.assertNull
3333
import org.junit.Assert.assertTrue
3434
import org.junit.Before
3535
import org.junit.Test

0 commit comments

Comments
 (0)