From 0a95135161360bb8c795d21ee6ebd8ce97ce8067 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 15 Apr 2021 11:05:54 -0400 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 97 ---- .idea/compiler.xml | 10 +- .idea/jarRepositories.xml | 15 + ...__ch_qos_logback_logback_classic_1_1_7.xml | 13 - ...ven__ch_qos_logback_logback_core_1_1_7.xml | 13 - .../Maven__commons_cli_commons_cli_1_2.xml | 13 - ...Maven__net_bytebuddy_byte_buddy_1_8_15.xml | 13 - ..._net_bytebuddy_byte_buddy_agent_1_8_15.xml | 13 - ..._org_apache_commons_commons_lang3_3_11.xml | 13 - ...org_apache_commons_commons_math3_3_6_1.xml | 13 - ...en_surefire_surefire_logger_api_2_21_0.xml | 13 - ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 - .../Maven__org_hamcrest_hamcrest_all_1_3.xml | 13 - .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 - ...ven__org_hamcrest_hamcrest_library_1_3.xml | 13 - ..._junit_jupiter_junit_jupiter_api_5_7_0.xml | 13 - ...nit_jupiter_junit_jupiter_engine_5_7_0.xml | 13 - ..._platform_junit_platform_commons_1_7_0.xml | 13 - ...t_platform_junit_platform_engine_1_7_0.xml | 13 - ...Maven__org_mockito_mockito_core_2_21_0.xml | 13 - .../Maven__org_objenesis_objenesis_2_6.xml | 13 - ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 - ...Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml | 13 - .../Maven__org_slf4j_slf4j_api_1_7_21.xml | 13 - .idea/misc.xml | 2 +- .idea/modules.xml | 7 +- .idea/workspace.xml | 53 +- build.gradle | 1 - lang-tutorial.iml | 37 -- pom.xml | 531 ++++++++---------- settings.gradle | 4 +- 31 files changed, 306 insertions(+), 724 deletions(-) delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml delete mode 100644 .idea/libraries/Maven__commons_cli_commons_cli_1_2.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml delete mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml delete mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml delete mode 100644 lang-tutorial.iml diff --git a/.gitignore b/.gitignore index 8afdcc1b9e..f35a1af429 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -<<<<<<< HEAD -======= -<<<<<<< HEAD ### Gradle ### .gradle build/ @@ -236,97 +233,3 @@ fabric.properties # Sonarlint plugin .idea/sonarlint -======= ->>>>>>> RB -# Binaries -*.7z -*.dmg -*.gz -*.iso -*.jar -*.rar -*.tar -*.zip -*.war -*.ear -*.sar -*.class - -# Maven -target/ - -# eclipse project file -.settings/ -.classpath -.project - - -# IntelliJ project files -*.iml -*.iws -*.ipr -.idea/ - - - -# NetBeans specific -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -nbactions.xml -nb-configuration.xml - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -<<<<<<< HEAD -======= ->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820 ->>>>>>> RB diff --git a/.idea/compiler.xml b/.idea/compiler.xml index c65826db88..ebe8da4553 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,11 +6,15 @@ - + - - + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 712ab9d985..24dce4c262 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,11 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml deleted file mode 100644 index cdd79598ea..0000000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml deleted file mode 100644 index 6c2a7607f1..0000000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml deleted file mode 100644 index cec24931ef..0000000000 --- a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml deleted file mode 100644 index c7e234c123..0000000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml deleted file mode 100644 index a0c169abac..0000000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml deleted file mode 100644 index 7a30e6e396..0000000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml deleted file mode 100644 index ebfe0a8655..0000000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml deleted file mode 100644 index 7ee7fe0883..0000000000 --- a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml deleted file mode 100644 index f854ab00fd..0000000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml deleted file mode 100644 index 56193163f3..0000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc1127..0000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml deleted file mode 100644 index 78dbe458d4..0000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml deleted file mode 100644 index cc01e3f539..0000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml deleted file mode 100644 index f198e4bb85..0000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml deleted file mode 100644 index cde8a482a9..0000000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml deleted file mode 100644 index 3391deb2a7..0000000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml deleted file mode 100644 index f3bb7f6b81..0000000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml deleted file mode 100644 index af41e3b617..0000000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted file mode 100644 index fbc1b1635a..0000000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml deleted file mode 100644 index 2f93a6301e..0000000000 --- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml deleted file mode 100644 index 1b644dd840..0000000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 17e19eb41d..4ec2a1b534 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index da24bb41a5..d33d98704d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,12 @@ - + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3edc2ca039..995cf9a46c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +