diff --git a/CHANGES b/CHANGES index 4e49c8805..637fabdbd 100644 --- a/CHANGES +++ b/CHANGES @@ -345,3 +345,9 @@ - Retire actionscript port - Small bug fixes + +3.2.0 (15 Feb 2014) + + - Several bug fixes, especially for Data Matrix and PDF417 parsing + - Retired jruby binding + - Barcode Scanner can now disable history diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index fd599a69c..d3fc74417 100755 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -16,8 +16,8 @@ --> diff --git a/android/assets/html-de/whatsnew.html b/android/assets/html-de/whatsnew.html index 9bdc3ca13..31f8c56f1 100644 --- a/android/assets/html-de/whatsnew.html +++ b/android/assets/html-de/whatsnew.html @@ -7,8 +7,7 @@

Übersetzt von Google Translate.

diff --git a/android/assets/html-en/whatsnew.html b/android/assets/html-en/whatsnew.html index 27be28fd8..80b32a690 100644 --- a/android/assets/html-en/whatsnew.html +++ b/android/assets/html-en/whatsnew.html @@ -7,8 +7,7 @@ diff --git a/android/assets/html-es/whatsnew.html b/android/assets/html-es/whatsnew.html index a7fbd42d4..87ae18fc4 100644 --- a/android/assets/html-es/whatsnew.html +++ b/android/assets/html-es/whatsnew.html @@ -7,8 +7,8 @@ +

Traducido por Google Translate.

diff --git a/android/assets/html-fr/whatsnew.html b/android/assets/html-fr/whatsnew.html index 56deaa64d..661ee3bc5 100644 --- a/android/assets/html-fr/whatsnew.html +++ b/android/assets/html-fr/whatsnew.html @@ -7,9 +7,8 @@ -

Traduite par Google Translate.

+

Traduit par Google Translate.

diff --git a/android/assets/html-it/whatsnew.html b/android/assets/html-it/whatsnew.html index 62fea8ab2..358945c08 100644 --- a/android/assets/html-it/whatsnew.html +++ b/android/assets/html-it/whatsnew.html @@ -7,8 +7,7 @@

Tradotto da Google Translate.

diff --git a/android/assets/html-ja/whatsnew.html b/android/assets/html-ja/whatsnew.html index 6c8a7d190..6127c7c4d 100644 --- a/android/assets/html-ja/whatsnew.html +++ b/android/assets/html-ja/whatsnew.html @@ -7,9 +7,8 @@ -

Google翻訳で翻訳。

+

Googleによって翻訳翻訳。

diff --git a/android/assets/html-ko/whatsnew.html b/android/assets/html-ko/whatsnew.html index b19b974a5..bb8d377a8 100644 --- a/android/assets/html-ko/whatsnew.html +++ b/android/assets/html-ko/whatsnew.html @@ -7,9 +7,8 @@ -

Google 번역에 의해 번역.

+

구글 번역은 번역.

diff --git a/android/assets/html-nl/whatsnew.html b/android/assets/html-nl/whatsnew.html index f7b874de6..37b3a6d8d 100644 --- a/android/assets/html-nl/whatsnew.html +++ b/android/assets/html-nl/whatsnew.html @@ -7,8 +7,7 @@

Vertaald door Google Translate.

diff --git a/android/assets/html-pt/whatsnew.html b/android/assets/html-pt/whatsnew.html index 452fac823..d30bc146c 100644 --- a/android/assets/html-pt/whatsnew.html +++ b/android/assets/html-pt/whatsnew.html @@ -7,8 +7,7 @@

Traduzido pelo Google Translate.

diff --git a/android/assets/html-ru/whatsnew.html b/android/assets/html-ru/whatsnew.html index 3ee0c3c26..0c11a6ce1 100644 --- a/android/assets/html-ru/whatsnew.html +++ b/android/assets/html-ru/whatsnew.html @@ -7,8 +7,7 @@

Перевод Google Translate.

diff --git a/android/assets/html-zh-rCN/whatsnew.html b/android/assets/html-zh-rCN/whatsnew.html index f76e59409..3ca1ca708 100644 --- a/android/assets/html-zh-rCN/whatsnew.html +++ b/android/assets/html-zh-rCN/whatsnew.html @@ -7,9 +7,8 @@ -

由谷歌自动翻译系统。

+

由谷歌翻译翻译。

diff --git a/android/assets/html-zh-rTW/whatsnew.html b/android/assets/html-zh-rTW/whatsnew.html index 6742aa7db..6a01d5a75 100644 --- a/android/assets/html-zh-rTW/whatsnew.html +++ b/android/assets/html-zh-rTW/whatsnew.html @@ -7,9 +7,8 @@ -

由谷歌自動翻譯系統。

+

由谷歌翻譯翻譯。

diff --git a/android/pom.xml b/android/pom.xml index dd6a5acf6..db0173472 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -18,7 +18,7 @@ 4.0.0 android - 4.7.1 + 4.7.2 apk @@ -46,7 +46,7 @@ src - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin diff --git a/android/proguard.cfg b/android/proguard.cfg index 3dc25f17f..01cceefa4 100644 --- a/android/proguard.cfg +++ b/android/proguard.cfg @@ -10,7 +10,7 @@ # be complete or up to date. (The "arithmetic" optimization can be # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. --optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private +-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private -optimizationpasses 5 -allowaccessmodification -dontpreverify diff --git a/androidtest/pom.xml b/androidtest/pom.xml index 2832f0980..e456dc84e 100644 --- a/androidtest/pom.xml +++ b/androidtest/pom.xml @@ -50,7 +50,7 @@ src - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin diff --git a/androidtest/proguard.cfg b/androidtest/proguard.cfg index 3dc25f17f..01cceefa4 100644 --- a/androidtest/proguard.cfg +++ b/androidtest/proguard.cfg @@ -10,7 +10,7 @@ # be complete or up to date. (The "arithmetic" optimization can be # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. --optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private +-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private -optimizationpasses 5 -allowaccessmodification -dontpreverify diff --git a/glass/pom.xml b/glass/pom.xml index a159a96fb..2a9bba128 100644 --- a/glass/pom.xml +++ b/glass/pom.xml @@ -46,7 +46,7 @@ src - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin diff --git a/glass/proguard.cfg b/glass/proguard.cfg index 3dc25f17f..01cceefa4 100644 --- a/glass/proguard.cfg +++ b/glass/proguard.cfg @@ -10,7 +10,7 @@ # be complete or up to date. (The "arithmetic" optimization can be # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. --optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private +-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private -optimizationpasses 5 -allowaccessmodification -dontpreverify diff --git a/pom.xml b/pom.xml index aa9d8d64e..c8853dd21 100644 --- a/pom.xml +++ b/pom.xml @@ -330,9 +330,9 @@ 2.6 - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin - 4.0.0-rc.2 + 4.1.1 true @@ -625,7 +625,7 @@ maven-jarsigner-plugin - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin