Skip to content

Commit

Permalink
Merge pull request #13 from hypertrack/bug/dependency-conflicts
Browse files Browse the repository at this point in the history
Bug/dependency conflicts
  • Loading branch information
deniszpua authored Mar 12, 2020
2 parents b6f7026 + 9eef14b commit dfd4418
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

ext {
googleServices.disableVersionCheck = true
versionNumber = computeVersionNumber()
versionName = rootProject.version
keystorePath = properties.keystorePath
Expand Down Expand Up @@ -87,14 +88,22 @@ dependencies {

implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.16.7'

implementation 'com.hypertrack:hypertrack:4.2.0-SNAPSHOT'
implementation 'com.hypertrack:hypertrack:4.1.2'
// hypertrack could work with different version of play services
// so lets choose latest
implementation 'com.google.android.gms:play-services-location:17.0.0'
implementation 'com.google.firebase:firebase-messaging:20.1.2'

implementation 'com.hypertrack:hypertrack-views:0.8.6'
implementation 'com.hypertrack:maps-google:0.1.7'
implementation project(':hypertrack-trips')

implementation 'com.airbnb.android:lottie:3.1.0'

testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:4.3'
testImplementation 'org.mockito:mockito-core:2.28.2'
testImplementation 'org.threeten:threetenbp:1.4.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
Expand Down

0 comments on commit dfd4418

Please sign in to comment.