From e7ff279c9e8c0023656ecae08794d3ca830637ff Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 17 Jun 2021 08:22:09 +0100 Subject: [PATCH] added lombok plugin --- build.gradle | 13 +++++-------- project/build.properties | 1 - project/build.scala | 5 ----- project/plugins.sbt | 9 --------- settings.gradle | 13 +++++++++++++ 5 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 project/build.properties delete mode 100644 project/build.scala delete mode 100644 project/plugins.sbt diff --git a/build.gradle b/build.gradle index cbd7bd1..568cb33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,11 @@ plugins { id 'maven-publish' + id 'net.woggioni.gradle.lombok' apply false } allprojects { apply plugin: 'java-library' + apply plugin: 'net.woggioni.gradle.lombok' group = "net.woggioni" version = jwoVersion @@ -14,18 +16,13 @@ allprojects { mavenCentral() } dependencies { - ['', 'test'].each {sourceSetName -> - ['compileOnly', 'annotationProcessor'].each { configurationSuffix -> - String configurationName - if(sourceSetName) configurationName = sourceSetName + configurationSuffix.capitalize() - else configurationName = configurationSuffix - add(configurationName, [group: "org.projectlombok", name: "lombok", version: lombokVersion]) - } - } testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitJupiterVersion testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion } + lombok { + version = lombokVersion + } } dependencies { diff --git a/project/build.properties b/project/build.properties deleted file mode 100644 index 947bdd3..0000000 --- a/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.4.3 diff --git a/project/build.scala b/project/build.scala deleted file mode 100644 index 60dc8bb..0000000 --- a/project/build.scala +++ /dev/null @@ -1,5 +0,0 @@ -object Versions { - val slf4j = "1.7.30" - val log4j = "2.13.2" - val lombok = "1.18.16" -} \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt deleted file mode 100644 index 92d50ae..0000000 --- a/project/plugins.sbt +++ /dev/null @@ -1,9 +0,0 @@ -resolvers += Resolver.jcenterRepo -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "4.1.0") -addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.8.4-SNAPSHOT") -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6") -addSbtPlugin("com.thoughtworks.sbt" % "delombokjavadoc" % "1.0.0+66-8fbcf18c") - -//addSbtPlugin("com.thoughtworks.sbt" % "delombokjavadoc" % "latest.release") \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3c2a8d0..cec1a9e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,16 @@ +pluginManagement { + repositories { + maven { + url = 'https://woggioni.net/mvn/' + } + gradlePluginPortal() + } + + plugins { + id "net.woggioni.gradle.lombok" version "0.1" + } +} + rootProject.name = 'jwo' include('benchmark')