From 5b8f6e466ac7ff5d67fda68a44b0181e3d4929ea Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Tue, 6 Aug 2019 15:05:04 -0400 Subject: [PATCH] Minor gradle edit --- Bukkit/build.gradle | 36 +++++++++++++++++------------------ Core/build.gradle | 38 ++++++++++++++++++------------------- build.gradle | 46 ++++++++++++++++++++++----------------------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 6946b457b..81eda9923 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -4,8 +4,8 @@ repositories { maven { url "http://nexus.hc.to/content/repositories/pub_releases" } maven { url = "https://repo.codemc.org/repository/maven-public" } maven { - name 'papermc' - url 'https://papermc.io/repo/repository/maven-public/' + name "papermc" + url "https://papermc.io/repo/repository/maven-public/" } mavenLocal() } @@ -13,15 +13,15 @@ repositories { apply plugin: "com.github.johnrengelman.shadow" dependencies { - implementation project(':Core') - compile project(':Core') - compile 'com.destroystokyo.paper:paper-api:1.14.4-R0.1-SNAPSHOT' + implementation project(":Core") + compile project(":Core") + compile "com.destroystokyo.paper:paper-api:1.14.4-R0.1-SNAPSHOT" //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT' - implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT' - compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0') + implementation "org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT" + compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.0.0") compile "io.papermc:paperlib:1.0.2" compile("net.milkbowl.vault:VaultAPI:1.7") { - exclude module: 'bukkit' + exclude module: "bukkit" } } @@ -29,8 +29,8 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 processResources { - from('src/main/resources') { - include 'plugin.yml' + from("src/main/resources") { + include "plugin.yml" expand( name: project.parent.name, version: project.parent.version @@ -42,19 +42,19 @@ jar.enabled = false shadowJar { dependencies { - include(dependency(':Core')) + include(dependency(":Core")) // update notification stuff - include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT')) - include(dependency('com.squareup.retrofit2:retrofit:2.4.0')) - include(dependency('com.squareup.okhttp3:okhttp:3.14.0')) - include(dependency('com.squareup.okio:okio:2.2.2')) - include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.30')) + include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) + include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) + include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) + include(dependency("com.squareup.okio:okio:2.2.2")) + include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.30")) include(dependency("io.papermc:paperlib:1.0.2")) } - relocate 'io.papermc.lib', 'com.github.intellectualsites.plotsquared.bukkit.paperlib' + relocate "io.papermc.lib", "com.github.intellectualsites.plotsquared.bukkit.paperlib" // relocate('org.mcstats', 'com.plotsquared.stats') archiveName = "${parent.name}-${project.name}-${parent.version}.jar" - destinationDir = file '../target' + destinationDir = file "../target" } shadowJar.doLast { diff --git a/Core/build.gradle b/Core/build.gradle index 3949c948e..9f3e57006 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -1,29 +1,29 @@ repositories { - maven { url 'https://jitpack.io' } + maven { url "https://jitpack.io" } } dependencies { - implementation 'org.yaml:snakeyaml:1.23' + implementation "org.yaml:snakeyaml:1.23" //keep inline with Minecraft which uses gson 2.8.0 - implementation 'com.google.code.gson:gson:2.8.0' + implementation "com.google.code.gson:gson:2.8.0" implementation("org.projectlombok:lombok:1.18.6") compileOnly("org.projectlombok:lombok:1.18.6") testCompileOnly("org.projectlombok:lombok:1.18.6") annotationProcessor("org.projectlombok:lombok:1.18.6") testAnnotationProcessor("org.projectlombok:lombok:1.18.6") - implementation 'net.kyori:text-adapter-bukkit:3.0.2' - implementation 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT' - implementation 'com.squareup.okhttp3:okhttp:3.14.0' - implementation 'com.squareup.okio:okio:2.2.2' - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30' + implementation "net.kyori:text-adapter-bukkit:3.0.2" + implementation "com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT" + implementation "com.squareup.okhttp3:okhttp:3.14.0" + implementation "com.squareup.okio:okio:2.2.2" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.30" } sourceCompatibility = 1.8 targetCompatibility = 1.8 processResources { - from('src/main/resources') { - include 'plugin.properties' + from("src/main/resources") { + include "plugin.properties" expand( version: "${project.parent.version}", name: project.parent.name, @@ -34,21 +34,21 @@ processResources { } jar.setArchiveName("PlotSquared-API-${project.parent.version}.jar") -jar.destinationDir = file '../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/' + project.parent.version +jar.destinationDir = file "../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/" + project.parent.version task createPom { doLast { pom { project { - groupId 'com.github.intellectualsites.plotsquared' - artifactId 'PlotSquared-API' + groupId "com.github.intellectualsites.plotsquared" + artifactId "PlotSquared-API" version project.parent.version } }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/${project.parent.version}/PlotSquared-API-${project.parent.version}.pom") pom { project { - groupId 'com.github.intellectualsites.plotsquared' - artifactId 'PlotSquared-API' - version 'latest' + groupId "com.github.intellectualsites.plotsquared" + artifactId "PlotSquared-API" + version "latest" } }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/latest/PlotSquared-API-latest.pom") } @@ -58,9 +58,9 @@ task copyFiles { doLast { copy { from "../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/${project.parent.version}/" - into '../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/latest/' - include('*.jar') - rename("PlotSquared-API-${project.parent.version}.jar", 'PlotSquared-API-latest.jar') + into "../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/latest/" + include("*.jar") + rename("PlotSquared-API-${project.parent.version}.jar", "PlotSquared-API-latest.jar") } } } diff --git a/build.gradle b/build.gradle index 5739869c8..e753e2a85 100644 --- a/build.gradle +++ b/build.gradle @@ -7,32 +7,32 @@ buildscript { jcenter() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0' + classpath "com.github.jengelman.gradle.plugins:shadow:5.0.0" } configurations.all { resolutionStrategy { - force 'org.ow2.asm:asm:7.1' + force "org.ow2.asm:asm:7.1" } } } plugins { - id 'maven-publish' + id "maven-publish" id "org.ajoberstar.grgit" version "3.1.1" } -group = 'com.github.intellectualsites.plotsquared' +group = "com.github.intellectualsites.plotsquared" def rootVersion = "4" def revision = "" def buildNumber = "" def date = "" ext { - git = Grgit.open(dir: new File(rootDir.toString()+'/.git')) + git = Grgit.open(dir: new File(rootDir.toString()+"/.git")) date = git.head().getDate().format("yy.MM.dd") revision = "-${git.head().abbreviatedId}" parents = git.head().parentIds; - if (project.hasProperty('buildnumber')) { + if (project.hasProperty("buildnumber")) { buildNumber = "$buildnumber" } else { index = -2042; // Offset to match CI @@ -48,28 +48,28 @@ version = String.format("%s.%s", rootVersion, buildNumber) description = rootProject.name subprojects { - apply plugin: 'java' - apply plugin: 'maven' - apply plugin: 'eclipse' - apply plugin: 'idea' - apply plugin: 'com.github.johnrengelman.shadow' + apply plugin: "java" + apply plugin: "maven" + apply plugin: "eclipse" + apply plugin: "idea" + apply plugin: "com.github.johnrengelman.shadow" - group = 'com.github.intellectualsites.plotsquared' + group = "com.github.intellectualsites.plotsquared" clean.doFirst { delete "../target" } dependencies { - implementation('com.sk89q.worldedit:worldedit-core:7.0.0') { - exclude(module: 'bukkit-classloader-check') - exclude(module: 'mockito-core') - exclude(module: 'dummypermscompat') + implementation("com.sk89q.worldedit:worldedit-core:7.0.0") { + exclude(module: "bukkit-classloader-check") + exclude(module: "mockito-core") + exclude(module: "dummypermscompat") } - implementation 'net.kyori:text-api:3.0.0' + implementation "net.kyori:text-api:3.0.0" //Minecraft uses Guava 21 as of 1.13. - compile 'com.google.guava:guava:21.0' - compileOnly 'org.jetbrains:annotations:17.0.0' + compile "com.google.guava:guava:21.0" + compileOnly "org.jetbrains:annotations:17.0.0" compile("org.projectlombok:lombok:1.18.6") compileOnly("org.projectlombok:lombok:1.18.6") testCompileOnly("org.projectlombok:lombok:1.18.6") @@ -82,16 +82,16 @@ subprojects { mavenCentral() maven { url "http://maven.sk89q.com/repo/" } maven { url "http://repo.maven.apache.org/maven2" } - maven { url 'https://jitpack.io' } + maven { url "https://jitpack.io" } } } -task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') { +task aggregatedJavadocs(type: Javadoc, description: "Generate javadocs from all child projects as if it was a single project", group: "Documentation") { destinationDir = file("./docs/javadoc") title = "$project.name $version API" options.author true - options.links 'http://docs.spring.io/spring/docs/4.3.x/javadoc-api/', 'http://docs.oracle.com/javase/8/docs/api/', 'http://docs.spring.io/spring-ws/docs/2.3.0.RELEASE/api/', 'http://docs.spring.io/spring-security/site/docs/4.0.4.RELEASE/apidocs/' - options.addStringOption('Xdoclint:none', '-quiet') + options.links "http://docs.spring.io/spring/docs/4.3.x/javadoc-api/", "http://docs.oracle.com/javase/8/docs/api/", "http://docs.spring.io/spring-ws/docs/2.3.0.RELEASE/api/", "http://docs.spring.io/spring-security/site/docs/4.0.4.RELEASE/apidocs/" + options.addStringOption("Xdoclint:none", "-quiet") delete "./docs"