Update dependencies. Release 3.14 / 580 to prod.

TUM-Dev · Apr 22, 2022 · d48bc2f · d48bc2f
1 parent 9952079
commit d48bc2f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 36 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,35 +36,24 @@ android {
     }
     defaultConfig {
         applicationId "de.tum.in.tumcampus"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
-        versionCode 580
-        versionName "3.14-dev"
+        versionCode 581
+        versionName "3.15-dev"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         kapt.arguments {
             arg("room.schemaLocation", "$projectDir/schemas".toString())
         }
     }
-    lintOptions {
-        checkAllWarnings true
-        htmlReport false
-        abortOnError false
-        lintConfig new File("gradle/config/lint.xml")
-        disable 'GoogleAppIndexingWarning',
-                'TrulyRandom',
-                'ContentDescription',
-                'UnusedIds',
-                'UnusedResources',    // unused resources get purged by shrinkResources
-                'SelectableText'      // disabled by default
-    }
     buildFeatures {
         viewBinding true
     }
     packagingOptions {
-        exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
-        exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
+        resources {
+            excludes += ['META-INF/maven/com.google.guava/guava/pom.properties', 'META-INF/maven/com.google.guava/guava/pom.xml']
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -87,6 +76,13 @@ android {
     androidExtensions {
         experimental = true
     }
+    lint {
+        abortOnError false
+        checkAllWarnings true
+        disable 'GoogleAppIndexingWarning', 'TrulyRandom', 'ContentDescription', 'UnusedIds', 'UnusedResources', 'SelectableText'
+        htmlReport false
+        lintConfig file('gradle/config/lint.xml')
+    }
 }
 
 def retrofitVersion = '2.9.0'
@@ -102,39 +98,39 @@ dependencies {
 
     // Support Libraries
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Android arch components
     implementation "androidx.room:room-rxjava2:$room_version"
     implementation "androidx.room:room-runtime:$room_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'android.arch.lifecycle:reactivestreams:1.1.1'
     implementation 'android.arch.work:work-runtime-ktx:1.0.1'
     // Note: Appcompat 1.4 breaks sandwich menu injected into toolbar by DrawerLayout
     // upgrading this and or androidx.fragment:fragment-ktx will break the toolbar
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    kapt 'androidx.lifecycle:lifecycle-compiler:2.4.0'
+    kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
     kapt "androidx.room:room-compiler:$room_version"
 
     // Play services
-    implementation 'com.google.android.gms:play-services-base:17.6.0'
-    implementation 'com.google.android.gms:play-services-location:18.0.0'
+    implementation 'com.google.android.gms:play-services-base:18.0.1'
+    implementation 'com.google.android.gms:play-services-location:19.0.1'
 
     // Used for in-app reviews
     implementation "com.google.android.play:core:$play_core_services"
     implementation "com.google.android.play:core-ktx:$play_core_services_kotlin_extension"
 
     // Firebase
-    implementation 'com.google.firebase:firebase-core:20.0.0'
-    implementation 'com.google.firebase:firebase-messaging:23.0.0'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.4'
-    implementation 'com.google.firebase:firebase-analytics-ktx:20.0.0'
+    implementation 'com.google.firebase:firebase-core:20.1.2'
+    implementation 'com.google.firebase:firebase-messaging:23.0.3'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.9'
+    implementation 'com.google.firebase:firebase-analytics-ktx:20.1.2'
 
     // Helpers
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'net.danlew:android.joda:2.10.6.1'
 
     // XML Parsing
@@ -165,7 +161,7 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.8'
     implementation "com.tickaroo.tikxml:retrofit-converter:$tikXmlVersion"
     implementation 'com.github.franmontiel:PersistentCookieJar:1.0.1'
-    implementation 'com.squareup.okio:okio:2.8.0'
+    implementation 'com.squareup.okio:okio:2.10.0'
 
     // UI
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -189,7 +185,7 @@ dependencies {
     debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 
     // Testing
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.5.11'
     testImplementation 'org.assertj:assertj-core:3.17.1'
     testImplementation "androidx.room:room-testing:$room_version"

diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.6.0'
-        room_version = '2.4.0-beta02'
+        kotlin_version = '1.6.10'
+        room_version = '2.5.0-alpha01'
     }
     repositories {
         google()
@@ -13,11 +13,11 @@ buildscript {
         maven { url "https://jitpack.io"}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jlleitschuh.gradle:ktlint-gradle:8.2.0'
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.41.0"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.13.1"
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.18"
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
@@ -44,6 +44,6 @@ allprojects {
 }
 
 ext {
-    play_core_services = '1.10.2'
+    play_core_services = '1.10.3'
     play_core_services_kotlin_extension = '1.8.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip