diff --git a/.gitignore b/.gitignore index 27429018..d8eddf64 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ bin/ # Gradle .gradle **/build/ -/buildSrc/ !src/**/build/ .gradletasknamecache !gradle-wrapper.jar diff --git a/Plugin/build.gradle b/Plugin/build.gradle index 0de6f5bd..08fcc9c2 100644 --- a/Plugin/build.gradle +++ b/Plugin/build.gradle @@ -1,3 +1,5 @@ +import org.gradle.api.tasks.compile.JavaCompile + plugins { id 'com.github.johnrengelman.shadow' version '5.2.0' id 'java' @@ -49,7 +51,12 @@ jar { archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" } +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + compileJava.dependsOn clean build.dependsOn shadowJar description = 'EcoEnchants' +compileJava.options.encoding = 'UTF-8' diff --git a/build.gradle b/build.gradle index 66f1707a..a8276991 100644 --- a/build.gradle +++ b/build.gradle @@ -93,6 +93,11 @@ allprojects { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' } } + + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + compileJava.options.encoding = 'UTF-8' } group = 'com.willfp.ecoenchants' @@ -106,8 +111,4 @@ publishing { from(components.java) } } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} +} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 04d80d2a..00000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. - id 'groovy-gradle-plugin' -} - -repositories { - // Use the plugin portal to apply community plugins in convention plugins. - gradlePluginPortal() -}