diff --git a/PennMobile/build.gradle b/PennMobile/build.gradle index 948828d1..41941290 100644 --- a/PennMobile/build.gradle +++ b/PennMobile/build.gradle @@ -47,19 +47,21 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.google.firebase:firebase-analytics:17.4.1' + implementation(platform("com.google.firebase:firebase-bom:31.5.0")) + + implementation 'com.google.firebase:firebase-analytics' implementation 'androidx.multidex:multidex:2.0.1' implementation 'com.google.maps:google-maps-services:0.13.0' implementation 'org.jsoup:jsoup:1.13.1' - implementation 'com.google.android.material:material:1.6.0' + implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.percentlayout:percentlayout:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.2.0' + implementation 'androidx.exifinterface:exifinterface:1.3.6' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'com.google.android.gms:play-services-maps:17.0.0' - implementation 'com.google.android.gms:play-services-location:17.0.0' + implementation 'com.google.android.gms:play-services-maps:18.2.0' + implementation 'com.google.android.gms:play-services-location:21.0.1' implementation 'joda-time:joda-time:2.10.6' implementation 'org.apache.commons:commons-lang3:3.10' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation ("androidx.lifecycle:lifecycle-extensions:2.2.0@aar") { @@ -69,27 +71,26 @@ dependencies { implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.okhttp:okhttp:2.7.5' implementation 'io.reactivex:rxandroid:1.2.1' - implementation 'androidx.browser:browser:1.2.0' + implementation 'androidx.browser:browser:1.5.0' implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.daimajia.swipelayout:library:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - testImplementation 'junit:junit:4.13' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'org.testng:testng:7.1.0' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'com.github.ahorn:android-rss:master-SNAPSHOT' - // official release is several years old and is not thread-safe implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1" implementation 'com.eightbitlab:supportrenderscriptblur:1.0.2' implementation 'androidx.palette:palette-ktx:1.0.0' implementation 'com.github.searchy2:CustomAlertViewDialogue:2.6.1' implementation 'com.airbnb.android:lottie:4.2.0' - implementation 'com.github.bumptech.glide:glide:4.11.0' // Glide for gif loading + implementation 'com.github.bumptech.glide:glide:4.11.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'com.kaspersky.android-components:kaspresso:1.1.0' implementation "com.squareup.retrofit2:retrofit:2.6.2" implementation "com.squareup.retrofit2:converter-moshi:2.5.0" @@ -136,15 +137,15 @@ def debugTree = fileTree(dir: "$project.buildDir/tmp/kotlin-classes/debug", def mainSrc = "$project.projectDir/src/main/java" // Task declaration -/* + task jacocoTestReport(type: JacocoReport) { // Runs only after the dependencies are executed dependsOn = ['testDebugUnitTest', 'createDebugCoverageReport'] // Export formats - reports { + /*reports { xml.enabled = true html.enabled = true - } + }*/ sourceDirectories.setFrom(files([mainSrc])) classDirectories.setFrom(files([debugTree])) @@ -155,4 +156,3 @@ task jacocoTestReport(type: JacocoReport) { // 'outputs/code_coverage/debugAndroidTest/connected/*.ec' ]) } -*/ \ No newline at end of file