Merge branch 'master' of github.com:journeyapps/zxing-android-embedded

Author: rkistner

.travis.yml

@@ -15,17 +15,22 @@ android:
     - 'android-sdk-preview-license-.+'
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
+
+branches:
+  only:
+    - master
+
 before_install:
-    # Android SDK installation is a mess, especially with licenses. Not sure if all of this is required, but it works.
-    - echo "$ANDROID_HOME"
-    - mkdir -p "$ANDROID_HOME/licenses"
-    - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-    - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-    - yes | sdkmanager "platforms;android-27"
+  # Android SDK installation is a mess, especially with licenses. Not sure if all of this is required, but it works.
+  - echo "$ANDROID_HOME"
+  - mkdir -p "$ANDROID_HOME/licenses"
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - yes | sdkmanager "platforms;android-27"
 
 script:
-    # build includes lint and test
-    - TERM=dumb ./gradlew build
+  # build includes lint and test
+  - TERM=dumb ./gradlew build
 
 after_failure:
-    - cat **/build/reports/lint-results.xml
+  - cat **/build/reports/lint-results.xml

README.md

@@ -25,7 +25,7 @@ No guarantees are made on support for older SDK versions - you'll have to test t
 
 ## Adding aar dependency with Gradle
 
-From version 4.0.0, only Android SDK 24+ is supported by default, and androidx is required.
+From version 4.0.2, only Android SDK 24+ is supported by default, and androidx is required.
 
 Add the following to your `build.gradle` file:
 
@@ -35,7 +35,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.journeyapps:zxing-android-embedded:4.0.0'
+    implementation 'com.journeyapps:zxing-android-embedded:4.0.2'
     implementation 'androidx.appcompat:appcompat:1.0.2'
 }
 
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    implementation('com.journeyapps:zxing-android-embedded:3.6.0') { transitive = false }
+    implementation('com.journeyapps:zxing-android-embedded:4.0.2') { transitive = false }
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.google.zxing:core:3.3.0'
 }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }

sample/.gitignore

@@ -10,7 +10,7 @@ dependencies {
 
     api 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation "org.mockito:mockito-core:1.9.5"
 }