Skip to content
Snippets Groups Projects
Commit 3b5769cf authored by akwizgran's avatar akwizgran
Browse files

Use Java 1.6 instead of 1.5. We no longer aim to support OS X 10.4.

parent a2aa1305
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 39 deletions
briar-android/.gitignore
+ 1
− 1
View file @ 3b5769cf
bin bin
gen gen
local.properties local.properties
/Briar-alpha.apk .settings
briar-api/.classpath
+ 1
− 1
View file @ 3b5769cf
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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="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"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
briar-api/.gitignore
+ 1
− 0
View file @ 3b5769cf
bin bin
build build
.settings
briar-api/build.xml
+ 1
− 1
View file @ 3b5769cf
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</target> </target>
<target name='compile'> <target name='compile'>
<mkdir dir='build'/> <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
......
briar-core/.classpath
+ 1
− 1
View file @ 3b5769cf
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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-api"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/> <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/h2small-1.3.170.jar"/>
<classpathentry kind="lib" path="libs/javax.inject.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/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="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"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
briar-core/.gitignore
+ 1
− 0
View file @ 3b5769cf
bin bin
build build
.settings
briar-core/.settings/org.eclipse.jdt.core.prefs deleted 100644 → 0
+ 0
− 8
View file @ a2aa1305
#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
briar-core/build.xml
+ 2
− 2
View file @ 3b5769cf
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
<target name='compile'> <target name='compile'>
<mkdir dir='../briar-api/build'/> <mkdir dir='../briar-api/build'/>
<javac srcdir='../briar-api/src' <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
</classpath> </classpath>
</javac> </javac>
<mkdir dir='build'/> <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='core-jars'/> <fileset refid='core-jars'/>
......
briar-desktop/.classpath
+ 1
− 1
View file @ 3b5769cf
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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-api"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/> <classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/> <classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
...@@ -12,5 +11,6 @@ ...@@ -12,5 +11,6 @@
<classpathentry kind="lib" path="libs/jnotify-0.93.jar"/> <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/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="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"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
briar-desktop/.gitignore
+ 1
− 0
View file @ 3b5769cf
bin bin
build build
.settings
briar-desktop/.settings/org.eclipse.jdt.core.prefs deleted 100644 → 0
+ 0
− 8
View file @ a2aa1305
#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
briar-desktop/build.xml
+ 3
− 3
View file @ 3b5769cf
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<target name='compile'> <target name='compile'>
<mkdir dir='../briar-api/build'/> <mkdir dir='../briar-api/build'/>
<javac srcdir='../briar-api/src' <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</javac> </javac>
<mkdir dir='../briar-core/build'/> <mkdir dir='../briar-core/build'/>
<javac srcdir='../briar-core/src' <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='core-jars'/> <fileset refid='core-jars'/>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</classpath> </classpath>
</javac> </javac>
<mkdir dir='build'/> <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='desktop-jars'/> <fileset refid='desktop-jars'/>
......
briar-tests/.classpath
+ 1
− 1
View file @ 3b5769cf
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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-api"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/> <classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-desktop"/> <classpathentry combineaccessrules="false" kind="src" path="/briar-desktop"/>
...@@ -13,5 +12,6 @@ ...@@ -13,5 +12,6 @@
<classpathentry kind="lib" path="libs/hamcrest-library-1.1.jar"/> <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/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="libs/junit-4.9b3.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"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
briar-tests/.gitignore
+ 1
− 0
View file @ 3b5769cf
bin bin
build build
.settings
briar-tests/.settings/org.eclipse.jdt.core.prefs deleted 100644 → 0
+ 0
− 8
View file @ a2aa1305
#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
briar-tests/build.xml
+ 4
− 4
View file @ 3b5769cf
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<target name='compile'> <target name='compile'>
<mkdir dir='../briar-api/build'/> <mkdir dir='../briar-api/build'/>
<javac srcdir='../briar-api/src' <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='api-jars'/> <fileset refid='api-jars'/>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</javac> </javac>
<mkdir dir='../briar-core/build'/> <mkdir dir='../briar-core/build'/>
<javac srcdir='../briar-core/src' <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='core-jars'/> <fileset refid='core-jars'/>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</javac> </javac>
<mkdir dir='../briar-desktop/build'/> <mkdir dir='../briar-desktop/build'/>
<javac srcdir='../briar-desktop/src' <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='desktop-jars'/> <fileset refid='desktop-jars'/>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</classpath> </classpath>
</javac> </javac>
<mkdir dir='build'/> <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'> includeantruntime='false' debug='off'>
<classpath> <classpath>
<fileset refid='test-jars'/> <fileset refid='test-jars'/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment