Transdroid: bump to 2.1.2, add java6 source patch
The java6 source patch is not yet upstream but submitted.
This commit is contained in:
parent
9a52416725
commit
47560f1347
|
|
@ -19,8 +19,9 @@ See also [[org.transdroid.search]].
|
||||||
Repo Type:git
|
Repo Type:git
|
||||||
Repo:https://github.com/erickok/transdroid.git
|
Repo:https://github.com/erickok/transdroid.git
|
||||||
|
|
||||||
Build:2.1.1,210
|
Build:2.1.2,211
|
||||||
commit=5aa1d8d4f23fbf308f71d28702f4b09273818955
|
commit=5aa1d8d4f23fbf308f71d28702f4b09273818955
|
||||||
|
patch=java6source.patch
|
||||||
subdir=full
|
subdir=full
|
||||||
prebuild=ant -f ../lib/build.xml \
|
prebuild=ant -f ../lib/build.xml \
|
||||||
&& sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;' ../core/res/values/bools.xml \
|
&& sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;' ../core/res/values/bools.xml \
|
||||||
|
|
|
||||||
22
metadata/org.transdroid.full/java6source.patch
Normal file
22
metadata/org.transdroid.full/java6source.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
commit 93e997d442d617226c3dc307719e9b752f037e91
|
||||||
|
Author: Florian Schmaus <flo@geekplace.eu>
|
||||||
|
Date: Thu Dec 19 10:58:31 2013 +0100
|
||||||
|
|
||||||
|
lib/build.xml: Also set javac source to java6
|
||||||
|
|
||||||
|
"javac: target release 6 conflicts with default source release 1.7"
|
||||||
|
error will be emitted if a java7 compiler is used and target is set to 6
|
||||||
|
but not source.
|
||||||
|
|
||||||
|
diff --git a/lib/build.xml b/lib/build.xml
|
||||||
|
index 066dfff..d480d57 100644
|
||||||
|
--- a/lib/build.xml
|
||||||
|
+++ b/lib/build.xml
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
srcdir="src/"
|
||||||
|
destdir="build/"
|
||||||
|
bootclasspath="${sdk-location}/platforms/${android.version}/android.jar"
|
||||||
|
+ source="6"
|
||||||
|
target="6"
|
||||||
|
/>
|
||||||
|
<jar
|
||||||
Loading…
Reference in a new issue