Merge pull request #3828 from wb9688/checkstyle-fix

Do not include Checkstyle in any APK
TeamNewPipe · Jun 30, 2020 · c2b4a44 · c2b4a44
2 parents d910091 + a7e8f50
commit c2b4a44
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -91,6 +91,11 @@ ext {
     markwonVersion = '4.3.1'
 }
 
+configurations {
+    checkstyle
+    ktlint
+}
+
 checkstyle {
     configFile rootProject.file('checkstyle.xml')
     ignoreFailures false
@@ -106,8 +111,7 @@ task runCheckstyle(type: Checkstyle) {
     exclude '**/BuildConfig.java'
     exclude 'main/java/us/shandian/giga/**'
 
-    // empty classpath
-    classpath = files()
+    classpath = configurations.checkstyle
 
     showViolations true
 
@@ -117,10 +121,6 @@ task runCheckstyle(type: Checkstyle) {
     }
 }
 
-configurations {
-    ktlint
-}
-
 task runKtlint(type: JavaExec) {
     main = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
@@ -143,7 +143,7 @@ dependencies {
     implementation "frankiesardo:icepick:${icepickVersion}"
     kapt "frankiesardo:icepick-processor:${icepickVersion}"
 
-    debugImplementation "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
     ktlint "com.pinterest:ktlint:0.35.0"
 
     debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"