合并冲突

goweii · May 27, 2021 · f4a9cea · f4a9cea
1 parent a8fdf0d
commit f4a9cea
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/anylayer-ktx/build.gradle b/anylayer-ktx/build.gradle
@@ -7,7 +7,7 @@ android {
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compileOnly 'androidx.core:core-ktx:1.3.2'
+    //compileOnly 'androidx.core:core-ktx:1.3.2'
     compileOnly project(':anylayer')
     compileOnly project(':anylayer-ext')
 }
diff --git a/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/DialogLayers.kt b/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/DialogLayers.kt
@@ -5,7 +5,6 @@ import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.support.annotation.*
 import android.view.View
-import androidx.annotation.*
 import per.goweii.anylayer.Layer
 import per.goweii.anylayer.dialog.DialogLayer
 import per.goweii.anylayer.ext.DefaultDialogOnSwipeListener

diff --git a/anylayer/build.gradle b/anylayer/build.gradle
@@ -5,8 +5,7 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'per.goweii.visualeffect:visualeffect-core:1.0.0'
-    implementation 'per.goweii.visualeffect:visualeffect-blur:1.0.0'
-    implementation 'per.goweii.visualeffect:visualeffect-view:1.0.0'
+    implementation 'per.goweii.visualeffect:visualeffect-core:1.0.3'
+    implementation 'per.goweii.visualeffect:visualeffect-blur:1.0.3'
+    implementation 'per.goweii.visualeffect:visualeffect-view:1.0.3'
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,12 +25,12 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.startup:startup-runtime:1.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    //implementation 'androidx.startup:startup-runtime:1.0.0'
     implementation 'com.github.goweii:StatusBarCompat:1.2.1'
     implementation project(':anylayer')
     implementation project(':anylayer-ext')
     implementation project(':anylayer-ktx')
-    implementation project(':anylayer-startup')
+    //implementation project(':anylayer-startup')
 }
diff --git a/app/src/main/java/per/goweii/android/anylayer/App.java b/app/src/main/java/per/goweii/android/anylayer/App.java
@@ -3,6 +3,8 @@
 import android.app.Application;
 import android.os.Handler;
 
+import per.goweii.anylayer.AnyLayer;
+
 /**
  * @author CuiZhen
  * @date 2019/3/10
@@ -17,5 +19,6 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        AnyLayer.init(this);
     }
 }
diff --git a/library.gradle b/library.gradle
@@ -24,5 +24,5 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
-    compileOnly 'androidx.appcompat:appcompat:1.2.0'
+    compileOnly 'com.android.support:appcompat-v7:28.0.0'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-include ':anylayer-startup'
+//include ':anylayer-startup'
 include ':anylayer-ktx'
 include ':app'
 include ':anylayer'