diff --git a/05_tasks/gradle/wrapper/gradle-wrapper.properties b/05_tasks/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 7738f62..0000000 --- a/05_tasks/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file diff --git a/06_idea/gradle/wrapper/gradle-wrapper.properties b/06_idea/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 7738f62..0000000 --- a/06_idea/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file diff --git a/01_creating_new_gradle_builds/.gitattributes b/src/01_creating_new_gradle_builds/.gitattributes similarity index 100% rename from 01_creating_new_gradle_builds/.gitattributes rename to src/01_creating_new_gradle_builds/.gitattributes diff --git a/01_creating_new_gradle_builds/.gitignore b/src/01_creating_new_gradle_builds/.gitignore similarity index 100% rename from 01_creating_new_gradle_builds/.gitignore rename to src/01_creating_new_gradle_builds/.gitignore diff --git a/01_creating_new_gradle_builds/build.gradle.kts b/src/01_creating_new_gradle_builds/build.gradle.kts similarity index 100% rename from 01_creating_new_gradle_builds/build.gradle.kts rename to src/01_creating_new_gradle_builds/build.gradle.kts diff --git a/01_creating_new_gradle_builds/dest/sample.txt b/src/01_creating_new_gradle_builds/dest/sample.txt similarity index 100% rename from 01_creating_new_gradle_builds/dest/sample.txt rename to src/01_creating_new_gradle_builds/dest/sample.txt diff --git a/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.jar b/src/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.jar rename to src/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.jar diff --git a/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.properties b/src/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from 01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.properties rename to src/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.properties index 7738f62..c674402 100644 --- a/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.properties +++ b/src/01_creating_new_gradle_builds/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/01_creating_new_gradle_builds/gradlew b/src/01_creating_new_gradle_builds/gradlew similarity index 100% rename from 01_creating_new_gradle_builds/gradlew rename to src/01_creating_new_gradle_builds/gradlew diff --git a/01_creating_new_gradle_builds/gradlew.bat b/src/01_creating_new_gradle_builds/gradlew.bat similarity index 100% rename from 01_creating_new_gradle_builds/gradlew.bat rename to src/01_creating_new_gradle_builds/gradlew.bat diff --git a/01_creating_new_gradle_builds/settings.gradle.kts b/src/01_creating_new_gradle_builds/settings.gradle.kts similarity index 100% rename from 01_creating_new_gradle_builds/settings.gradle.kts rename to src/01_creating_new_gradle_builds/settings.gradle.kts diff --git a/01_creating_new_gradle_builds/src/sample.txt b/src/01_creating_new_gradle_builds/src/sample.txt similarity index 100% rename from 01_creating_new_gradle_builds/src/sample.txt rename to src/01_creating_new_gradle_builds/src/sample.txt diff --git a/02_gradle_build_for_java_library/.gitattributes b/src/02_gradle_build_for_java_library/.gitattributes similarity index 100% rename from 02_gradle_build_for_java_library/.gitattributes rename to src/02_gradle_build_for_java_library/.gitattributes diff --git a/02_gradle_build_for_java_library/.gitignore b/src/02_gradle_build_for_java_library/.gitignore similarity index 100% rename from 02_gradle_build_for_java_library/.gitignore rename to src/02_gradle_build_for_java_library/.gitignore diff --git a/02_gradle_build_for_java_library/build.gradle.kts b/src/02_gradle_build_for_java_library/build.gradle.kts similarity index 100% rename from 02_gradle_build_for_java_library/build.gradle.kts rename to src/02_gradle_build_for_java_library/build.gradle.kts diff --git a/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.jar b/src/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.jar rename to src/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.jar diff --git a/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.properties b/src/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from 02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.properties rename to src/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.properties index 7738f62..c674402 100644 --- a/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.properties +++ b/src/02_gradle_build_for_java_library/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/02_gradle_build_for_java_library/gradlew b/src/02_gradle_build_for_java_library/gradlew similarity index 100% rename from 02_gradle_build_for_java_library/gradlew rename to src/02_gradle_build_for_java_library/gradlew diff --git a/02_gradle_build_for_java_library/gradlew.bat b/src/02_gradle_build_for_java_library/gradlew.bat similarity index 100% rename from 02_gradle_build_for_java_library/gradlew.bat rename to src/02_gradle_build_for_java_library/gradlew.bat diff --git a/02_gradle_build_for_java_library/settings.gradle.kts b/src/02_gradle_build_for_java_library/settings.gradle.kts similarity index 100% rename from 02_gradle_build_for_java_library/settings.gradle.kts rename to src/02_gradle_build_for_java_library/settings.gradle.kts diff --git a/02_gradle_build_for_java_library/src/main/java/kr/pe/elex/test/Library.java b/src/02_gradle_build_for_java_library/src/main/java/kr/pe/elex/test/Library.java similarity index 100% rename from 02_gradle_build_for_java_library/src/main/java/kr/pe/elex/test/Library.java rename to src/02_gradle_build_for_java_library/src/main/java/kr/pe/elex/test/Library.java diff --git a/02_gradle_build_for_java_library/src/test/java/kr/pe/elex/test/LibraryTest.java b/src/02_gradle_build_for_java_library/src/test/java/kr/pe/elex/test/LibraryTest.java similarity index 100% rename from 02_gradle_build_for_java_library/src/test/java/kr/pe/elex/test/LibraryTest.java rename to src/02_gradle_build_for_java_library/src/test/java/kr/pe/elex/test/LibraryTest.java diff --git a/03_gradle_build_for_java_application/.gitattributes b/src/03_gradle_build_for_java_application/.gitattributes similarity index 100% rename from 03_gradle_build_for_java_application/.gitattributes rename to src/03_gradle_build_for_java_application/.gitattributes diff --git a/03_gradle_build_for_java_application/.gitignore b/src/03_gradle_build_for_java_application/.gitignore similarity index 100% rename from 03_gradle_build_for_java_application/.gitignore rename to src/03_gradle_build_for_java_application/.gitignore diff --git a/03_gradle_build_for_java_application/build.gradle.kts b/src/03_gradle_build_for_java_application/build.gradle.kts similarity index 100% rename from 03_gradle_build_for_java_application/build.gradle.kts rename to src/03_gradle_build_for_java_application/build.gradle.kts diff --git a/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.jar b/src/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.jar rename to src/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.jar diff --git a/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.properties b/src/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from 03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.properties rename to src/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.properties index 7738f62..c674402 100644 --- a/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.properties +++ b/src/03_gradle_build_for_java_application/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/03_gradle_build_for_java_application/gradlew b/src/03_gradle_build_for_java_application/gradlew similarity index 100% rename from 03_gradle_build_for_java_application/gradlew rename to src/03_gradle_build_for_java_application/gradlew diff --git a/03_gradle_build_for_java_application/gradlew.bat b/src/03_gradle_build_for_java_application/gradlew.bat similarity index 100% rename from 03_gradle_build_for_java_application/gradlew.bat rename to src/03_gradle_build_for_java_application/gradlew.bat diff --git a/03_gradle_build_for_java_application/settings.gradle.kts b/src/03_gradle_build_for_java_application/settings.gradle.kts similarity index 100% rename from 03_gradle_build_for_java_application/settings.gradle.kts rename to src/03_gradle_build_for_java_application/settings.gradle.kts diff --git a/03_gradle_build_for_java_application/src/main/java/kr/pe/elex/test/App.java b/src/03_gradle_build_for_java_application/src/main/java/kr/pe/elex/test/App.java similarity index 100% rename from 03_gradle_build_for_java_application/src/main/java/kr/pe/elex/test/App.java rename to src/03_gradle_build_for_java_application/src/main/java/kr/pe/elex/test/App.java diff --git a/03_gradle_build_for_java_application/src/test/java/kr/pe/elex/test/AppTest.java b/src/03_gradle_build_for_java_application/src/test/java/kr/pe/elex/test/AppTest.java similarity index 100% rename from 03_gradle_build_for_java_application/src/test/java/kr/pe/elex/test/AppTest.java rename to src/03_gradle_build_for_java_application/src/test/java/kr/pe/elex/test/AppTest.java diff --git a/04_gradle_build_for_java_webapp/build.gradle.kts b/src/04_gradle_build_for_java_webapp/build.gradle.kts similarity index 100% rename from 04_gradle_build_for_java_webapp/build.gradle.kts rename to src/04_gradle_build_for_java_webapp/build.gradle.kts diff --git a/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.jar b/src/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.jar rename to src/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.jar diff --git a/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.properties b/src/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from 04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.properties rename to src/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.properties index 7738f62..c674402 100644 --- a/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.properties +++ b/src/04_gradle_build_for_java_webapp/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/04_gradle_build_for_java_webapp/gradlew b/src/04_gradle_build_for_java_webapp/gradlew similarity index 100% rename from 04_gradle_build_for_java_webapp/gradlew rename to src/04_gradle_build_for_java_webapp/gradlew diff --git a/04_gradle_build_for_java_webapp/gradlew.bat b/src/04_gradle_build_for_java_webapp/gradlew.bat similarity index 100% rename from 04_gradle_build_for_java_webapp/gradlew.bat rename to src/04_gradle_build_for_java_webapp/gradlew.bat diff --git a/04_gradle_build_for_java_webapp/settings.gradle.kts b/src/04_gradle_build_for_java_webapp/settings.gradle.kts similarity index 100% rename from 04_gradle_build_for_java_webapp/settings.gradle.kts rename to src/04_gradle_build_for_java_webapp/settings.gradle.kts diff --git a/04_gradle_build_for_java_webapp/src/main/java/kr/pe/elex/test/App.java b/src/04_gradle_build_for_java_webapp/src/main/java/kr/pe/elex/test/App.java similarity index 100% rename from 04_gradle_build_for_java_webapp/src/main/java/kr/pe/elex/test/App.java rename to src/04_gradle_build_for_java_webapp/src/main/java/kr/pe/elex/test/App.java diff --git a/04_gradle_build_for_java_webapp/src/test/java/kr/pe/elex/test/AppTest.java b/src/04_gradle_build_for_java_webapp/src/test/java/kr/pe/elex/test/AppTest.java similarity index 100% rename from 04_gradle_build_for_java_webapp/src/test/java/kr/pe/elex/test/AppTest.java rename to src/04_gradle_build_for_java_webapp/src/test/java/kr/pe/elex/test/AppTest.java diff --git a/05_tasks/.gitattributes b/src/05_tasks/.gitattributes similarity index 100% rename from 05_tasks/.gitattributes rename to src/05_tasks/.gitattributes diff --git a/05_tasks/.gitignore b/src/05_tasks/.gitignore similarity index 100% rename from 05_tasks/.gitignore rename to src/05_tasks/.gitignore diff --git a/05_tasks/.idea/.gitignore b/src/05_tasks/.idea/.gitignore similarity index 100% rename from 05_tasks/.idea/.gitignore rename to src/05_tasks/.idea/.gitignore diff --git a/05_tasks/.idea/compiler.xml b/src/05_tasks/.idea/compiler.xml similarity index 100% rename from 05_tasks/.idea/compiler.xml rename to src/05_tasks/.idea/compiler.xml diff --git a/05_tasks/.idea/dictionaries b/src/05_tasks/.idea/dictionaries similarity index 100% rename from 05_tasks/.idea/dictionaries rename to src/05_tasks/.idea/dictionaries diff --git a/05_tasks/.idea/gradle.xml b/src/05_tasks/.idea/gradle.xml similarity index 100% rename from 05_tasks/.idea/gradle.xml rename to src/05_tasks/.idea/gradle.xml diff --git a/05_tasks/.idea/misc.xml b/src/05_tasks/.idea/misc.xml similarity index 100% rename from 05_tasks/.idea/misc.xml rename to src/05_tasks/.idea/misc.xml diff --git a/05_tasks/.idea/vcs.xml b/src/05_tasks/.idea/vcs.xml similarity index 100% rename from 05_tasks/.idea/vcs.xml rename to src/05_tasks/.idea/vcs.xml diff --git a/05_tasks/build.gradle.kts b/src/05_tasks/build.gradle.kts similarity index 99% rename from 05_tasks/build.gradle.kts rename to src/05_tasks/build.gradle.kts index 875a0ae..ca7e2a7 100644 --- a/05_tasks/build.gradle.kts +++ b/src/05_tasks/build.gradle.kts @@ -57,4 +57,4 @@ tasks.create("sync") { include("*.txt") exclude("*.tmp") } -} \ No newline at end of file +} diff --git a/05_tasks/exec_result.txt b/src/05_tasks/exec_result.txt similarity index 100% rename from 05_tasks/exec_result.txt rename to src/05_tasks/exec_result.txt diff --git a/05_tasks/gradle/wrapper/gradle-wrapper.jar b/src/05_tasks/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 05_tasks/gradle/wrapper/gradle-wrapper.jar rename to src/05_tasks/gradle/wrapper/gradle-wrapper.jar diff --git a/src/05_tasks/gradle/wrapper/gradle-wrapper.properties b/src/05_tasks/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c674402 --- /dev/null +++ b/src/05_tasks/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/05_tasks/gradlew b/src/05_tasks/gradlew similarity index 100% rename from 05_tasks/gradlew rename to src/05_tasks/gradlew diff --git a/05_tasks/gradlew.bat b/src/05_tasks/gradlew.bat similarity index 100% rename from 05_tasks/gradlew.bat rename to src/05_tasks/gradlew.bat diff --git a/05_tasks/settings.gradle.kts b/src/05_tasks/settings.gradle.kts similarity index 100% rename from 05_tasks/settings.gradle.kts rename to src/05_tasks/settings.gradle.kts diff --git a/05_tasks/src/sample.txt b/src/05_tasks/src/sample.txt similarity index 100% rename from 05_tasks/src/sample.txt rename to src/05_tasks/src/sample.txt diff --git a/05_tasks/src2/sample.txt b/src/05_tasks/src2/sample.txt similarity index 100% rename from 05_tasks/src2/sample.txt rename to src/05_tasks/src2/sample.txt diff --git a/05_tasks/src2/sample2.txt b/src/05_tasks/src2/sample2.txt similarity index 100% rename from 05_tasks/src2/sample2.txt rename to src/05_tasks/src2/sample2.txt diff --git a/06_idea/.gitattributes b/src/06_idea/.gitattributes similarity index 100% rename from 06_idea/.gitattributes rename to src/06_idea/.gitattributes diff --git a/06_idea/.gitignore b/src/06_idea/.gitignore similarity index 100% rename from 06_idea/.gitignore rename to src/06_idea/.gitignore diff --git a/06_idea/.idea/.gitignore b/src/06_idea/.idea/.gitignore similarity index 100% rename from 06_idea/.idea/.gitignore rename to src/06_idea/.idea/.gitignore diff --git a/06_idea/.idea/.name b/src/06_idea/.idea/.name similarity index 100% rename from 06_idea/.idea/.name rename to src/06_idea/.idea/.name diff --git a/06_idea/.idea/compiler.xml b/src/06_idea/.idea/compiler.xml similarity index 100% rename from 06_idea/.idea/compiler.xml rename to src/06_idea/.idea/compiler.xml diff --git a/06_idea/.idea/dictionaries b/src/06_idea/.idea/dictionaries similarity index 100% rename from 06_idea/.idea/dictionaries rename to src/06_idea/.idea/dictionaries diff --git a/06_idea/.idea/gradle.xml b/src/06_idea/.idea/gradle.xml similarity index 100% rename from 06_idea/.idea/gradle.xml rename to src/06_idea/.idea/gradle.xml diff --git a/06_idea/.idea/misc.xml b/src/06_idea/.idea/misc.xml similarity index 100% rename from 06_idea/.idea/misc.xml rename to src/06_idea/.idea/misc.xml diff --git a/06_idea/.idea/vcs.xml b/src/06_idea/.idea/vcs.xml similarity index 100% rename from 06_idea/.idea/vcs.xml rename to src/06_idea/.idea/vcs.xml diff --git a/06_idea/build.gradle.kts b/src/06_idea/build.gradle.kts similarity index 98% rename from 06_idea/build.gradle.kts rename to src/06_idea/build.gradle.kts index b16aa83..c90d820 100644 --- a/06_idea/build.gradle.kts +++ b/src/06_idea/build.gradle.kts @@ -11,4 +11,4 @@ idea { languageLevel = IdeaLanguageLevel("17") vcs = "Git" } -} \ No newline at end of file +} diff --git a/06_idea/exec_result.txt b/src/06_idea/exec_result.txt similarity index 100% rename from 06_idea/exec_result.txt rename to src/06_idea/exec_result.txt diff --git a/06_idea/gradle/wrapper/gradle-wrapper.jar b/src/06_idea/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 06_idea/gradle/wrapper/gradle-wrapper.jar rename to src/06_idea/gradle/wrapper/gradle-wrapper.jar diff --git a/src/06_idea/gradle/wrapper/gradle-wrapper.properties b/src/06_idea/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c674402 --- /dev/null +++ b/src/06_idea/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/06_idea/gradlew b/src/06_idea/gradlew similarity index 100% rename from 06_idea/gradlew rename to src/06_idea/gradlew diff --git a/06_idea/gradlew.bat b/src/06_idea/gradlew.bat similarity index 100% rename from 06_idea/gradlew.bat rename to src/06_idea/gradlew.bat diff --git a/06_idea/settings.gradle.kts b/src/06_idea/settings.gradle.kts similarity index 100% rename from 06_idea/settings.gradle.kts rename to src/06_idea/settings.gradle.kts diff --git a/06_idea/src/sample.txt b/src/06_idea/src/sample.txt similarity index 100% rename from 06_idea/src/sample.txt rename to src/06_idea/src/sample.txt diff --git a/06_idea/src2/sample.txt b/src/06_idea/src2/sample.txt similarity index 100% rename from 06_idea/src2/sample.txt rename to src/06_idea/src2/sample.txt diff --git a/06_idea/src2/sample2.txt b/src/06_idea/src2/sample2.txt similarity index 100% rename from 06_idea/src2/sample2.txt rename to src/06_idea/src2/sample2.txt