Build collection lib along with the Android app

anoirgu · Oct 14, 2015 · a81028a · a81028a
1 parent 7cc0d95
commit a81028a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/android/PhysicalWeb/app/build.gradle b/android/PhysicalWeb/app/build.gradle
@@ -62,6 +62,10 @@ repositories {
 }
 
 dependencies {
+    compile(project(':libs')) {
+        exclude group: 'org.json', module: 'json'
+    }
+
     compile 'com.android.volley:volley@aar'
     compile 'org.uribeacon:uribeacon-library-release@aar'
 

diff --git a/android/PhysicalWeb/settings.gradle b/android/PhysicalWeb/settings.gradle
@@ -1 +1,3 @@
-include ':app'
+include ':app', ':libs'
+
+project(':libs').projectDir = new File('../../java/libs')
diff --git a/java/libs/build.gradle b/java/libs/build.gradle
@@ -53,12 +53,13 @@ findbugsMain {
 }
 
 findbugs {
-    reportsDir = file("$project.buildDir/reports/findbugs")
-    excludeFilter = file("$project.rootDir/config/findbugs/exclude-filter.xml")
+    reportsDir = new File(buildDir, "reports/findbugs")
+    excludeFilter = new File(projectDir, "config/findbugs/exclude-filter.xml")
 }
 
 checkstyle {
-    configProperties.checkstyleSuppressionsPath = file("$project.rootDir/config/checkstyle/suppressions.xml")
+    configProperties.checkstyleSuppressionsPath =
+            new File(projectDir, "config/checkstyle/suppressions.xml")
 }
 
 pmdMain {
@@ -70,9 +71,9 @@ pmdMain {
 
 pmd {
     ignoreFailures = false
-    ruleSetFiles = files("${project.rootDir}/config/pmd/pmd-ruleset.xml")
+    ruleSetFiles = files(new File(projectDir, "config/pmd/pmd-ruleset.xml"))
     ruleSets = []
-    reportsDir = file("$project.buildDir/reports/findbugs")
+    reportsDir = new File(buildDir, "reports/findbugs")
 }
 
 javadoc {