Skip to content
Permalink
Browse files

Update Detekt [1.0.0-RC14 -> 1.0.0-RC15]

  • Loading branch information...
rock3r committed Jun 8, 2019
1 parent bf7274e commit 0629df720df4b83bcdc5bdd00ea7f6a90f72e212
@@ -114,9 +114,8 @@ play {
detekt { detekt {
toolVersion detektVersion toolVersion detektVersion


input = files("$projectDir/src/") input = files("$projectDir/src/main", "$projectDir/src/release")
config = files("$rootDir/team-props/static-analysis/detekt-config.yml") config = files("$rootDir/team-props/static-analysis/detekt-config.yml")
filters = '.*/test/.*,.*/resources/.*,.*/tmp/.*,.*/build/.*,.*/debug/.*'
reports { reports {
xml.enabled = true xml.enabled = true
html.enabled = true html.enabled = true
@@ -122,8 +122,8 @@ class FirstStartWithNoNetworkActivity : AppCompatActivity() {
val scaleY = Property.of(View::class.java, Float::class.java, "scaleY") val scaleY = Property.of(View::class.java, Float::class.java, "scaleY")
val animator = AnimatorSet() val animator = AnimatorSet()
animator.playTogether( animator.playTogether(
ObjectAnimator.ofFloat(view, scaleX, *values), ObjectAnimator.ofFloat(view, scaleX, *values),
ObjectAnimator.ofFloat(view, scaleY, *values) ObjectAnimator.ofFloat(view, scaleY, *values)
) )
animator.interpolator = interpolator animator.interpolator = interpolator
return animator return animator
@@ -132,19 +132,20 @@ class FirstStartWithNoNetworkActivity : AppCompatActivity() {
private fun animate(view: View, animationProducer: (View) -> Animator, endAction: () -> Unit): Animator { private fun animate(view: View, animationProducer: (View) -> Animator, endAction: () -> Unit): Animator {
val animator = animationProducer.invoke(view) val animator = animationProducer.invoke(view)
animator.addListener( animator.addListener(
object : AnimationEndListener { object : AnimationEndListener {
override fun onAnimationEnd(animation: Animator) = endAction() override fun onAnimationEnd(animation: Animator) = endAction()
} }
) )
return animator return animator
} }


private fun continueToScheduleAfterDelay() { private fun continueToScheduleAfterDelay() {
firstStartProgress.postDelayed( firstStartProgress.postDelayed(
{ {
startActivity(continuationIntent) // We don't use the navigator here, we basically want to restart the whole flow // We don't use the navigator here, we basically want to restart the whole flow
finish() startActivity(continuationIntent)
}, DELAY_AFTER_ANIMATIONS_MILLIS finish()
}, DELAY_AFTER_ANIMATIONS_MILLIS
) )
} }


@@ -15,7 +15,7 @@ buildscript {


plugins { plugins {
id 'com.github.ben-manes.versions' version '0.21.0' id 'com.github.ben-manes.versions' version '0.21.0'
id 'io.gitlab.arturbosch.detekt' version '1.0.0-RC14' id 'io.gitlab.arturbosch.detekt' version '1.0.0-RC15'
id 'org.jlleitschuh.gradle.ktlint' version '7.2.1' id 'org.jlleitschuh.gradle.ktlint' version '7.2.1'
} }


@@ -5,7 +5,7 @@ ext {
kotlinVersion = '1.3.31' kotlinVersion = '1.3.31'
moshiVersion = '1.8.0' moshiVersion = '1.8.0'


detektVersion = '1.0.0-RC14' detektVersion = '1.0.0-RC15'
ktlintVersion = '0.33.0' ktlintVersion = '0.33.0'


gradlePlugins = [ gradlePlugins = [
@@ -1,29 +1,5 @@
autoCorrect: true autoCorrect: true


test-pattern: # Configure exclusions for test sources
active: true
patterns: # Test file regexes
- '.*/test/.*'
- '.*/androidTest/.*'
- '.*Test.kt'
- '.*Spec.kt'
- '.*Spek.kt'
exclude-rule-sets:
- 'comments'
exclude-rules:
- 'NamingRules'
- 'WildcardImport'
- 'MagicNumber'
- 'MaxLineLength'
- 'LateinitUsage'
- 'StringLiteralDuplication'
- 'SpreadOperator'
- 'TooManyFunctions'
- 'ForEachOnRange'
- 'FunctionMaxLength'
- 'TooGenericExceptionCaught'
- 'InstanceOfCheckForException'

build: build:
maxIssues: 0 maxIssues: 0
weights: weights:
@@ -88,3 +64,7 @@ style:
active: true active: true
WildcardImport: WildcardImport:
excludeImports: 'kotlinx.android.synthetic.*' excludeImports: 'kotlinx.android.synthetic.*'

empty-blocks:
EmptyFunctionBlock:
active: false # It's bugged, see https://github.com/arturbosch/detekt/issues/1684

0 comments on commit 0629df7

Please sign in to comment.
You can’t perform that action at this time.