From 851e13f4858f3d64ee863ad99862fa5b1f015186 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 9 Oct 2014 18:02:22 -0400 Subject: [PATCH] move all ant settings to project.properties No need in having them scattered across multiple files. --- F-Droid/ant.properties | 3 --- F-Droid/project.properties | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 F-Droid/ant.properties diff --git a/F-Droid/ant.properties b/F-Droid/ant.properties deleted file mode 100644 index e5d868bde..000000000 --- a/F-Droid/ant.properties +++ /dev/null @@ -1,3 +0,0 @@ -java.encoding=UTF-8 -java.source=1.7 -java.target=1.7 diff --git a/F-Droid/project.properties b/F-Droid/project.properties index b37ddfb4e..f9835af26 100644 --- a/F-Droid/project.properties +++ b/F-Droid/project.properties @@ -10,3 +10,10 @@ android.library.reference.7=../extern/Support/v7/appcompat # For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/ source.dir=src;../extern/symlinks-for-ant-and-eclipse + +# With a target SDK of android-19 (4.4.2/KitKat) and a Java 1.7 compiler, you +# can use Java 1.7 features like the <> diamond operator, multi-catch, strings +# in switches, etc. zxing uses the <> operator, so Java 1.7 is required. +java.encoding=UTF-8 +java.source=1.7 +java.target=1.7