Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
akwizgran
2013-11-22 12:00:00 +00:00
parent a2aa13051a
commit 3b5769cf8a
16 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/.gitignore vendored
View File

@@ -1,4 +1,4 @@
bin
gen
local.properties
/Briar-alpha.apk
.settings

2
briar-api/.classpath
View File

@@ -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>

1
briar-api/.gitignore vendored
View File

@@ -1,2 +1,3 @@
bin
build
.settings

2
briar-api/build.xml
View File

@@ -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'/>

2
briar-core/.classpath
View File

@@ -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>

1
briar-core/.gitignore vendored
View File

@@ -1,2 +1,3 @@
bin
build
.settings

8
briar-core/.settings/org.eclipse.jdt.core.prefs
View File

@@ -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

4
briar-core/build.xml
View File

@@ -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'/>

2
briar-desktop/.classpath
View File

@@ -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>

1
briar-desktop/.gitignore vendored
View File

@@ -1,2 +1,3 @@
bin
build
.settings

8
briar-desktop/.settings/org.eclipse.jdt.core.prefs
View File

@@ -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

6
briar-desktop/build.xml
View File

@@ -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'/>

2
briar-tests/.classpath
View File

@@ -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>

1
briar-tests/.gitignore vendored
View File

@@ -1,2 +1,3 @@
bin
build
.settings

8
briar-tests/.settings/org.eclipse.jdt.core.prefs
View File

@@ -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

8
briar-tests/build.xml
View File

@@ -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'/>