Merge pull request #188 from novoda/taso/update-sample

Update samples

plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy

@@ -177,9 +177,8 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
     private void createHtmlReportTask(String taskName) {
         createTask(project, "generate${taskName.capitalize()}HtmlReport", GenerateFindBugsHtmlReport) { GenerateFindBugsHtmlReport task ->
             def findbugs = project.tasks[taskName] as FindBugs
-            def collectViolations = project.tasks["collect${taskName.capitalize()}Violations"] as CollectViolationsTask
-            task.xmlReportFile = collectViolations.xmlReportFile
-            task.htmlReportFile = collectViolations.htmlReportFile
+            task.xmlReportFile = findbugs.reports.xml.destination
+            task.htmlReportFile = new File(task.xmlReportFile.absolutePath - '.xml' + '.html')
             task.classpath = findbugs.findbugsClasspath
             task.dependsOn findbugs
         }

sample-multi-module/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.novoda.buildpropertiesplugin.sample">
+  package="com.novoda.staticanalysisplugin.sample">
 
   <application
     android:allowBackup="false"

sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt

@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.widget.Toast
-import com.novoda.buildpropertiesplugin.sample.R
 import kotlinx.android.synthetic.main.activity_my.*
 
 class MyActivity : AppCompatActivity() {

sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java

@@ -6,8 +6,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.novoda.buildpropertiesplugin.sample.R;
-
 public class SomeOtherActivity extends AppCompatActivity {
 
     @Override

sample-multi-module/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java → sample-multi-module/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java

@@ -1,4 +1,4 @@
-package com.novoda.buildpropertiesplugin.sample;
+package com.novoda.staticanalysisplugin.sample;
 
 import org.junit.Test;
 

sample-multi-module/build.gradle

@@ -1,16 +1,16 @@
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.31'
 
     repositories {
         google()
         gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.novoda:gradle-static-analysis-plugin:local'
-        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC12'
-        classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.1.0'
+        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC14'
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

sample/app/build.gradle

@@ -65,7 +65,7 @@ staticAnalysis {
     }
 
     ktlint {
-        android true
+        android.set(true)
         reporters = [ReporterType.CHECKSTYLE]
 
         includeVariants { variant -> variant.name.contains('debug') }

sample/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.novoda.buildpropertiesplugin.sample">
+  package="com.novoda.staticanalysisplugin.sample">
 
   <application
     android:allowBackup="false"

sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt

@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.widget.Toast
-import com.novoda.buildpropertiesplugin.sample.R
 import kotlinx.android.synthetic.main.activity_my.*
 
 class MyActivity : AppCompatActivity() {

sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java

@@ -6,8 +6,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.novoda.buildpropertiesplugin.sample.R;
-
 public class SomeOtherActivity extends AppCompatActivity {
 
     @Override

sample/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java → sample/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java

@@ -1,4 +1,4 @@
-package com.novoda.buildpropertiesplugin.sample;
+package com.novoda.staticanalysisplugin.sample;
 
 import org.junit.Test;
 

sample/build.gradle

@@ -1,16 +1,16 @@
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.31'
 
     repositories {
         google()
         gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.novoda:gradle-static-analysis-plugin:local'
-        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC12'
-        classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.1.0'
+        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC14'
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }