From 2b12f0d4384241da6275df875deb699f87e98e36 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 2 Dec 2015 13:25:06 +0000
Subject: [PATCH] Set source and target to Java 6 in Android Studio.
---
briar-android/briar-android.iml | 2 +-
briar-android/build.gradle | 4 ++++
briar.iml | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 1613f5c83f..8cb7b86d61 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -23,7 +23,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 7e0bcbb830..58b6684f5f 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -35,4 +35,8 @@ android {
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_6
+ targetCompatibility JavaVersion.VERSION_1_6
+ }
}
diff --git a/briar.iml b/briar.iml
index f2d23be9ad..16216bfa20 100644
--- a/briar.iml
+++ b/briar.iml
@@ -8,7 +8,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
--
GitLab