diff --git a/CHANGES.md b/CHANGES.md index dd5340a2d..88149ecc4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ -### 3.3.0 (Pending) +### 3.3.0 (2016-06-05) +* Add an optional timeout to cancel scanning. (#161) * Rename CompoundBarcodeView to DecoratedBarcodeView. +* Add more internal documentation (comments). ### 3.2.0 (2016-02-06) diff --git a/README.md b/README.md index bf6fc87b1..88995cd86 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ repositories { } dependencies { - compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar' + compile 'com.journeyapps:zxing-android-embedded:3.3.0@aar' compile 'com.google.zxing:core:3.2.1' compile 'com.android.support:appcompat-v7:23.1.0' // Version 23+ is required } diff --git a/build.gradle b/build.gradle index 1981ead26..a9e33c7cf 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ subprojects { mavenLocal() } - version = '3.2.0' + version = '3.3.0' group = 'com.journeyapps' apply plugin: 'android-sdk-manager' diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java index 09fc58cbf..8aefb0353 100644 --- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java +++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java @@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) { /** * Override to use a different layout. * - * @return the CompoundBarcodeView + * @return the DecoratedBarcodeView */ protected DecoratedBarcodeView initializeContent() { setContentView(R.layout.zxing_capture);