final-commit，提交报告置于doc

app/build.gradle.kts

@@ -1,4 +1,5 @@
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+<<<<<<< Updated upstream
 plugins {
     alias(libs.plugins.androidApplication)
 }
@@ -21,7 +22,31 @@ android {
         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