Update Android Support Libraries to 28.0.0. But we haven't refactor t…

…o AndroidX yet. Update Gradle & Android plugin Signed-off-by: Fung Gwo <fython@163.com>
fython · Oct 9, 2018 · c57e945 · c57e945
1 parent 0d3548c
commit c57e945
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -22,6 +22,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
     implementation project(':library')
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,7 +9,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 3
+        versionCode 4
         versionName project.rootProject.version
         vectorDrawables.useSupportLibrary = true
     }
@@ -21,11 +21,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:27.1.1'
-    //noinspection GradleCompatible
-    implementation 'com.android.support:support-vector-drawable:27.1.1'
-    //noinspection GradleCompatible
-    implementation 'com.android.support:animated-vector-drawable:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.android.support:support-vector-drawable:28.0.0'
+    implementation 'com.android.support:animated-vector-drawable:28.0.0'
 }
 
 ext {

diff --git a/library/src/main/java/moe/feng/support/biometricprompt/BiometricPromptCompatDialog.java b/library/src/main/java/moe/feng/support/biometricprompt/BiometricPromptCompatDialog.java
@@ -13,6 +13,8 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import java.util.Objects;
+
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
@@ -29,7 +31,7 @@ class BiometricPromptCompatDialog extends Dialog {
         setCancelable(true);
         setCanceledOnTouchOutside(true);
 
-        Window window = getWindow();
+        Window window = Objects.requireNonNull(getWindow());
         window.setLayout(MATCH_PARENT, WRAP_CONTENT);
         window.setGravity(Gravity.BOTTOM);