Merge pull request #123 from tasomaniac/taso/update-samples

Update samples with the latest changes.
novoda · Aug 14, 2018 · e9fb5ce · e9fb5ce
2 parents a7b81bc + e5a7ac6
commit e9fb5ce
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 50 deletions.
diff --git a/sample-multi-module/build.gradle b/sample-multi-module/build.gradle
@@ -1,21 +1,22 @@
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.2.60'
 
     repositories {
         google()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC6-3"
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC8'
+        classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.0.0'
     }
 }
 
-apply from: "$rootDir/team-props/tasks.gradle"
+apply from: rootProject.file('team-props/tasks.gradle')
 
-subprojects { subproject ->
+subprojects {
 
     buildscript {
         repositories {
@@ -26,5 +27,6 @@ subprojects { subproject ->
     repositories {
         google()
         mavenCentral()
+        jcenter()
     }
 }
diff --git a/sample-multi-module/gradle/wrapper/gradle-wrapper.jar b/sample-multi-module/gradle/wrapper/gradle-wrapper.jar
diff --git a/sample-multi-module/gradle/wrapper/gradle-wrapper.properties b/sample-multi-module/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Mar 12 18:00:46 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/sample-multi-module/team-props/detekt-config.yml b/sample-multi-module/team-props/detekt-config.yml
@@ -1,5 +1,4 @@
 autoCorrect: true
-failFast: false
 
 test-pattern:
   active: true
@@ -19,16 +18,6 @@ test-pattern:
     - 'SpreadOperator'
     - 'TooManyFunctions'
 
-build:
-  warningThreshold: 5
-  failThreshold: 500
-  maxIssues: 500
-  weights:
-     complexity: 2
-     LongParameterList: 1
-     style: 1
-     comments: 1
-
 processors:
   active: true
 

diff --git a/sample-multi-module/team-props/findbugs-excludes.xml b/sample-multi-module/team-props/findbugs-excludes.xml
@@ -9,8 +9,4 @@
     </Or>
   </Match>
 
-  <Match>
-    <Source name="~.*\.kt" />
-  </Match>
-
 </FindBugsFilter>
diff --git a/sample-multi-module/team-props/pmd-rules.xml b/sample-multi-module/team-props/pmd-rules.xml
@@ -5,7 +5,6 @@
   <description>Mandatory PMD rules description.</description>
 
   <!--region File exclusions-->
-  <exclude-pattern>.*\.kt</exclude-pattern>
   <exclude-pattern>.*\.R\$.*</exclude-pattern>
   <!--endregion-->
 

diff --git a/sample-multi-module/team-props/static-analysis.gradle b/sample-multi-module/team-props/static-analysis.gradle
@@ -1,5 +1,6 @@
 apply plugin: com.novoda.staticanalysis.StaticAnalysisPlugin
 apply plugin: 'io.gitlab.arturbosch.detekt'
+apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 staticAnalysis {
 
@@ -8,7 +9,6 @@ staticAnalysis {
     checkstyle {
         toolVersion '8.8'
         exclude project.fileTree('src/test/java')
-        exclude '**/*.kt'
         configFile rootProject.file('team-props/checkstyle-modules.xml')
         includeVariants { variant -> variant.name.contains('debug') }
     }
@@ -41,4 +41,8 @@ staticAnalysis {
             output = project.file("build/reports/detekt")
         }
     }
+
+    ktlint {
+        includeVariants { variant -> variant.name.contains('debug') }
+    }
 }
diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-    id 'io.gitlab.arturbosch.detekt' version '1.0.0.RC6-3'
+    id 'io.gitlab.arturbosch.detekt' version '1.0.0.RC8'
+    id "org.jlleitschuh.gradle.ktlint" version "5.0.0"
 }
 
 apply plugin: 'com.android.application'
@@ -9,7 +10,6 @@ apply plugin: com.novoda.staticanalysis.StaticAnalysisPlugin
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId 'com.novoda.staticanalysis.sample'
@@ -30,7 +30,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
 }
@@ -42,7 +42,6 @@ staticAnalysis {
     checkstyle {
         toolVersion '8.8'
         exclude project.fileTree('src/test/java')
-        exclude '**/*.kt'
         configFile rootProject.file('team-props/checkstyle-modules.xml')
         includeVariants { variant -> variant.name.contains('debug') }
     }
@@ -76,4 +75,8 @@ staticAnalysis {
         }
     }
 
+    ktlint {
+        android true
+        includeVariants { variant -> variant.name.contains('debug') }
+    }
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.2.60'
 
     repositories {
         google()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -16,5 +16,6 @@ subprojects {
     repositories {
         google()
         mavenCentral()
+        jcenter()
     }
 }
diff --git a/sample/gradle/wrapper/gradle-wrapper.jar b/sample/gradle/wrapper/gradle-wrapper.jar
diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Mar 12 18:00:46 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/sample/team-props/detekt-config.yml b/sample/team-props/detekt-config.yml
@@ -1,5 +1,4 @@
 autoCorrect: true
-failFast: false
 
 test-pattern:
   active: true
@@ -19,16 +18,6 @@ test-pattern:
     - 'SpreadOperator'
     - 'TooManyFunctions'
 
-build:
-  warningThreshold: 5
-  failThreshold: 10
-  maxIssues: 10
-  weights:
-     complexity: 2
-     LongParameterList: 1
-     style: 1
-     comments: 1
-
 processors:
   active: true
 

diff --git a/sample/team-props/findbugs-excludes.xml b/sample/team-props/findbugs-excludes.xml
@@ -9,8 +9,4 @@
     </Or>
   </Match>
 
-  <Match>
-    <Source name="~.*\.kt" />
-  </Match>
-
 </FindBugsFilter>
diff --git a/sample/team-props/pmd-rules.xml b/sample/team-props/pmd-rules.xml
@@ -5,7 +5,6 @@
   <description>Mandatory PMD rules description.</description>
 
   <!--region File exclusions-->
-  <exclude-pattern>.*\.kt</exclude-pattern>
   <exclude-pattern>.*\.R\$.*</exclude-pattern>
   <!--endregion-->