Merge pull request #528 from hannesa2/AndroidStudio-3.5.3

rkistner · web-flow · commit 4893bcc194eb · 2020-01-08T10:13:54.000+02:00
Android Studio 3.5.3
diff --git a/build.gradle b/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'
     }
 }
diff --git a/sample/.gitignore b/sample/.gitignore
diff --git a/zxing-android-embedded/build.gradle b/zxing-android-embedded/build.gradle
@@ -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"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.5.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.5.3'`
`9`	`9`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`
`11`	`11`	`api 'androidx.legacy:legacy-support-v4:1.0.0'`
`12`	`12`
`13`		`- testImplementation 'junit:junit:4.12'`
	`13`	`+ testImplementation 'junit:junit:4.13'`
`14`	`14`	`testImplementation "org.mockito:mockito-core:1.9.5"`
`15`	`15`	`}`
`16`	`16`