Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
master: Updated various dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
CircleCi committed Oct 15, 2019
1 parent e44ef11 commit dc131b4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,25 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.firebase:firebase-core:16.0.9'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'com.google.firebase:firebase-core:17.2.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'

kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0'

//region Local Unit Tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.24.5'
testImplementation 'org.mockito:mockito-core:2.28.2'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
testImplementation 'androidx.test:runner:1.2.0'
testImplementation 'androidx.arch.core:core-testing:2.0.0'
testImplementation 'androidx.arch.core:core-testing:2.1.0'
//endregion

//region Instrumented Tests
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'org.mockito:mockito-android:2.24.5'
androidTestImplementation 'org.mockito:mockito-android:2.28.2'
androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
androidTestImplementation 'androidx.arch.core:core-testing:2.0.0'
androidTestImplementation 'androidx.arch.core:core-testing:2.1.0'
// UI testing with Espresso
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.google.gms:google-services:4.3.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
20 changes: 10 additions & 10 deletions kbarcode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.google.firebase:firebase-ml-vision:20.0.0'
implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
implementation 'com.google.firebase:firebase-ml-vision:21.0.0'
implementation 'androidx.lifecycle:lifecycle-livedata:2.1.0'

kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0'

//region Local Unit Tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.24.5'
testImplementation 'org.mockito:mockito-core:2.28.2'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
testImplementation 'androidx.test:runner:1.2.0'
testImplementation 'androidx.arch.core:core-testing:2.0.0'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.1'
testImplementation 'androidx.arch.core:core-testing:2.1.0'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.2'
//endregion

//region Instrumented Tests
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'org.mockito:mockito-android:2.24.5'
androidTestImplementation 'org.mockito:mockito-android:2.28.2'
androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
androidTestImplementation 'androidx.arch.core:core-testing:2.0.0'
androidTestImplementation 'androidx.arch.core:core-testing:2.1.0'
// UI testing with Espresso
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
//endregion
Expand All @@ -80,7 +80,7 @@ ext {
siteUrl = 'https://github.com/brightec/KBarcode'
gitUrl = 'https://github.com/brightec/KBarcode.git'

libraryVersion = '1.0.3'
libraryVersion = '1.0.4'

developerId = 'alistairsykes'
developerName = 'Alistair Sykes'
Expand Down

0 comments on commit dc131b4

Please sign in to comment.