akwizgran d0342f9a4e Merge branch 'junit-4-not-3' into 'master' ...

Don't mix JUnit 4's @Test with JUnit3's TestCase.

This is the world's most boring merge request. Android Studio was complaining about using JUnit 4's @Test annotations with JUnit 3's TestCase, so I fixed it.

Most of the changes come from Android Studio organising imports in a different order from Eclipse.

See merge request !8

2015-12-09 13:23:42 +00:00

..

libs

Merged prototype-test repo into prototype repo, as a separate Eclipse project.

2012-12-05 20:41:01 +00:00

src

Don't mix JUnit 4 annotations with JUnit3 TestCase.

2015-12-08 14:53:50 +00:00

.classpath

Upgraded Spongy Castle to 1.53, fixed tests. #146

2015-12-03 11:12:16 +00:00

.gitignore

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

2013-11-22 12:00:00 +00:00

.project

Merged prototype-test repo into prototype repo, as a separate Eclipse project.

2012-12-05 20:41:01 +00:00

build.gradle

Set source and target version to Java 6 in subprojects.

2015-12-04 10:12:01 +00:00

build.xml

Renamed serial component to data, moved consumers to briar-core.

2015-05-02 20:39:24 +01:00