修复merge冲突

goweii · Jul 2, 2022 · a6b1aee · a6b1aee
1 parent 3980e52
commit a6b1aee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/anylayer/build.gradle b/anylayer/build.gradle
@@ -5,7 +5,6 @@ android {
 }
 
 dependencies {
-    compileOnly 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.github.goweii.VisualEffect:visualeffect-core:1.0.0'
     implementation 'com.github.goweii.VisualEffect:visualeffect-blur:1.0.0'
     implementation 'com.github.goweii.VisualEffect:visualeffect-view:1.0.0'

diff --git a/anylayer/src/main/java/per/goweii/anylayer/dialog/BackdropBlurView.java b/anylayer/src/main/java/per/goweii/anylayer/dialog/BackdropBlurView.java
@@ -4,11 +4,10 @@
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.RectF;
+import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-
 import java.util.Arrays;
 
 import per.goweii.visualeffect.blur.BlurEffect;