From 30bbeae25eb5f4222a4007f6ff1b8321f1914059 Mon Sep 17 00:00:00 2001
From: hmh <2150887269@qq.com>
Date: Thu, 17 Apr 2025 15:49:48 +0800
Subject: [PATCH 1/4] 1
---
2.txt | 5 -----
src/Notes/Notes/.idea/.gitignore | 2 +-
src/Notes/Notes/.idea/AndroidProjectSystem.xml | 6 ------
src/Notes/Notes/.idea/compiler.xml | 2 +-
.../Notes/.idea/deploymentTargetSelector.xml | 18 ------------------
src/Notes/Notes/.idea/gradle.xml | 2 +-
src/Notes/Notes/.idea/misc.xml | 3 ++-
src/Notes/Notes/.idea/runConfigurations.xml | 17 -----------------
src/Notes/Notes/gradle/libs.versions.toml | 2 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
10 files changed, 7 insertions(+), 52 deletions(-)
delete mode 100644 2.txt
delete mode 100644 src/Notes/Notes/.idea/AndroidProjectSystem.xml
delete mode 100644 src/Notes/Notes/.idea/deploymentTargetSelector.xml
delete mode 100644 src/Notes/Notes/.idea/runConfigurations.xml
diff --git a/2.txt b/2.txt
deleted file mode 100644
index 85954ea..0000000
--- a/2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-2
-3
-4
-5
\ No newline at end of file
diff --git a/src/Notes/Notes/.idea/.gitignore b/src/Notes/Notes/.idea/.gitignore
index 26d3352..359bb53 100644
--- a/src/Notes/Notes/.idea/.gitignore
+++ b/src/Notes/Notes/.idea/.gitignore
@@ -1,3 +1,3 @@
-# Default ignored files
+# 默认忽略的文件
/shelf/
/workspace.xml
diff --git a/src/Notes/Notes/.idea/AndroidProjectSystem.xml b/src/Notes/Notes/.idea/AndroidProjectSystem.xml
deleted file mode 100644
index 4a53bee..0000000
--- a/src/Notes/Notes/.idea/AndroidProjectSystem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AndroidProjectSystem">
- <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
- </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes/Notes/.idea/compiler.xml b/src/Notes/Notes/.idea/compiler.xml
index b86273d..b589d56 100644
--- a/src/Notes/Notes/.idea/compiler.xml
+++ b/src/Notes/Notes/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="21" />
+ <bytecodeTargetLevel target="17" />
</component>
</project>
\ No newline at end of file
diff --git a/src/Notes/Notes/.idea/deploymentTargetSelector.xml b/src/Notes/Notes/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index 89a3096..0000000
--- a/src/Notes/Notes/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="deploymentTargetSelector">
- <selectionStates>
- <SelectionState runConfigName="app">
- <option name="selectionMode" value="DROPDOWN" />
- <DropdownSelection timestamp="2025-04-16T01:55:46.206214500Z">
- <Target type="DEFAULT_BOOT">
- <handle>
- <DeviceId pluginId="LocalEmulator" identifier="path=D:\Android\AVD\Pixel_9.avd" />
- </handle>
- </Target>
- </DropdownSelection>
- <DialogSelection />
- </SelectionState>
- </selectionStates>
- </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes/Notes/.idea/gradle.xml b/src/Notes/Notes/.idea/gradle.xml
index 639c779..0897082 100644
--- a/src/Notes/Notes/.idea/gradle.xml
+++ b/src/Notes/Notes/.idea/gradle.xml
@@ -4,7 +4,6 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
@@ -13,6 +12,7 @@
<option value="$PROJECT_DIR$/app" />
</set>
</option>
+ <option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
diff --git a/src/Notes/Notes/.idea/misc.xml b/src/Notes/Notes/.idea/misc.xml
index b2c751a..0ad17cb 100644
--- a/src/Notes/Notes/.idea/misc.xml
+++ b/src/Notes/Notes/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/src/Notes/Notes/.idea/runConfigurations.xml b/src/Notes/Notes/.idea/runConfigurations.xml
deleted file mode 100644
index 16660f1..0000000
--- a/src/Notes/Notes/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RunConfigurationProducerService">
- <option name="ignoredProducers">
- <set>
- <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
- <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
- <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
- <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
- <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
- <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
- <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
- <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
- </set>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes/Notes/gradle/libs.versions.toml b/src/Notes/Notes/gradle/libs.versions.toml
index b0c7574..375907a 100644
--- a/src/Notes/Notes/gradle/libs.versions.toml
+++ b/src/Notes/Notes/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-agp = "8.9.0"
+agp = "8.2.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
diff --git a/src/Notes/Notes/gradle/wrapper/gradle-wrapper.properties b/src/Notes/Notes/gradle/wrapper/gradle-wrapper.properties
index 91bfd12..a8434d2 100644
--- a/src/Notes/Notes/gradle/wrapper/gradle-wrapper.properties
+++ b/src/Notes/Notes/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Mar 14 08:53:37 CST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.11.1-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
--
2.34.1
From 7ca888dd131d876afb87432f976e54b5e6828ee4 Mon Sep 17 00:00:00 2001
From: hmh <2150887269@qq.com>
Date: Tue, 3 Jun 2025 21:03:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=81=A2=E5=A4=8D=202.txt=20=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=B8=8E=20master=20?=
=?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
2.txt | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 2.txt
diff --git a/2.txt b/2.txt
new file mode 100644
index 0000000..86d5673
--- /dev/null
+++ b/2.txt
@@ -0,0 +1,8 @@
+1
+2
+3
+4
+5
+666
+777
+888
\ No newline at end of file
--
2.34.1