@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed <<<<<<< Updated upstream plugins { alias(libs.plugins.androidApplication) } android { namespace = "net.micode.notes" compileSdk = 35 // buildToolsVersion ="34.0.0" defaultConfig { applicationId = "net.micode.notes" minSdk = 26 targetSdk = 34 versionCode = 1 versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") ======= plugins { alias(libs.plugins.androidApplication) >>>>>>> Stashed changes } android { namespace = "net.micode.notes" compileSdk = 34 buildToolsVersion ="34.0.0" defaultConfig { applicationId = "net.micode.notes" minSdk = 26 targetSdk = 34 versionCode = 1 versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } 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") } } dependencies { implementation(libs.appcompat) implementation(libs.material) implementation(libs.constraintlayout) // implementation(fileTree(mapOf("dir" to "D:\\AndroidProject\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib", // "include" to listOf("*.aar", "*.jar"), // "exclude" to listOf("")))) //修改为如下代码: implementation(files("D:\\AndroidProject\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar")) implementation(files("D:\\AndroidProject\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar")) implementation(files("D:\\AndroidProject\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar")) // implementation ("androidx.activity:activity:1.7.2") implementation ("com.github.JailedBird:EdgeUtils:1.0.0") implementation ("androidx.core:core:1.6.0") testImplementation(libs.junit) androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.espresso.core) }