Merge pull request #300 from wncc/deps1

deps: bump up everything to latest
DevCom-IITB · Nov 30, 2020 · 85156d5 · 85156d5
2 parents a969955 + f2f1c85
commit 85156d5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 50 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
     defaultConfig {
         applicationId "app.insti"
         manifestPlaceholders 'appAuthRedirectScheme': 'https'
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 45
         versionName "1.4.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,59 +24,43 @@ android {
 }
 
 ext {
-    androidxVersion = '1.0.0'
-    playServicesVersion = '17.0.0'
-    playServicesVisionVersion = '19.0.0'
-    retrofitVersion = '2.6.2'
-    okhttpVersion = '4.2.2'
-    picassoVersion = '2.71828'
-    circleImageViewVersion = '3.0.1'
-    markwonVersion = '4.2.0'
-    tagViewVersion = '1.3'
-    circleIndicatorVersion = '2.1.4'
-    firebaseVersion = '20.0.1'
-    flexboxVersion = '1.0.0'
-    sectionedRecyclerViewVersion = '3.1.0'
-    lottieVersion = '2.7.0'
-    shortcutBadgerVersion = '1.1.22@aar'
-    materialCalendarViewVersion = '2.0.1'
-    threetenBPVersion = '1.2.0'
+    markwonVersion = '4.6.0'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.google.firebase:firebase-messaging:${firebaseVersion}"
-    implementation "com.google.android.material:material:${androidxVersion}"
-    implementation "androidx.exifinterface:exifinterface:${androidxVersion}"
-    implementation "androidx.preference:preference:${androidxVersion}"
-    implementation "androidx.cardview:cardview:${androidxVersion}"
-    implementation "androidx.browser:browser:${androidxVersion}"
-    implementation "androidx.legacy:legacy-support-v4:${androidxVersion}"
+    implementation "com.google.firebase:firebase-messaging:21.0.0"
+    implementation "com.google.android.material:material:1.2.1"
+    implementation "com.google.android:flexbox:1.0.0"
+    implementation "androidx.exifinterface:exifinterface:1.3.1"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.browser:browser:1.2.0"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
 
-    implementation "com.google.android.gms:play-services-maps:${playServicesVersion}"
-    implementation "com.google.android.gms:play-services-location:${playServicesVersion}"
-    implementation "com.google.android.gms:play-services-places:${playServicesVersion}"
-    implementation "com.google.android.gms:play-services-vision:${playServicesVisionVersion}"
+    implementation "com.google.android.gms:play-services-maps:17.0.0"
+    implementation "com.google.android.gms:play-services-location:17.1.0"
+    implementation "com.google.android.gms:play-services-places:17.0.0"
+    implementation "com.google.android.gms:play-services-vision:20.1.2"
 
-    implementation "com.squareup.retrofit2:retrofit:${retrofitVersion}"
-    implementation "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
-    implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
-    implementation "com.squareup.picasso:picasso:${picassoVersion}"
-    implementation "de.hdodenhof:circleimageview:${circleImageViewVersion}"
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+    implementation "com.squareup.okhttp3:okhttp:4.9.0"
+    implementation "com.squareup.picasso:picasso:2.8"
+    implementation "de.hdodenhof:circleimageview:3.1.0"
 
     implementation "io.noties.markwon:core:${markwonVersion}"
     implementation "io.noties.markwon:html:${markwonVersion}"
     implementation "io.noties.markwon:image-picasso:${markwonVersion}"
     implementation "io.noties.markwon:linkify:${markwonVersion}"
     implementation "io.noties.markwon:ext-tables:${markwonVersion}"
 
-    implementation "com.github.Cutta:TagView:${tagViewVersion}"
-    implementation "me.relex:circleindicator:${circleIndicatorVersion}"
-    implementation "com.google.android:flexbox:${flexboxVersion}"
-    implementation "io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:${sectionedRecyclerViewVersion}"
-    implementation "com.airbnb.android:lottie:$lottieVersion"
-    implementation "me.leolin:ShortcutBadger:$shortcutBadgerVersion"
-    implementation "com.github.prolificinteractive:material-calendarview:${materialCalendarViewVersion}"
-    implementation "com.jakewharton.threetenabp:threetenabp:${threetenBPVersion}"
+    implementation "com.github.Cutta:TagView:1.3"
+    implementation "me.relex:circleindicator:2.1.4"
+    implementation "io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:3.2.0"
+    implementation "com.airbnb.android:lottie:3.5.0"
+    implementation "me.leolin:ShortcutBadger:1.1.22@aar"
+    implementation "com.github.prolificinteractive:material-calendarview:2.0.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.3.0"
 }
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/app/insti/fragment/ComplaintFragment.java b/app/src/main/java/app/insti/fragment/ComplaintFragment.java
@@ -90,12 +90,12 @@ public void run() {
                             int tablLayoutWidth = slidingTabLayout.getWidth();
 
                             DisplayMetrics metrics = new DisplayMetrics();
-                            Objects.requireNonNull(getActivity()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
+                            requireActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
                             int deviceWidth = metrics.widthPixels;
 
                             if (tablLayoutWidth <= deviceWidth) {
 
-                                final TypedArray styledAttributes = Objects.requireNonNull(ComplaintFragment.this.getActivity()).getTheme().obtainStyledAttributes(
+                                final TypedArray styledAttributes = ComplaintFragment.this.requireActivity().getTheme().obtainStyledAttributes(
                                         new int[]{android.R.attr.actionBarSize});
                                 styledAttributes.recycle();
                                 //Replace second parameter to mActionBarSize = (int) styledAttributes.getDimension(0, 0) after adding "Relevant Complaints"

diff --git a/build.gradle b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.google.gms:google-services:4.3.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 06 02:37:18 IST 2019
+#Sun Nov 15 09:17:20 IST 2020
 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-6.5-bin.zip