Merge pull request '解决jar包冲突问题' (#26) from d_merge_branch into d_branch

Notesmaster/app/build.gradle.kts

@@ -16,14 +16,6 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    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");
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -65,4 +57,11 @@ dependencies {
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
 
+
+
+
+    implementation(files("D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
+
 }