Skip to content

Commit 8ae76ea

Browse files
committed
Prepare release for 3.3.0.
1 parent 7d47cd3 commit 8ae76ea

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

CHANGES.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
### 3.3.0 (Pending)
1+
### 3.3.0 (2016-06-05)
22

3+
* Add an optional timeout to cancel scanning. (#161)
34
* Rename CompoundBarcodeView to DecoratedBarcodeView.
5+
* Add more internal documentation (comments).
46

57
### 3.2.0 (2016-02-06)
68

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repositories {
2626
}
2727
2828
dependencies {
29-
compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
29+
compile 'com.journeyapps:zxing-android-embedded:3.3.0@aar'
3030
compile 'com.google.zxing:core:3.2.1'
3131
compile 'com.android.support:appcompat-v7:23.1.0' // Version 23+ is required
3232
}

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ subprojects {
1717
mavenLocal()
1818
}
1919

20-
version = '3.2.0'
20+
version = '3.3.0'
2121
group = 'com.journeyapps'
2222
apply plugin: 'android-sdk-manager'
2323

zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
2727
/**
2828
* Override to use a different layout.
2929
*
30-
* @return the CompoundBarcodeView
30+
* @return the DecoratedBarcodeView
3131
*/
3232
protected DecoratedBarcodeView initializeContent() {
3333
setContentView(R.layout.zxing_capture);

0 commit comments

Comments
 (0)