v1.0

src/Notesmaster/app/build.gradle.kts

@@ -14,6 +14,13 @@ android {
         versionName = "1.0"
 
         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 {
@@ -26,15 +33,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_11
-    }
-    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");
     }
 }
 
@@ -44,21 +44,21 @@ dependencies {
     implementation(libs.material)
     implementation(libs.activity)
     implementation(libs.constraintlayout)
-//    implementation(fileTree(mapOf(
+    implementation(fileTree(mapOf(
-//        "dir" to "G:\\AndroidProject\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib",
+        "dir" to "D:\\APP\\Notesmaster\\httpcomponents-client-4.5.14-bin",
-//        "include" to listOf("*.aar", "*.jar"),
+        "include" to listOf("*.aar", "*.jar"),
-//        "exclude" to listOf("")
+        "exclude" to listOf("")
-//    )))
+    )))
     //    部分需要重新修改
 //    implementation(fileTree(mapOf(
 //        "dir" to "D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
 //        "include" to listOf("*.aar", "*.jar"),
 //        "exclude" to listOf("")
 //    )))
-    //修改为如下代码：
+//修改为如下代码：
-    implementation(files("G:\\AndroidProject\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("D:\\APP\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
-    implementation(files("G:\\AndroidProject\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("D:\\APP\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
-    implementation(files("G:\\AndroidProject\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
+    implementation(files("D:\\APP\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)