Merge branch 'unpack-tor-binaries' into 'master'

Always unpack and include latest Tor binaries

See merge request briar/briar!987

bramble-android/build.gradle

+import com.android.build.gradle.tasks.MergeResources
+
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
@@ -44,24 +46,25 @@ dependencies {
 
 def torBinariesDir = 'src/main/res/raw'
 
+task cleanTorBinaries {
+	doLast {
+		delete fileTree(torBinariesDir) { include '*.zip' }
+	}
+}
+
+clean.dependsOn cleanTorBinaries
+
 task unpackTorBinaries {
-	outputs.dir torBinariesDir
 	doLast {
 		copy {
 			from configurations.tor.collect { zipTree(it) }
 			into torBinariesDir
 		}
 	}
+	dependsOn cleanTorBinaries
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(MergeResources) {
+	inputs.dir torBinariesDir
 	dependsOn unpackTorBinaries
 }
-
-task cleanTorBinaries {
-	doLast {
-		delete fileTree(torBinariesDir) { include '*.zip' }
-	}
-}
-
-clean.dependsOn cleanTorBinaries

bramble-java/build.gradle

@@ -33,28 +33,29 @@ dependencies {
 
 def torBinariesDir = 'src/main/resources'
 
+task cleanTorBinaries {
+	doLast {
+		delete fileTree(torBinariesDir) { include '*.zip' }
+	}
+}
+
+clean.dependsOn cleanTorBinaries
+
 task unpackTorBinaries {
-	outputs.dir torBinariesDir
 	doLast {
 		copy {
 			from configurations.tor.collect { zipTree(it) }
 			into torBinariesDir
 		}
 	}
+	dependsOn cleanTorBinaries
 }
 
-tasks.withType(JavaCompile) {
+processResources {
+	inputs.dir torBinariesDir
 	dependsOn unpackTorBinaries
 }
 
-task cleanTorBinaries {
-	doLast {
-		delete fileTree(torBinariesDir) { include '*.zip' }
-	}
-}
-
-clean.dependsOn cleanTorBinaries
-
 tasks.withType(Test) {
 	systemProperty 'java.library.path', 'libs'
 }