From 3b5769cf8ad09dda382f96418c4c444b553d055f Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 22 Nov 2013 12:00:00 +0000
Subject: [PATCH] Use Java 1.6 instead of 1.5. We no longer aim to support OS X
 10.4.

---
 briar-android/.gitignore                           | 2 +-
 briar-api/.classpath                               | 2 +-
 briar-api/.gitignore                               | 1 +
 briar-api/build.xml                                | 2 +-
 briar-core/.classpath                              | 2 +-
 briar-core/.gitignore                              | 1 +
 briar-core/.settings/org.eclipse.jdt.core.prefs    | 8 --------
 briar-core/build.xml                               | 4 ++--
 briar-desktop/.classpath                           | 2 +-
 briar-desktop/.gitignore                           | 1 +
 briar-desktop/.settings/org.eclipse.jdt.core.prefs | 8 --------
 briar-desktop/build.xml                            | 6 +++---
 briar-tests/.classpath                             | 2 +-
 briar-tests/.gitignore                             | 1 +
 briar-tests/.settings/org.eclipse.jdt.core.prefs   | 8 --------
 briar-tests/build.xml                              | 8 ++++----
 16 files changed, 19 insertions(+), 39 deletions(-)
 delete mode 100644 briar-core/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 briar-desktop/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 briar-tests/.settings/org.eclipse.jdt.core.prefs

diff --git a/briar-android/.gitignore b/briar-android/.gitignore
index 77ff9cb0d..4f384f17c 100644
--- a/briar-android/.gitignore
+++ b/briar-android/.gitignore
@@ -1,4 +1,4 @@
 bin
 gen
 local.properties
-/Briar-alpha.apk
+.settings
diff --git a/briar-api/.classpath b/briar-api/.classpath
index 929e9cf40..16b578bbf 100644
--- a/briar-api/.classpath
+++ b/briar-api/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="lib" path="libs/guice-3.0-no_aop.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/briar-api/.gitignore b/briar-api/.gitignore
index c74591937..eeb02632a 100644
--- a/briar-api/.gitignore
+++ b/briar-api/.gitignore
@@ -1,2 +1,3 @@
 bin
 build
+.settings
diff --git a/briar-api/build.xml b/briar-api/build.xml
index d5d069302..7da1cd1be 100644
--- a/briar-api/build.xml
+++ b/briar-api/build.xml
@@ -10,7 +10,7 @@
 	</target>
 	<target name='compile'>
 		<mkdir dir='build'/>
-		<javac srcdir='src' destdir='build' source='1.5' target='1.5'
+		<javac srcdir='src' destdir='build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='api-jars'/>
diff --git a/briar-core/.classpath b/briar-core/.classpath
index 78401b100..a8e4532eb 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
 	<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
 	<classpathentry kind="lib" path="libs/h2small-1.3.170.jar"/>
 	<classpathentry kind="lib" path="libs/javax.inject.jar"/>
 	<classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
 	<classpathentry kind="lib" path="libs/weupnp-0.1.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/briar-core/.gitignore b/briar-core/.gitignore
index c74591937..eeb02632a 100644
--- a/briar-core/.gitignore
+++ b/briar-core/.gitignore
@@ -1,2 +1,3 @@
 bin
 build
+.settings
diff --git a/briar-core/.settings/org.eclipse.jdt.core.prefs b/briar-core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aa0ae4c58..000000000
--- a/briar-core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Dec 05 20:57:54 GMT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/briar-core/build.xml b/briar-core/build.xml
index e6cd58679..8a3499f8b 100644
--- a/briar-core/build.xml
+++ b/briar-core/build.xml
@@ -15,14 +15,14 @@
 	<target name='compile'>
 		<mkdir dir='../briar-api/build'/>
 		<javac srcdir='../briar-api/src'
-			destdir='../briar-api/build' source='1.5' target='1.5'
+			destdir='../briar-api/build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='api-jars'/>
 			</classpath>
 		</javac>
 		<mkdir dir='build'/>
-		<javac srcdir='src' destdir='build' source='1.5' target='1.5'
+		<javac srcdir='src' destdir='build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='core-jars'/>
diff --git a/briar-desktop/.classpath b/briar-desktop/.classpath
index 93f439757..797700089 100644
--- a/briar-desktop/.classpath
+++ b/briar-desktop/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
 	<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
@@ -12,5 +11,6 @@
 	<classpathentry kind="lib" path="libs/jnotify-0.93.jar"/>
 	<classpathentry kind="lib" path="libs/jssc-0.9-briar.jar" sourcepath="libs/source/jssc-0.9-briar-source.jar"/>
 	<classpathentry kind="lib" path="libs/platform-3.5.2-SNAPSHOT.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/briar-desktop/.gitignore b/briar-desktop/.gitignore
index c74591937..eeb02632a 100644
--- a/briar-desktop/.gitignore
+++ b/briar-desktop/.gitignore
@@ -1,2 +1,3 @@
 bin
 build
+.settings
diff --git a/briar-desktop/.settings/org.eclipse.jdt.core.prefs b/briar-desktop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aa0ae4c58..000000000
--- a/briar-desktop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Dec 05 20:57:54 GMT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/briar-desktop/build.xml b/briar-desktop/build.xml
index a35c57cc5..80c40d8f5 100644
--- a/briar-desktop/build.xml
+++ b/briar-desktop/build.xml
@@ -22,7 +22,7 @@
 	<target name='compile'>
 		<mkdir dir='../briar-api/build'/>
 		<javac srcdir='../briar-api/src'
-			destdir='../briar-api/build' source='1.5' target='1.5'
+			destdir='../briar-api/build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='api-jars'/>
@@ -30,7 +30,7 @@
 		</javac>
 		<mkdir dir='../briar-core/build'/>
 		<javac srcdir='../briar-core/src'
-			destdir='../briar-core/build' source='1.5' target='1.5'
+			destdir='../briar-core/build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='core-jars'/>
@@ -39,7 +39,7 @@
 			</classpath>
 		</javac>
 		<mkdir dir='build'/>
-		<javac srcdir='src' destdir='build' source='1.5' target='1.5'
+		<javac srcdir='src' destdir='build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='desktop-jars'/>
diff --git a/briar-tests/.classpath b/briar-tests/.classpath
index 548a670c9..e82f04259 100644
--- a/briar-tests/.classpath
+++ b/briar-tests/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-desktop"/>
@@ -13,5 +12,6 @@
 	<classpathentry kind="lib" path="libs/hamcrest-library-1.1.jar"/>
 	<classpathentry kind="lib" path="libs/jmock-2.5.1.jar"/>
 	<classpathentry kind="lib" path="libs/junit-4.9b3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/briar-tests/.gitignore b/briar-tests/.gitignore
index c74591937..eeb02632a 100644
--- a/briar-tests/.gitignore
+++ b/briar-tests/.gitignore
@@ -1,2 +1,3 @@
 bin
 build
+.settings
diff --git a/briar-tests/.settings/org.eclipse.jdt.core.prefs b/briar-tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 973413bf5..000000000
--- a/briar-tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Dec 05 20:58:21 GMT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/briar-tests/build.xml b/briar-tests/build.xml
index 40ca67c1b..34344944f 100644
--- a/briar-tests/build.xml
+++ b/briar-tests/build.xml
@@ -33,7 +33,7 @@
 	<target name='compile'>
 		<mkdir dir='../briar-api/build'/>
 		<javac srcdir='../briar-api/src'
-			destdir='../briar-api/build' source='1.5' target='1.5'
+			destdir='../briar-api/build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='api-jars'/>
@@ -41,7 +41,7 @@
 		</javac>
 		<mkdir dir='../briar-core/build'/>
 		<javac srcdir='../briar-core/src'
-			destdir='../briar-core/build' source='1.5' target='1.5'
+			destdir='../briar-core/build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='core-jars'/>
@@ -51,7 +51,7 @@
 		</javac>
 		<mkdir dir='../briar-desktop/build'/>
 		<javac srcdir='../briar-desktop/src'
-			destdir='../briar-desktop/build' source='1.5' target='1.5'
+			destdir='../briar-desktop/build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='desktop-jars'/>
@@ -62,7 +62,7 @@
 			</classpath>
 		</javac>
 		<mkdir dir='build'/>
-		<javac srcdir='src' destdir='build' source='1.5' target='1.5'
+		<javac srcdir='src' destdir='build' source='1.6' target='1.6'
 			includeantruntime='false' debug='off'>
 			<classpath>
 				<fileset refid='test-jars'/>