fixed checkstyle, fixed gitignore, and added config.gradle (mapbox#224)

Cameron Mace · web-flow · commit f59f52ca89ea · 2016-12-01T12:41:29.000-05:00
* fixed checkstyle, fixed gitignore, and added config.gradle

* added checkstyle to bitrise.yml

* adding missing input line
diff --git a/.gitignore b/.gitignore
@@ -1 +1,22 @@
-secring.gpg
+# Gradle files
+.gradle/
+
+# IntelliJ files
+.idea/
+*.iml
+
+# Build files
+build/
+*.so
+*.apk
+BuildConfig.java
+.DS_Store
+
+# Local settings
+local.properties
+
+# Capture files
+captures/
+
+# Token file
+libandroid/app/src/main/res/values/developer-config.xml
diff --git a/libandroid/.gitignore b/libandroid/.gitignore
diff --git a/libandroid/app/build.gradle b/libandroid/app/build.gradle
@@ -55,3 +55,6 @@ dependencies {
     // Testing
     testCompile 'junit:junit:4.12'
 }
+
+apply from: 'gradle-checkstyle.gradle'
+apply from: 'gradle-config.gradle'
diff --git a/libandroid/app/gradle-checkstyle.gradle b/libandroid/app/gradle-checkstyle.gradle
@@ -1,16 +1,17 @@
 apply plugin: 'checkstyle'
 
-checkstyle.toolVersion = '7.1'
+checkstyle {
+  toolVersion = "7.1.1" // 7.3
+  configFile = "../../checkstyle.xml" as File
+}
 
 task checkstyle(type: Checkstyle) {
   description 'Checks if the code adheres to coding standards'
   group 'verification'
-
-  configFile = new File(rootDir, "checkstyle.xml")
+  configFile file("../../checkstyle.xml")
   source 'src'
   include '**/*.java'
   exclude '**/gen/**'
-
   classpath = files()
   ignoreFailures = false
 }
diff --git a/libandroid/app/gradle-config.gradle b/libandroid/app/gradle-config.gradle
@@ -0,0 +1,22 @@
+//
+// Configuration file for gradle build execution.
+//
+
+task accessToken {
+  def tokenFile = new File("app/src/main/res/values/developer-config.xml")
+  if (!tokenFile.exists()) {
+    String tokenFileContents = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+            "<resources>\n" +
+            "    <string name=\"mapbox_access_token\">" + "$System.env.MAPBOX_ACCESS_TOKEN" + "</string>\n" +
+            "</resources>"
+
+    if (tokenFileContents == null) {
+      throw new InvalidUserDataException("You must set the MAPBOX_ACCESS_TOKEN environment variable.")
+    }
+    tokenFile.write(tokenFileContents)
+  }
+}
+
+gradle.projectsEvaluated {
+  preBuild.dependsOn('accessToken')
+}
diff --git a/libandroid/lib/build.gradle b/libandroid/lib/build.gradle
@@ -47,6 +47,7 @@ dependencies {
 
 apply from: 'gradle-javadoc.gradle'
 apply from: 'gradle-mvn-push.gradle'
+apply from: 'gradle-checkstyle.gradle'
 
 // See: https://github.com/chrisbanes/gradle-mvn-push/issues/43#issuecomment-84140513
 afterEvaluate { project ->
@@ -56,3 +57,4 @@ afterEvaluate { project ->
         }
     }
 }
+
diff --git a/libandroid/lib/gradle-checkstyle.gradle b/libandroid/lib/gradle-checkstyle.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'checkstyle'
+
+checkstyle {
+  toolVersion = "7.1.1" // 7.3
+  configFile = "../../checkstyle.xml" as File
+}
+
+task checkstyle(type: Checkstyle) {
+  description 'Checks if the code adheres to coding standards'
+  group 'verification'
+  configFile file("../../checkstyle.xml")
+  source 'src'
+  include '**/*.java'
+  exclude '**/gen/**'
+  classpath = files()
+  ignoreFailures = false
+}
diff --git a/libjava/.gitignore b/libjava/.gitignore
diff --git a/libjava/build.gradle b/libjava/build.gradle
@@ -20,6 +20,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-
-apply from: 'checkstyle.gradle'
+}
diff --git a/libjava/lib/build.gradle b/libjava/lib/build.gradle
@@ -38,3 +38,4 @@ def getGitRevision() {
 }
 
 apply from: 'gradle-mvn-push.gradle'
+apply from: 'gradle-checkstyle.gradle'
diff --git a/libjava/lib/gradle-checkstyle.gradle b/libjava/lib/gradle-checkstyle.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'checkstyle'
+
+checkstyle {
+  toolVersion = "7.1.1" // 7.3
+  configFile = "../../checkstyle.xml" as File
+}
+
+task checkstyle(type: Checkstyle) {
+  description 'Checks if the code adheres to coding standards'
+  group 'verification'
+  configFile file("../../checkstyle.xml")
+  source 'src'
+  include '**/*.java'
+  exclude '**/gen/**'
+  classpath = files()
+  ignoreFailures = false
+}
diff --git a/scripts/bitrise.yml b/scripts/bitrise.yml

Original file line number	Diff line number	Diff line change
`@@ -55,3 +55,6 @@ dependencies {`
`55`	`55`	`// Testing`
`56`	`56`	`testCompile 'junit:junit:4.12'`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+apply from: 'gradle-checkstyle.gradle'`
	`60`	`+apply from: 'gradle-config.gradle'`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ dependencies {`
`47`	`47`
`48`	`48`	`apply from: 'gradle-javadoc.gradle'`
`49`	`49`	`apply from: 'gradle-mvn-push.gradle'`
	`50`	`+apply from: 'gradle-checkstyle.gradle'`
`50`	`51`
`51`	`52`	`// See: https://github.com/chrisbanes/gradle-mvn-push/issues/43#issuecomment-84140513`
`52`	`53`	`afterEvaluate { project ->`
`@@ -56,3 +57,4 @@ afterEvaluate { project ->`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`	`}`
	`60`	`+`
Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,4 @@ def getGitRevision() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`apply from: 'gradle-mvn-push.gradle'`
	`41`	`+apply from: 'gradle-checkstyle.gradle'`