From 3fe4b2a1aea149050b34c60ec7e2a876dfd8c0b2 Mon Sep 17 00:00:00 2001 From: Denis Karmyshakov Date: Wed, 22 Aug 2018 00:47:22 +0300 Subject: [PATCH] Configuring path for static --- gradle/commonStaticAnalysis.gradle | 8 ++++---- gradle/staticAnalysis.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/commonStaticAnalysis.gradle b/gradle/commonStaticAnalysis.gradle index 9128d56..31589bc 100644 --- a/gradle/commonStaticAnalysis.gradle +++ b/gradle/commonStaticAnalysis.gradle @@ -257,7 +257,7 @@ getPmdTask = { sources -> def taskName = "pmd_${project.name}" tasks.create(taskName, Pmd) { pmdClasspath = configurations.pmd.asFileTree - ruleSetFiles = files "$rootDir/BuildScripts/pmd/rulesets/java/android.xml" + ruleSetFiles = files "$buildScriptsDir/pmd/rulesets/java/android.xml" ruleSets = [] source files(sources) ignoreFailures = true @@ -296,7 +296,7 @@ getLintTasks = { android.lintOptions.xmlReport = true android.lintOptions.xmlOutput = file "$project.buildDir/reports/lint_report.xml" android.lintOptions.htmlReport = false - android.lintOptions.lintConfig = file "$rootDir/BuildScripts/lint/lint.xml" + android.lintOptions.lintConfig = file "$buildScriptsDir/lint/lint.xml" return lintTaskNames } @@ -309,7 +309,7 @@ getCheckstyleTask = { sources -> ignoreFailures = true showViolations = false source files(sources) - configFile file("$rootDir/BuildScripts/checkstyle/configuration/touchin_checkstyle.xml") + configFile file("$buildScriptsDir/checkstyle/configuration/touchin_checkstyle.xml") checkstyleClasspath = configurations.checkstyle.asFileTree classpath = files(System.getenv("ANDROID_HOME") + "/platforms/" + android.compileSdkVersion + "/android.jar") + files(System.properties.'java.home' + "/lib/rt.jar") + @@ -332,7 +332,7 @@ getKotlinDetektTask = { isAndroidProject -> def input = "${rootDir}" def output = "${project.buildDir}/reports" def outputName = "kotlin-detekt" - def config = "$rootDir/BuildScripts/kotlin/detekt-config.yml" + def config = "$buildScriptsDir/kotlin/detekt-config.yml" // TODO add excludes from rootProject.extensions.findByName("staticAnalysisExcludes") def filters = ".*src/test.*,.*/resources/.*,.*/tmp/.*" diff --git a/gradle/staticAnalysis.gradle b/gradle/staticAnalysis.gradle index a14df6f..222fd92 100644 --- a/gradle/staticAnalysis.gradle +++ b/gradle/staticAnalysis.gradle @@ -1,7 +1,7 @@ def getServerProjectSources def getAndroidProjectSources -apply from: "$rootDir/BuildScripts/gradle/commonStaticAnalysis.gradle" +apply from: "$buildScriptsDir/gradle/commonStaticAnalysis.gradle" gradle.projectsEvaluated {