Merge pull request '重复文件' (#5) from 111 into main

3 months ago · 7ed9732eae
parent 0ea0d37a49 8775ed8dc8
commit 7ed9732eae
8 changed files with 8 additions and 1 deletions
--- a/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.bin
+++ b/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.bin
--- a/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.lock
+++ b/Notes-master/.gradle/8.11.1/executionHistory/executionHistory.lock
--- a/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.bin
+++ b/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.bin
--- a/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.lock
+++ b/Notes-master/.gradle/8.11.1/fileHashes/fileHashes.lock
--- a/Notes-master/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
+++ b/Notes-master/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
--- a/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/Notes-master/app/build.gradle.kts
+++ b/Notes-master/app/build.gradle.kts
@ -25,6 +25,13 @@ android {
            )
        }
    }
+    packaging {
+        resources.excludes.add("META-INF/DEPENDENCIES");
+        resources.excludes.add("META-INF/NOTICE");
+        resources.excludes.add("META-INF/LICENSE");
+        resources.excludes.add("META-INF/LICENSE.txt");
+        resources.excludes.add("META-INF/NOTICE.txt");
+    }
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_11
        targetCompatibility = JavaVersion.VERSION_11
@ -50,4 +57,4 @@ dependencies {
    testImplementation(libs.junit)
    androidTestImplementation(libs.ext.junit)
    androidTestImplementation(libs.espresso.core)
-}
+}