Skip to content

Commit c57e945

Browse files
committed
Update Android Support Libraries to 28.0.0. But we haven't refactor to AndroidX yet.
Update Gradle & Android plugin Signed-off-by: Fung Gwo <[email protected]>
1 parent 0d3548c commit c57e945

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.2'
10+
classpath 'com.android.tools.build:gradle:3.2.0'
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1212
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1313
}

demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation 'com.android.support:support-annotations:27.1.1'
25+
implementation 'com.android.support:support-annotations:28.0.0'
2626
implementation project(':library')
2727
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

library/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
defaultConfig {
1010
minSdkVersion 21
1111
targetSdkVersion 28
12-
versionCode 3
12+
versionCode 4
1313
versionName project.rootProject.version
1414
vectorDrawables.useSupportLibrary = true
1515
}
@@ -21,11 +21,9 @@ android {
2121
}
2222

2323
dependencies {
24-
implementation 'com.android.support:support-annotations:27.1.1'
25-
//noinspection GradleCompatible
26-
implementation 'com.android.support:support-vector-drawable:27.1.1'
27-
//noinspection GradleCompatible
28-
implementation 'com.android.support:animated-vector-drawable:27.1.1'
24+
implementation 'com.android.support:support-annotations:28.0.0'
25+
implementation 'com.android.support:support-vector-drawable:28.0.0'
26+
implementation 'com.android.support:animated-vector-drawable:28.0.0'
2927
}
3028

3129
ext {

library/src/main/java/moe/feng/support/biometricprompt/BiometricPromptCompatDialog.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import android.widget.Button;
1414
import android.widget.TextView;
1515

16+
import java.util.Objects;
17+
1618
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
1719
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
1820

@@ -29,7 +31,7 @@ class BiometricPromptCompatDialog extends Dialog {
2931
setCancelable(true);
3032
setCanceledOnTouchOutside(true);
3133

32-
Window window = getWindow();
34+
Window window = Objects.requireNonNull(getWindow());
3335
window.setLayout(MATCH_PARENT, WRAP_CONTENT);
3436
window.setGravity(Gravity.BOTTOM);
3537

0 commit comments

Comments
 (0)