Skip to content
This repository was archived by the owner on May 3, 2025. It is now read-only.

Commit f4bb488

Browse files
committed
Gradle 5.2.1
1 parent b3d57d2 commit f4bb488

File tree

9 files changed

+126
-82
lines changed

9 files changed

+126
-82
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ deploy:
2222
provider: releases
2323
api_key: $GITHUB_API_KEY
2424
file:
25-
- "build/libs/gradle-file-encrypt-1.3.0.jar"
26-
- "build/libs/gradle-file-encrypt-1.3.0-javadoc.jar"
27-
- "build/libs/gradle-file-encrypt-1.3.0-sources.jar"
25+
- "build/libs/gradle-file-encrypt-1.3.1.jar"
26+
- "build/libs/gradle-file-encrypt-1.3.1-javadoc.jar"
27+
- "build/libs/gradle-file-encrypt-1.3.1-sources.jar"
2828
skip_cleanup: true
2929
on:
3030
tags: true

build.gradle.kts

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
import org.gradle.internal.impldep.org.eclipse.jgit.api.Git
2-
import org.gradle.internal.impldep.org.eclipse.jgit.storage.file.FileRepositoryBuilder
31
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
42

53
buildscript {
64
repositories {
75
jcenter()
8-
mavenCentral()
96
}
107
}
118

129
plugins {
13-
kotlin("jvm") version "1.3.10"
10+
kotlin("jvm") version "1.3.21"
1411
id("java-gradle-plugin")
15-
id("org.jmailen.kotlinter") version "1.20.1"
1612
id("com.github.ben-manes.versions") version "0.20.0"
17-
id("io.gitlab.arturbosch.detekt") version "1.0.0.RC9.2"
18-
id("com.gradle.plugin-publish") version "0.10.0"
13+
id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14"
14+
id("com.gradle.plugin-publish") version "0.10.1"
1915
}
2016

2117
group = "com.cherryperry.gfe"
22-
version = "1.3.0"
18+
version = "1.3.1"
2319

2420
configure<JavaPluginConvention> {
2521
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -30,14 +26,7 @@ tasks.withType<KotlinCompile> {
3026
}
3127

3228
detekt {
33-
toolVersion = "1.0.0.RC9.2"
34-
input = files("src/main/kotlin", "src/test/kotlin")
3529
config = files("detekt.yml")
36-
filters = "do-not-use-it"
37-
}
38-
39-
tasks.named("check").configure {
40-
dependsOn(tasks.named("detekt"))
4130
}
4231

4332
pluginBundle {
@@ -54,7 +43,6 @@ pluginBundle {
5443

5544
repositories {
5645
jcenter()
57-
mavenCentral()
5846
}
5947

6048
dependencies {
@@ -63,4 +51,5 @@ dependencies {
6351
testImplementation(kotlin("stdlib-jdk8"))
6452
testImplementation("junit", "junit", "4.12")
6553
testImplementation(gradleTestKit())
54+
detektPlugins("io.gitlab.arturbosch.detekt", "detekt-formatting", "1.0.0-RC14")
6655
}

detekt.yml

Lines changed: 78 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
autoCorrect: true
2-
failFast: false
32

43
test-pattern: # Configure exclusions for test sources
54
active: true
65
patterns: # Test file regexes
76
- '.*/test/.*'
7+
- '.*/androidTest/.*'
88
- '.*Test.kt'
99
- '.*Spec.kt'
10+
- '.*Spek.kt'
1011
exclude-rule-sets:
1112
- 'comments'
1213
exclude-rules:
@@ -19,14 +20,17 @@ test-pattern: # Configure exclusions for test sources
1920
- 'SpreadOperator'
2021
- 'TooManyFunctions'
2122
- 'ForEachOnRange'
23+
- 'FunctionMaxLength'
24+
- 'TooGenericExceptionCaught'
25+
- 'InstanceOfCheckForException'
2226

2327
build:
2428
maxIssues: 10
2529
weights:
26-
# complexity: 2
27-
# LongParameterList: 1
28-
# style: 1
29-
# comments: 1
30+
# complexity: 2
31+
# LongParameterList: 1
32+
# style: 1
33+
# comments: 1
3034

3135
processors:
3236
active: true
@@ -46,13 +50,6 @@ console-reports:
4650
# - 'FindingsReport'
4751
# - 'BuildFailureReport'
4852

49-
output-reports:
50-
active: true
51-
exclude:
52-
# - 'HtmlOutputReport'
53-
# - 'PlainOutputReport'
54-
# - 'XmlOutputReport'
55-
5653
comments:
5754
active: true
5855
CommentOverPrivateFunction:
@@ -84,14 +81,16 @@ complexity:
8481
active: true
8582
threshold: 10
8683
ignoreSingleWhenExpression: false
84+
ignoreSimpleWhenEntries: false
8785
LabeledExpression:
8886
active: false
87+
ignoredLabels: ""
8988
LargeClass:
9089
active: true
91-
threshold: 150
90+
threshold: 600
9291
LongMethod:
9392
active: true
94-
threshold: 20
93+
threshold: 60
9594
LongParameterList:
9695
active: true
9796
threshold: 6
@@ -117,6 +116,7 @@ complexity:
117116
thresholdInEnums: 11
118117
ignoreDeprecated: false
119118
ignorePrivate: false
119+
ignoreOverridden: false
120120

121121
empty-blocks:
122122
active: true
@@ -168,6 +168,7 @@ exceptions:
168168
active: false
169169
SwallowedException:
170170
active: false
171+
ignoredExceptionTypes: 'InterruptedException,NumberFormatException,ParseException,MalformedURLException'
171172
ThrowingExceptionFromFinally:
172173
active: false
173174
ThrowingExceptionInMain:
@@ -180,21 +181,22 @@ exceptions:
180181
TooGenericExceptionCaught:
181182
active: true
182183
exceptionNames:
183-
- ArrayIndexOutOfBoundsException
184-
- Error
185-
- Exception
186-
- IllegalMonitorStateException
187-
- NullPointerException
188-
- IndexOutOfBoundsException
189-
- RuntimeException
190-
- Throwable
184+
- ArrayIndexOutOfBoundsException
185+
- Error
186+
- Exception
187+
- IllegalMonitorStateException
188+
- NullPointerException
189+
- IndexOutOfBoundsException
190+
- RuntimeException
191+
- Throwable
192+
allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
191193
TooGenericExceptionThrown:
192194
active: true
193195
exceptionNames:
194-
- Error
195-
- Exception
196-
- Throwable
197-
- RuntimeException
196+
- Error
197+
- Exception
198+
- Throwable
199+
- RuntimeException
198200

199201
formatting:
200202
active: true
@@ -212,8 +214,7 @@ formatting:
212214
active: true
213215
autoCorrect: true
214216
ImportOrdering:
215-
active: true
216-
autoCorrect: true
217+
active: false
217218
Indentation:
218219
active: true
219220
autoCorrect: true
@@ -235,7 +236,7 @@ formatting:
235236
active: true
236237
autoCorrect: true
237238
NoItParamInMultilineLambda:
238-
active: true
239+
active: false
239240
NoLineBreakAfterElse:
240241
active: true
241242
autoCorrect: true
@@ -260,6 +261,9 @@ formatting:
260261
NoWildcardImports:
261262
active: true
262263
autoCorrect: true
264+
PackageName:
265+
active: true
266+
autoCorrect: true
263267
ParameterListWrapping:
264268
active: true
265269
autoCorrect: true
@@ -279,6 +283,9 @@ formatting:
279283
SpacingAroundOperators:
280284
active: true
281285
autoCorrect: true
286+
SpacingAroundParens:
287+
active: true
288+
autoCorrect: true
282289
SpacingAroundRangeOperator:
283290
active: true
284291
autoCorrect: true
@@ -291,6 +298,11 @@ naming:
291298
ClassNaming:
292299
active: true
293300
classPattern: '[A-Z$][a-zA-Z0-9$]*'
301+
ConstructorParameterNaming:
302+
active: true
303+
parameterPattern: '[a-z][A-Za-z0-9]*'
304+
privateParameterPattern: '[a-z][A-Za-z0-9]*'
305+
excludeClassPattern: '$^'
294306
EnumNaming:
295307
active: true
296308
enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
@@ -307,18 +319,25 @@ naming:
307319
active: true
308320
functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
309321
excludeClassPattern: '$^'
322+
ignoreOverridden: true
323+
FunctionParameterNaming:
324+
active: true
325+
parameterPattern: '[a-z][A-Za-z0-9]*'
326+
excludeClassPattern: '$^'
327+
ignoreOverriddenFunctions: true
310328
MatchingDeclarationName:
311329
active: true
312330
MemberNameEqualsClassName:
313331
active: false
314332
ignoreOverriddenFunction: true
315333
ObjectPropertyNaming:
316334
active: true
317-
propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
318335
constantPattern: '[A-Za-z][_A-Za-z0-9]*'
336+
propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
337+
privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
319338
PackageNaming:
320339
active: true
321-
packagePattern: '^[a-z]+(\.[a-z][a-z0-9]*)*$'
340+
packagePattern: '^[a-z]+(\.[a-z][A-Za-z0-9]*)*$'
322341
TopLevelPropertyNaming:
323342
active: true
324343
constantPattern: '[A-Z][_A-Z0-9]*'
@@ -335,9 +354,12 @@ naming:
335354
variablePattern: '[a-z][A-Za-z0-9]*'
336355
privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
337356
excludeClassPattern: '$^'
357+
ignoreOverridden: true
338358

339359
performance:
340360
active: true
361+
ArrayPrimitive:
362+
active: false
341363
ForEachOnRange:
342364
active: true
343365
SpreadOperator:
@@ -387,6 +409,10 @@ style:
387409
conversionFunctionPrefix: 'to'
388410
EqualsNullCall:
389411
active: false
412+
EqualsOnSignatureLine:
413+
active: false
414+
ExplicitItLambdaParameter:
415+
active: false
390416
ExpressionBodySyntax:
391417
active: false
392418
includeLineWrapping: false
@@ -396,6 +422,8 @@ style:
396422
ForbiddenImport:
397423
active: false
398424
imports: ''
425+
ForbiddenVoid:
426+
active: false
399427
FunctionOnlyReturningConstant:
400428
active: false
401429
ignoreOverridableFunction: true
@@ -406,7 +434,7 @@ style:
406434
MagicNumber:
407435
active: true
408436
ignoreNumbers: '-1,0,1,2'
409-
ignoreHashCodeFunction: false
437+
ignoreHashCodeFunction: true
410438
ignorePropertyDeclaration: false
411439
ignoreConstantDeclaration: true
412440
ignoreCompanionObjectPropertyDeclaration: true
@@ -418,8 +446,8 @@ style:
418446
MaxLineLength:
419447
active: true
420448
maxLineLength: 120
421-
excludePackageStatements: false
422-
excludeImportStatements: false
449+
excludePackageStatements: true
450+
excludeImportStatements: true
423451
excludeCommentStatements: false
424452
MayBeConst:
425453
active: false
@@ -447,6 +475,8 @@ style:
447475
active: true
448476
max: 2
449477
excludedFunctions: "equals"
478+
excludeLabeled: false
479+
excludeReturnFromLambda: true
450480
SafeCast:
451481
active: true
452482
SerialVersionUIDInSerializableClass:
@@ -458,24 +488,36 @@ style:
458488
max: 2
459489
TrailingWhitespace:
460490
active: false
491+
UnderscoresInNumericLiterals:
492+
active: false
493+
acceptableDecimalLength: 5
461494
UnnecessaryAbstractClass:
462495
active: false
496+
excludeAnnotatedClasses: "dagger.Module"
497+
UnnecessaryApply:
498+
active: false
463499
UnnecessaryInheritance:
464500
active: false
501+
UnnecessaryLet:
502+
active: false
465503
UnnecessaryParentheses:
466504
active: false
467505
UntilInsteadOfRangeTo:
468506
active: false
469507
UnusedImports:
470508
active: false
509+
UnusedPrivateClass:
510+
active: false
471511
UnusedPrivateMember:
472512
active: false
473-
allowedNames: "(_|ignored|expected)"
513+
allowedNames: "(_|ignored|expected|serialVersionUID)"
474514
UseDataClass:
475515
active: false
476516
excludeAnnotatedClasses: ""
477517
UtilityClassWithPublicConstructor:
478518
active: false
519+
VarCouldBeVal:
520+
active: false
479521
WildcardImport:
480522
active: true
481-
excludeImports: 'java.util.*,kotlinx.android.synthetic.*'
523+
excludeImports: 'kotlinx.android.synthetic.*'
Lines changed: 1 addition & 1 deletion
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.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)