From 061479dd68f96fb347ec4c4c10e68fa1ccb22d5b Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 4 Dec 2015 10:12:01 +0000
Subject: [PATCH] Set source and target version to Java 6 in subprojects.
---
briar-android/briar-android.iml | 12 ------------
briar-api/briar-api.iml | 1 -
briar-api/build.gradle | 2 ++
briar-core/briar-core.iml | 1 -
briar-core/build.gradle | 2 ++
briar-desktop/build.gradle | 2 ++
briar-tests/build.gradle | 2 ++
7 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 8237583e3a..6e88d67ad9 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,18 +59,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
diff --git a/briar-api/briar-api.iml b/briar-api/briar-api.iml
index 58d6d226a1..3d154955e7 100644
--- a/briar-api/briar-api.iml
+++ b/briar-api/briar-api.iml
@@ -28,6 +28,5 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
- <orderEntry type="library" exported="" name="briar-api.briar-api" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/briar-api/build.gradle b/briar-api/build.gradle
index 8612e93610..e273f64dd7 100644
--- a/briar-api/build.gradle
+++ b/briar-api/build.gradle
@@ -1,4 +1,6 @@
apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
diff --git a/briar-core/briar-core.iml b/briar-core/briar-core.iml
index 36261ca616..0cd707f81f 100644
--- a/briar-core/briar-core.iml
+++ b/briar-core/briar-core.iml
@@ -32,6 +32,5 @@
<orderEntry type="library" exported="" name="h2small-1.4.190" level="project" />
<orderEntry type="library" exported="" name="spongy-core-1.53" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
- <orderEntry type="library" exported="" name="briar-core.briar-core" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/briar-core/build.gradle b/briar-core/build.gradle
index ad7abbba79..0a453adab3 100644
--- a/briar-core/build.gradle
+++ b/briar-core/build.gradle
@@ -1,4 +1,6 @@
apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
dependencies {
compile fileTree(dir: '../briar-api/libs', include: '*.jar')
diff --git a/briar-desktop/build.gradle b/briar-desktop/build.gradle
index 3a21e10537..6331560ba6 100644
--- a/briar-desktop/build.gradle
+++ b/briar-desktop/build.gradle
@@ -1,4 +1,6 @@
apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
dependencies {
compile fileTree(dir: '../briar-api/libs', include: '*.jar')
diff --git a/briar-tests/build.gradle b/briar-tests/build.gradle
index a93c46de41..65a3428f07 100644
--- a/briar-tests/build.gradle
+++ b/briar-tests/build.gradle
@@ -1,4 +1,6 @@
apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
dependencies {
compile fileTree(dir: '../briar-api/libs', include: '*.jar')
--
GitLab