Prepare release for 3.3.0.

journeyapps · Jun 5, 2016 · 8ae76ea · 8ae76ea
1 parent 7d47cd3
commit 8ae76ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);