diff --git a/.gitignore b/.gitignore index 76161a2..07a48b3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ bin/ gen/ build/ build-test/ +lib/ # Gradle files .gradle/ @@ -18,4 +19,4 @@ version.properties .idea/ .DS_Store -*.iml \ No newline at end of file +*.iml diff --git a/README.md b/README.md index 14c48ed..252720a 100644 --- a/README.md +++ b/README.md @@ -33,19 +33,19 @@ Automatic Incremental Gradle Versioning. Customized into library with PreRel **code** - Increases at each release. ## Installation -Configure script dependencies in the project _build.gradle_ file: +Configure plugin management in _settings.gradle_ file: ``` gradle -buildscript { +pluginManagement { repositories { - // Using Bintray repository: - maven { url "http://dl.bintray.com/davideas/maven" } - // or Gradle plugins repository: maven { url "https://plugins.gradle.org/m2/" } } - dependencies { - // Using Bintray or Gradle Plugins repository - classpath "eu.davidea:grabver:2.0.2" - } +} +``` + +Configure build script in each _build.gradle_ file: +``` gradle +plugins { + id "eu.davidea.grabver" version "2.0.3" } ``` @@ -139,7 +139,7 @@ and `gradle -b build-test.gradle [grabverRelease]` OR testing with modules `grad # License - Copyright 2017-2019 Davidea Solutions Sprl + Copyright 2017-2024 Davidea Solutions Sprl Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/build-test.gradle b/build-test.gradle index 4ca8e46..03129e8 100644 --- a/build-test.gradle +++ b/build-test.gradle @@ -1,25 +1,16 @@ -apply plugin: 'java' -apply plugin: 'groovy' -apply plugin: 'eu.davidea.grabver' - /* - * INSTRUCTIONS to test new Version: - * - Change versions - * - Use mavenLocal() in repositories - * - Execute: - * gradle install - * - Specify the build file (--build-file): - * gradle -b build-test.gradle + * INSTRUCTIONS to test in local maven repository: + * - Command line to publish to maven local: gradle publishToMavenLocal + * - Use mavenLocal() in repositories to target the local/unpublished GrabVer version + * - Change digits in versioning + * - Command line of this file: gradle -b build-test.gradle build + * - Check versioning.properties + * - Change digits in versioning again and again, as you wish */ -buildscript { - repositories { - jcenter() - mavenLocal() - } - //noinspection GroovyAssignabilityCheck - dependencies { - classpath 'eu.davidea:grabver:2.0.2' - } +plugins { + id 'java' + id 'groovy' + id "eu.davidea.grabver" version "2.0.3" } versioning { @@ -29,20 +20,25 @@ versioning { incrementOn "jar" saveOn "jar" } + println("TEST - VersionCode: ${versioning.code}") println("TEST - VersionName: ${versioning.name}") println("TEST - FullName: ${versioning.fullName}") repositories { - jcenter() mavenLocal() + mavenCentral() } dependencies { implementation gradleApi() implementation localGroovy() - implementation 'nu.studer:java-ordered-properties:1.0.1' + implementation 'nu.studer:java-ordered-properties:1.0.4' testImplementation gradleTestKit() - testImplementation group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' +} + +tasks.test { + enabled false } diff --git a/build.gradle b/build.gradle index aff821e..57b7fa7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,29 @@ buildscript { repositories { mavenLocal() - maven { - url 'https://plugins.gradle.org/m2/' - } - } - dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath 'com.gradle.publish:plugin-publish-plugin:0.10.1' + mavenCentral() } } -apply plugin: 'java' -apply plugin: 'groovy' -apply plugin: 'maven' -apply plugin: 'com.gradle.plugin-publish' +plugins { + id 'java' + id 'groovy' + id 'com.gradle.plugin-publish' version '1.2.1' +} repositories { - jcenter() mavenLocal() + mavenCentral() } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation gradleApi() implementation localGroovy() - implementation 'nu.studer:java-ordered-properties:1.0.2' + implementation 'nu.studer:java-ordered-properties:1.0.4' testImplementation gradleTestKit() - testImplementation group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' } ext { @@ -38,17 +33,15 @@ ext { developerEmail = 'dave.dna@gmail.com' // Library Repository + groupId = 'eu.davidea' + artifactId = 'grabver' libraryName = 'GrabVer' - libraryVersion = '2.0.2' - displayName = 'Gradle Automatic Build Versioning Plugin' + libraryVersion = '2.0.3' + libraryTitle = 'Gradle Automatic Build Versioning Plugin' libraryDescription = 'An easy Gradle plugin that follows semver.org rules to automatically generate the Patch version, Build number and Code version, while Major, Minor and Pre-Release suffix remain under our control.' - libraryLabels = ['semver', 'version', 'versioning', 'build-versioning', 'automatic-versioning', 'intellij-idea', 'android-studio', 'auto-reset'] + libraryTags = ['semver', 'version', 'versioning', 'build-versioning', 'automatic-versioning', 'intellij-idea', 'android-studio', 'auto-reset'] siteUrl = 'https://github.com/davideas/GrabVer' gitUrl = 'https://github.com/davideas/GrabVer.git' - bintrayRepo = 'maven' - bintrayName = 'grabver' - publishedGroupId = 'eu.davidea' - id = publishedGroupId + '.' + bintrayName // License licenseName = 'The Apache Software License, Version 2.0' @@ -56,31 +49,41 @@ ext { allLicenses = ['Apache-2.0'] } -// To publish on Gradle Plugins: gradle publishPlugins -group publishedGroupId +group groupId version libraryVersion -pluginBundle { +javadoc { + // Suppresses the warnings + options.addBooleanOption('Xdoclint:none', true) +} + +// To publish to Maven local: gradle publishToMavenLocal +// To publish to Gradle Plugin Central: gradle publishPlugin [--validate-only] +gradlePlugin { website = project.siteUrl vcsUrl = project.gitUrl - description = project.libraryDescription - tags = project.libraryLabels plugins { grabverPlugin { - id = project.id - displayName = project.displayName + id = project.groupId + '.' + project.artifactId + displayName = project.libraryTitle + description = project.libraryDescription + tags = project.libraryTags + implementationClass = project.groupId + '.gradle.GrabVer' } } +} - mavenCoordinates { - groupId = publishedGroupId - artifactId = bintrayName - version = libraryVersion - } +// To publish to Maven: gradle publish +if (gradle.getStartParameter().getTaskNames().contains("publish")) { + //apply from: 'maven-publish.gradle' } -// To publish on Bintray: gradle bintrayUpload -if (gradle.getStartParameter().getTaskNames().contains("bintrayUpload")) { - apply from: 'jfrog-bintray-publish.gradle' +// To run unit tests add in command line: -P test +tasks.test { + it.jvmArgs = ["--add-opens=java.base/java.lang=ALL-UNNAMED"] + + onlyIf { + providers.gradleProperty("test").isPresent() + } } diff --git a/gradlew b/gradlew deleted file mode 100644 index 4453cce..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/jfrog-bintray-publish.gradle b/jfrog-bintray-publish.gradle deleted file mode 100644 index 5057093..0000000 --- a/jfrog-bintray-publish.gradle +++ /dev/null @@ -1,45 +0,0 @@ -apply plugin: 'com.jfrog.bintray' - -version = libraryVersion - -def getRepositoryUsername() { - return getProperties().get('bintray.user') -} -def getRepositoryPassphrase() { - return getProperties().get('bintray.gpg.password') -} -def getApiKey() { - return getProperties().get("bintray.apikey") -} - -if (gradle.getStartParameter().getTaskNames().contains("bintrayUpload")) { - println("> Publishing: " + libraryName + " " + libraryVersion) - - bintray { - user = getRepositoryUsername() - key = getApiKey() - - configurations = ['archives'] - pkg { - repo = bintrayRepo - name = bintrayName - desc = libraryDescription - websiteUrl = siteUrl - licenses = allLicenses - vcsUrl = gitUrl - labels = libraryLabels - publish = true - publicDownloadNumbers = true - version { - name = libraryVersion - desc = libraryDescription - vcsTag = libraryVersion - released = new Date() - gpg { - sign = true //Determines whether to GPG sign the files. The default is false - passphrase = getRepositoryPassphrase() - } - } - } - } -} \ No newline at end of file diff --git a/module_a/build.gradle b/module_a/build.gradle index 02c29a8..4aee217 100644 --- a/module_a/build.gradle +++ b/module_a/build.gradle @@ -1,13 +1,5 @@ -apply plugin: 'eu.davidea.grabver' - -buildscript { - repositories { - jcenter() - mavenLocal() - } - dependencies { - classpath 'eu.davidea:grabver:2.0.2' - } +plugins { + id 'eu.davidea.grabver' version '2.0.3' } versioning { @@ -15,6 +7,7 @@ versioning { minor 2 incrementOn 'build' } + println("MODULE_A - VersionCode: ${versioning.code}") println("MODULE_A - VersionName: ${versioning.name}") println("MODULE_A - FullName: ${versioning.fullName}") diff --git a/module_b/build.gradle b/module_b/build.gradle index 709149a..eeed306 100644 --- a/module_b/build.gradle +++ b/module_b/build.gradle @@ -1,19 +1,12 @@ -apply plugin: 'eu.davidea.grabver' - -buildscript { - repositories { - jcenter() - mavenLocal() - } - dependencies { - classpath 'eu.davidea:grabver:2.0.2' - } +plugins { + id 'eu.davidea.grabver' version '2.0.3' } versioning { major 2 minor 2 } + println("MODULE_B - VersionCode: ${versioning.code}") println("MODULE_B - VersionName: ${versioning.name}") println("MODULE_B - FullName: ${versioning.fullName}") diff --git a/settings.gradle b/settings.gradle index 06d2b42..2a865e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,15 @@ +pluginManagement { + repositories { + flatDir { dirs 'build/libs' } + mavenLocal() + mavenCentral() + maven { url 'https://plugins.gradle.org/m2/' } + } +} + rootProject.name = 'grabver' -if (gradle.startParameter.taskNames.contains("build")) { +if (gradle.startParameter.taskNames.contains("test")) { include 'module_a' include 'module_b' } - diff --git a/src/main/groovy/eu/davidea/gradle/ConsoleColors.java b/src/main/groovy/eu/davidea/gradle/ConsoleColors.java index 5bc5d18..cd8e704 100644 --- a/src/main/groovy/eu/davidea/gradle/ConsoleColors.java +++ b/src/main/groovy/eu/davidea/gradle/ConsoleColors.java @@ -56,7 +56,7 @@ public enum ConsoleColors { CYAN_BOLD_BRIGHT("\033[1;96m"), // CYAN WHITE_BOLD_BRIGHT("\033[1;97m"); // WHITE - String code; + private String code; ConsoleColors(String code) { this.code = code; @@ -73,5 +73,4 @@ public static String underline(String message) { public static String styler(ConsoleColors color, String message) { return color.code + message + ConsoleColors.RESET.code; } - -} \ No newline at end of file +} diff --git a/src/main/groovy/eu/davidea/gradle/GrabVer.groovy b/src/main/groovy/eu/davidea/gradle/GrabVer.groovy index cb45b73..cdaa426 100644 --- a/src/main/groovy/eu/davidea/gradle/GrabVer.groovy +++ b/src/main/groovy/eu/davidea/gradle/GrabVer.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 Davidea Solutions Sprl + * Copyright 2017-2024 Davidea Solutions Sprl * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ import static eu.davidea.gradle.ConsoleColors.* */ class GrabVer implements Plugin { - private static String GRABVER_VERSION = "2.0.2" + private static String GRABVER_VERSION = "2.0.3" private static String[] RELEASE_TASKS = ["assembleRelease", "bundleRelease", "grabverRelease"] private static String[] SAVE_TASKS = ["build", "assembleDebug", "assembleRelease", "bundleDebug", "bundleRelease", "grabverRelease", "jar", "war", "explodedWar"] private static String VERSIONING_FILENAME = 'version.properties' diff --git a/src/main/groovy/eu/davidea/gradle/VersionType.groovy b/src/main/groovy/eu/davidea/gradle/VersionType.groovy index 6efabcd..020b366 100644 --- a/src/main/groovy/eu/davidea/gradle/VersionType.groovy +++ b/src/main/groovy/eu/davidea/gradle/VersionType.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2017 Davidea Solutions Sprl + * Copyright 2017-2024 Davidea Solutions Sprl * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,4 +17,4 @@ package eu.davidea.gradle enum VersionType { MAJOR, MINOR, PATCH, PRE_RELEASE, BUILD, CODE -} \ No newline at end of file +} diff --git a/src/main/groovy/eu/davidea/gradle/VersioningExtension.groovy b/src/main/groovy/eu/davidea/gradle/VersioningExtension.groovy index 4a3145b..41595ad 100644 --- a/src/main/groovy/eu/davidea/gradle/VersioningExtension.groovy +++ b/src/main/groovy/eu/davidea/gradle/VersioningExtension.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 Davidea Solutions Sprl + * Copyright 2017-2024 Davidea Solutions Sprl * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -174,4 +174,4 @@ class VersioningExtension { " code=" + code } -} \ No newline at end of file +} diff --git a/src/main/resources/META-INF/gradle-plugins/eu.davidea.grabver.properties b/src/main/resources/META-INF/gradle-plugins/eu.davidea.grabver.properties deleted file mode 100644 index f6fdda0..0000000 --- a/src/main/resources/META-INF/gradle-plugins/eu.davidea.grabver.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=eu.davidea.gradle.GrabVer \ No newline at end of file diff --git a/src/test/groovy/eu/davidea/gradle/GrabVerTest.groovy b/src/test/groovy/eu/davidea/gradle/GrabVerTest.groovy index 905bf9c..44612ed 100644 --- a/src/test/groovy/eu/davidea/gradle/GrabVerTest.groovy +++ b/src/test/groovy/eu/davidea/gradle/GrabVerTest.groovy @@ -6,6 +6,7 @@ import org.gradle.testfixtures.ProjectBuilder import org.junit.Assert import org.junit.Before import org.junit.Test + /** * @author Davide Steduto * @since 19/05/2017 @@ -17,7 +18,7 @@ class GrabVerTest { private static final PLUGIN_ID = 'eu.davidea.grabver' @Before - void setUp() { + void setup() { project = ProjectBuilder.builder().withProjectDir(new File(".")).build() simulateProperties(1, 1, 1, 20, 3) } @@ -293,5 +294,4 @@ class GrabVerTest { } return versionPropsFile } - -} \ No newline at end of file +}