diff --git a/.gitignore b/.gitignore index cf8105d..796ad65 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ /build /captures /user -/plugin .externalNativeBuild keystore # Compiled class file @@ -30,10 +29,3 @@ keystore *.zip *.tar.gz *.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -<<<<<<< HEAD ->>>>>>> 2c33f0b33a0411efd93a4810de5061a473835ff5 -======= ->>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42 diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..6143e2f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 502b5c5..8f76bdc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -279,7 +279,7 @@ dependencies { } //https://github.com/fengyuecanzhu/Maple - implementation("me.fycz.maple:maple:1.8") + implementation("me.fycz.maple:maple:1.9") } greendao { diff --git a/dynamic/build.gradle b/dynamic/build.gradle index adbb350..5bd0806 100644 --- a/dynamic/build.gradle +++ b/dynamic/build.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - compileOnly("me.fycz.maple:maple:1.7") + compileOnly("me.fycz.maple:maple:1.9") compileOnly 'org.greenrobot:greendao:3.3.0' compileOnly project(":app") compileOnly project(":DialogX")