From 368c4958869ffa6d261cb667fe67b2046a4d9e12 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 7 Jan 2021 04:47:46 +0300 Subject: [PATCH] =?UTF-8?q?gradle:=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20gradle-module's?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 6 +++--- gradle.properties | 4 +--- settings.gradle | 2 +- build.gradle => tools/build.gradle | 3 ++- tools/gradle.properties | 2 ++ {src => tools/src}/main/java/ghast/BuildHelper.java | 0 {src => tools/src}/main/java/ghast/EffectsHelper.java | 0 {src => tools/src}/main/java/ghast/EventContext.java | 0 {src => tools/src}/main/java/ghast/GhastTools.java | 0 {src => tools/src}/main/java/ghast/I18n.java | 0 {src => tools/src}/main/java/ghast/XLog.java | 0 .../src}/main/java/ghast/assets/AssetsException.java | 0 .../src}/main/java/ghast/assets/AssetsManager.java | 0 .../src}/main/java/ghast/command/CommandExecuter.java | 0 .../src}/main/java/ghast/command/CommandManager.java | 0 .../src}/main/java/ghast/command/CommandWrapper.java | 0 .../src}/main/java/ghast/command/ErrorConsumer.java | 0 .../ghast/database/CannotGetJdbcConnectionException.java | 0 .../src}/main/java/ghast/database/DataAccessException.java | 0 .../src}/main/java/ghast/database/JdbcOperations.java | 0 .../src}/main/java/ghast/database/JdbcTemplate.java | 0 .../src}/main/java/ghast/database/ResultSetExtractor.java | 0 {src => tools/src}/main/java/ghast/database/RowMapper.java | 0 .../src}/main/java/ghast/scheduler/BukkitScheduleTask.java | 0 .../src}/main/java/ghast/scheduler/JavaScheduleTask.java | 0 .../src}/main/java/ghast/scheduler/ScheduleManager.java | 0 .../src}/main/java/ghast/scheduler/ScheduleTask.java | 0 .../src}/test/java/ghast/database/JdbcTemplateTest.java | 0 28 files changed, 9 insertions(+), 8 deletions(-) rename build.gradle => tools/build.gradle (91%) create mode 100644 tools/gradle.properties rename {src => tools/src}/main/java/ghast/BuildHelper.java (100%) rename {src => tools/src}/main/java/ghast/EffectsHelper.java (100%) rename {src => tools/src}/main/java/ghast/EventContext.java (100%) rename {src => tools/src}/main/java/ghast/GhastTools.java (100%) rename {src => tools/src}/main/java/ghast/I18n.java (100%) rename {src => tools/src}/main/java/ghast/XLog.java (100%) rename {src => tools/src}/main/java/ghast/assets/AssetsException.java (100%) rename {src => tools/src}/main/java/ghast/assets/AssetsManager.java (100%) rename {src => tools/src}/main/java/ghast/command/CommandExecuter.java (100%) rename {src => tools/src}/main/java/ghast/command/CommandManager.java (100%) rename {src => tools/src}/main/java/ghast/command/CommandWrapper.java (100%) rename {src => tools/src}/main/java/ghast/command/ErrorConsumer.java (100%) rename {src => tools/src}/main/java/ghast/database/CannotGetJdbcConnectionException.java (100%) rename {src => tools/src}/main/java/ghast/database/DataAccessException.java (100%) rename {src => tools/src}/main/java/ghast/database/JdbcOperations.java (100%) rename {src => tools/src}/main/java/ghast/database/JdbcTemplate.java (100%) rename {src => tools/src}/main/java/ghast/database/ResultSetExtractor.java (100%) rename {src => tools/src}/main/java/ghast/database/RowMapper.java (100%) rename {src => tools/src}/main/java/ghast/scheduler/BukkitScheduleTask.java (100%) rename {src => tools/src}/main/java/ghast/scheduler/JavaScheduleTask.java (100%) rename {src => tools/src}/main/java/ghast/scheduler/ScheduleManager.java (100%) rename {src => tools/src}/main/java/ghast/scheduler/ScheduleTask.java (100%) rename {src => tools/src}/test/java/ghast/database/JdbcTemplateTest.java (100%) diff --git a/README.MD b/README.MD index 4972c77..6bfeecd 100644 --- a/README.MD +++ b/README.MD @@ -1,6 +1,6 @@ # GHAST TOOLS -![version: 1.9](https://img.shields.io/badge/version-1.9-0a0.svg?style=flat) +![version: 1.11-SNAPSHOT](https://img.shields.io/badge/version-1.11--SNAPSHOT-0a0.svg?style=flat) ![bukkit-api: 1.12](https://img.shields.io/badge/bukkit--api-1.12-d50.svg?style=flat) Набор вспомогательных инструментов для Bukkit API. @@ -611,7 +611,7 @@ repositories { ``` ```groovy -implementation group: 'ghast', name: 'ghast-tools', version: '1.9' +implementation group: 'ghast', name: 'ghast-tools', version: '1.11-SNAPSHOT' ``` ### Maven @@ -630,7 +630,7 @@ implementation group: 'ghast', name: 'ghast-tools', version: '1.9' ghast ghast-tools - 1.9 + 1.11-SNAPSHOT ``` \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1881f74..687db82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1 @@ -projectGroup=ghast -projectName=ghast-tools -projectVersion=1.4 \ No newline at end of file +projectGroup=ghast \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 1b7f04a..dcdebbd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = projectName +include 'tools' diff --git a/build.gradle b/tools/build.gradle similarity index 91% rename from build.gradle rename to tools/build.gradle index a385a55..663aa58 100644 --- a/build.gradle +++ b/tools/build.gradle @@ -12,7 +12,8 @@ if (publishScript.exists()) { } project.group = projectGroup -project.version = projectVersion +project.version = moduleVersion +jar.archiveBaseName.set(moduleName) repositories { mavenLocal() diff --git a/tools/gradle.properties b/tools/gradle.properties new file mode 100644 index 0000000..a6b3e77 --- /dev/null +++ b/tools/gradle.properties @@ -0,0 +1,2 @@ +moduleName=ghast-tools +moduleVersion=1.11-SNAPSHOT \ No newline at end of file diff --git a/src/main/java/ghast/BuildHelper.java b/tools/src/main/java/ghast/BuildHelper.java similarity index 100% rename from src/main/java/ghast/BuildHelper.java rename to tools/src/main/java/ghast/BuildHelper.java diff --git a/src/main/java/ghast/EffectsHelper.java b/tools/src/main/java/ghast/EffectsHelper.java similarity index 100% rename from src/main/java/ghast/EffectsHelper.java rename to tools/src/main/java/ghast/EffectsHelper.java diff --git a/src/main/java/ghast/EventContext.java b/tools/src/main/java/ghast/EventContext.java similarity index 100% rename from src/main/java/ghast/EventContext.java rename to tools/src/main/java/ghast/EventContext.java diff --git a/src/main/java/ghast/GhastTools.java b/tools/src/main/java/ghast/GhastTools.java similarity index 100% rename from src/main/java/ghast/GhastTools.java rename to tools/src/main/java/ghast/GhastTools.java diff --git a/src/main/java/ghast/I18n.java b/tools/src/main/java/ghast/I18n.java similarity index 100% rename from src/main/java/ghast/I18n.java rename to tools/src/main/java/ghast/I18n.java diff --git a/src/main/java/ghast/XLog.java b/tools/src/main/java/ghast/XLog.java similarity index 100% rename from src/main/java/ghast/XLog.java rename to tools/src/main/java/ghast/XLog.java diff --git a/src/main/java/ghast/assets/AssetsException.java b/tools/src/main/java/ghast/assets/AssetsException.java similarity index 100% rename from src/main/java/ghast/assets/AssetsException.java rename to tools/src/main/java/ghast/assets/AssetsException.java diff --git a/src/main/java/ghast/assets/AssetsManager.java b/tools/src/main/java/ghast/assets/AssetsManager.java similarity index 100% rename from src/main/java/ghast/assets/AssetsManager.java rename to tools/src/main/java/ghast/assets/AssetsManager.java diff --git a/src/main/java/ghast/command/CommandExecuter.java b/tools/src/main/java/ghast/command/CommandExecuter.java similarity index 100% rename from src/main/java/ghast/command/CommandExecuter.java rename to tools/src/main/java/ghast/command/CommandExecuter.java diff --git a/src/main/java/ghast/command/CommandManager.java b/tools/src/main/java/ghast/command/CommandManager.java similarity index 100% rename from src/main/java/ghast/command/CommandManager.java rename to tools/src/main/java/ghast/command/CommandManager.java diff --git a/src/main/java/ghast/command/CommandWrapper.java b/tools/src/main/java/ghast/command/CommandWrapper.java similarity index 100% rename from src/main/java/ghast/command/CommandWrapper.java rename to tools/src/main/java/ghast/command/CommandWrapper.java diff --git a/src/main/java/ghast/command/ErrorConsumer.java b/tools/src/main/java/ghast/command/ErrorConsumer.java similarity index 100% rename from src/main/java/ghast/command/ErrorConsumer.java rename to tools/src/main/java/ghast/command/ErrorConsumer.java diff --git a/src/main/java/ghast/database/CannotGetJdbcConnectionException.java b/tools/src/main/java/ghast/database/CannotGetJdbcConnectionException.java similarity index 100% rename from src/main/java/ghast/database/CannotGetJdbcConnectionException.java rename to tools/src/main/java/ghast/database/CannotGetJdbcConnectionException.java diff --git a/src/main/java/ghast/database/DataAccessException.java b/tools/src/main/java/ghast/database/DataAccessException.java similarity index 100% rename from src/main/java/ghast/database/DataAccessException.java rename to tools/src/main/java/ghast/database/DataAccessException.java diff --git a/src/main/java/ghast/database/JdbcOperations.java b/tools/src/main/java/ghast/database/JdbcOperations.java similarity index 100% rename from src/main/java/ghast/database/JdbcOperations.java rename to tools/src/main/java/ghast/database/JdbcOperations.java diff --git a/src/main/java/ghast/database/JdbcTemplate.java b/tools/src/main/java/ghast/database/JdbcTemplate.java similarity index 100% rename from src/main/java/ghast/database/JdbcTemplate.java rename to tools/src/main/java/ghast/database/JdbcTemplate.java diff --git a/src/main/java/ghast/database/ResultSetExtractor.java b/tools/src/main/java/ghast/database/ResultSetExtractor.java similarity index 100% rename from src/main/java/ghast/database/ResultSetExtractor.java rename to tools/src/main/java/ghast/database/ResultSetExtractor.java diff --git a/src/main/java/ghast/database/RowMapper.java b/tools/src/main/java/ghast/database/RowMapper.java similarity index 100% rename from src/main/java/ghast/database/RowMapper.java rename to tools/src/main/java/ghast/database/RowMapper.java diff --git a/src/main/java/ghast/scheduler/BukkitScheduleTask.java b/tools/src/main/java/ghast/scheduler/BukkitScheduleTask.java similarity index 100% rename from src/main/java/ghast/scheduler/BukkitScheduleTask.java rename to tools/src/main/java/ghast/scheduler/BukkitScheduleTask.java diff --git a/src/main/java/ghast/scheduler/JavaScheduleTask.java b/tools/src/main/java/ghast/scheduler/JavaScheduleTask.java similarity index 100% rename from src/main/java/ghast/scheduler/JavaScheduleTask.java rename to tools/src/main/java/ghast/scheduler/JavaScheduleTask.java diff --git a/src/main/java/ghast/scheduler/ScheduleManager.java b/tools/src/main/java/ghast/scheduler/ScheduleManager.java similarity index 100% rename from src/main/java/ghast/scheduler/ScheduleManager.java rename to tools/src/main/java/ghast/scheduler/ScheduleManager.java diff --git a/src/main/java/ghast/scheduler/ScheduleTask.java b/tools/src/main/java/ghast/scheduler/ScheduleTask.java similarity index 100% rename from src/main/java/ghast/scheduler/ScheduleTask.java rename to tools/src/main/java/ghast/scheduler/ScheduleTask.java diff --git a/src/test/java/ghast/database/JdbcTemplateTest.java b/tools/src/test/java/ghast/database/JdbcTemplateTest.java similarity index 100% rename from src/test/java/ghast/database/JdbcTemplateTest.java rename to tools/src/test/java/ghast/database/JdbcTemplateTest.java