diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e20c09..573af01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ -### NEXT_VERSION_TYPE=MAJOR|MINOR|PATCH +### NEXT_VERSION_TYPE=MAJOR ### NEXT_VERSION_DESCRIPTION_BEGIN +* **breaking changes** Обновление версии gradle до `7.4.1`; +* **breaking changes** Конфигурации `compile` заменены на `compileOnly`; ### NEXT_VERSION_DESCRIPTION_END ## [4.1.0](https://github.com/yoomoney/moira-trigger-plugin/pull/3) (02-02-2022) diff --git a/README.md b/README.md index 5f12e62..e97c460 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ moira { * Добавьте в качестве зависимости `moira-kotlin-dsl` отдельно для триггеров из проекта и из подключенного артефакта: ```groovy dependencies { - moiraFromDirCompile 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' - moiraFromArtifactCompile 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' + moiraFromDirCompileOnly 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' + moiraFromArtifactCompileOnly 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' } ``` diff --git a/coverage.properties b/coverage.properties index a876231..218390e 100644 --- a/coverage.properties +++ b/coverage.properties @@ -1,4 +1,4 @@ instruction=96 -branch=79 +branch=76 method=92 class=92 diff --git a/dependencies.gradle b/dependencies.gradle index 5fff6ca..4358389 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,6 @@ dependencies { api 'org.json:json:20190722', + 'org.jetbrains.kotlin:kotlin-reflect', 'org.jetbrains.kotlin:kotlin-compiler-embeddable', 'org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable', 'org.jetbrains.kotlin:kotlin-script-util' @@ -7,7 +8,7 @@ dependencies { testImplementation gradleTestKit(), 'junit:junit:4.12', 'org.eclipse.jetty:jetty-webapp:9.4.12.v20180830', - 'com.nhaarman:mockito-kotlin:1.6.0' + 'org.mockito.kotlin:mockito-kotlin:4.0.0' implementation 'ru.yoomoney.tech:moira-kotlin-client:2.0.0' testImplementation 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 81cf299..c4fc20d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index 9d82f78..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,74 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# 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 - 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -85,76 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + @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 +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,34 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/project.gradle b/project.gradle index 650a036..a38f1da 100644 --- a/project.gradle +++ b/project.gradle @@ -3,6 +3,6 @@ repositories { maven { url 'https://plugins.gradle.org/m2/' } dependencies { - classpath 'ru.yoomoney.gradle.plugins:gradle-project-plugin:7.+' + classpath 'ru.yoomoney.gradle.plugins:gradle-project-plugin:8.+' } } \ No newline at end of file diff --git a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/CollectMoiraTriggersTask.kt b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/CollectMoiraTriggersTask.kt index 4b83fe9..99b0c21 100644 --- a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/CollectMoiraTriggersTask.kt +++ b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/CollectMoiraTriggersTask.kt @@ -1,14 +1,14 @@ package ru.yoomoney.gradle.plugins.moira.trigger import org.gradle.api.DefaultTask -import org.gradle.api.artifacts.Configuration import org.gradle.api.logging.Logging +import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.Input +import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.TaskAction import ru.yoomoney.gradle.plugins.moira.trigger.MoiraTriggerPlugin.Companion.TRIGGERS_FROM_ARTIFACT_DIR import ru.yoomoney.gradle.plugins.moira.trigger.collect.MoiraTriggersCollector import java.io.File - import java.nio.file.Paths /** @@ -27,23 +27,25 @@ open class CollectMoiraTriggersTask : DefaultTask() { @TaskAction fun collectMoiraTriggers() { - val artifactConfiguration = project.configurations.getByName("moiraFromArtifactCompile") - val dirConfiguration = project.configurations.getByName("moiraFromDirCompile") + val artifactSourceSet = project.extensions.getByType(JavaPluginExtension::class.java).sourceSets + .getByName("moiraFromArtifact") + val dirSourceSet = project.extensions.getByType(JavaPluginExtension::class.java).sourceSets + .getByName("moiraFromDir") val targetDir = Paths.get(project.projectDir.toString(), extension.dir).toFile() - targetDir.collectTriggers(dirConfiguration) + targetDir.collectTriggers(dirSourceSet) val targetDirArtifact = Paths.get(project.buildDir.toString(), TRIGGERS_FROM_ARTIFACT_DIR).toFile() - targetDirArtifact.collectTriggers(artifactConfiguration) + targetDirArtifact.collectTriggers(artifactSourceSet) } - private fun File.collectTriggers(configuration: Configuration) { + private fun File.collectTriggers(sourceSet: SourceSet) { if (!this.exists()) { log.lifecycle("Directory ${this.absolutePath} does not exist. Skip.") return } - val triggersCollector = MoiraTriggersCollector(configuration.files) + val triggersCollector = MoiraTriggersCollector(classPathFiles = sourceSet.compileClasspath.files) val collectedTriggers = triggersCollector.collect(this) collectedTriggers.forEach { (name, trigger) -> log.info("Collected trigger ({}): json={}", name, trigger.toJson().toString(4)) @@ -51,7 +53,6 @@ open class CollectMoiraTriggersTask : DefaultTask() { } companion object { - private val log = Logging.getLogger(CollectMoiraTriggersTask::class.java) } } diff --git a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPlugin.kt b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPlugin.kt index 0de474f..b1ab18d 100644 --- a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPlugin.kt +++ b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPlugin.kt @@ -3,8 +3,9 @@ package ru.yoomoney.gradle.plugins.moira.trigger import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.Configuration +import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.plugins.JavaBasePlugin -import org.gradle.api.plugins.JavaPluginConvention +import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.Copy import java.io.File import java.nio.file.Paths @@ -25,30 +26,30 @@ open class MoiraTriggerPlugin : Plugin { val artifactConfiguration = target.configureArtifactSourceSets() val triggersConfiguration = target.configurations - .maybeCreate("${ARTIFACT_TRIGGERS_CONFIGURATION_NAME}Compile") + .maybeCreate("${ARTIFACT_TRIGGERS_CONFIGURATION_NAME}CompileOnly") target.afterEvaluate { project -> artifactConfiguration.extendsFrom(triggersConfiguration) - project.createUploadMoiraTriggersTask(dirConfiguration, artifactConfiguration, extension) - project.createCollectMoiraTriggersTask(dirConfiguration, artifactConfiguration, extension) + project.createUploadMoiraTriggersTask(extension) + project.createCollectMoiraTriggersTask(extension) project.createExtractTriggersTask(triggersConfiguration) } } private fun Project.configureDirSourceSets(extension: MoiraTriggerExtension): Configuration { - val sourceSets = convention.getPlugin(JavaPluginConvention::class.java).sourceSets + val sourceSets = extensions.getByType(JavaPluginExtension::class.java).sourceSets val sourceSet = sourceSets.create(DIR_SOURCE_SET_NAME) sourceSet.java.srcDir(File(extension.dir)) - return addKotlinDependencies("${DIR_SOURCE_SET_NAME}Compile") + return addKotlinDependencies("${DIR_SOURCE_SET_NAME}CompileOnly") } private fun Project.configureArtifactSourceSets(): Configuration { - val sourceSets = convention.getPlugin(JavaPluginConvention::class.java).sourceSets + val sourceSets = extensions.getByType(JavaPluginExtension::class.java).sourceSets val sourceSet = sourceSets.create(ARTIFACT_SOURCE_SET_NAME) sourceSet.java.srcDir(Paths.get(buildDir.toString(), TRIGGERS_FROM_ARTIFACT_DIR).toString()) - return addKotlinDependencies("${ARTIFACT_SOURCE_SET_NAME}Compile") + return addKotlinDependencies("${ARTIFACT_SOURCE_SET_NAME}CompileOnly") } private fun Project.addKotlinDependencies(configurationName: String): Configuration { @@ -63,22 +64,14 @@ open class MoiraTriggerPlugin : Plugin { return configurations.getByName(configurationName) } - private fun Project.createUploadMoiraTriggersTask( - dirConfiguration: Configuration, - artifactConfiguration: Configuration, - extension: MoiraTriggerExtension - ) { + private fun Project.createUploadMoiraTriggersTask(extension: MoiraTriggerExtension) { val task = tasks.create(UPLOAD_MOIRA_TRIGGERS_TASK_NAME, UploadMoiraTriggersTask::class.java) task.group = "other" task.description = "Upload Moira triggers" task.extension = extension } - private fun Project.createCollectMoiraTriggersTask( - dirConfiguration: Configuration, - artifactConfiguration: Configuration, - extension: MoiraTriggerExtension - ) { + private fun Project.createCollectMoiraTriggersTask(extension: MoiraTriggerExtension) { val task = tasks.create(COLLECT_MOIRA_TRIGGERS_TASK_NAME, CollectMoiraTriggersTask::class.java) task.group = "other" task.description = "Collect Moira triggers without uploading" @@ -94,6 +87,7 @@ open class MoiraTriggerPlugin : Plugin { task.from(files) task.into(Paths.get(buildDir.toString(), TRIGGERS_FROM_ARTIFACT_DIR).toString()) + task.duplicatesStrategy = DuplicatesStrategy.WARN tasks.getByName(UPLOAD_MOIRA_TRIGGERS_TASK_NAME).dependsOn(task) tasks.getByName(COLLECT_MOIRA_TRIGGERS_TASK_NAME).dependsOn(task) diff --git a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/UploadMoiraTriggersTask.kt b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/UploadMoiraTriggersTask.kt index 2ac5029..1ce726c 100644 --- a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/UploadMoiraTriggersTask.kt +++ b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/UploadMoiraTriggersTask.kt @@ -1,15 +1,15 @@ package ru.yoomoney.gradle.plugins.moira.trigger import org.gradle.api.DefaultTask -import org.gradle.api.artifacts.Configuration import org.gradle.api.logging.Logging +import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.Input +import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.TaskAction import ru.yoomoney.gradle.plugins.moira.trigger.MoiraTriggerPlugin.Companion.TRIGGERS_FROM_ARTIFACT_DIR import ru.yoomoney.gradle.plugins.moira.trigger.collect.MoiraTriggersCollector import ru.yoomoney.gradle.plugins.moira.trigger.upload.MoiraUploader import java.io.File - import java.nio.file.Paths /** @@ -26,25 +26,27 @@ open class UploadMoiraTriggersTask : DefaultTask() { @TaskAction internal fun uploadMoiraTriggers() { - val artifactConfiguration = project.configurations.getByName("moiraFromArtifactCompile") - val dirConfiguration = project.configurations.getByName("moiraFromDirCompile") + val artifactSourceSet = project.extensions.getByType(JavaPluginExtension::class.java).sourceSets + .getByName("moiraFromArtifact") + val dirSourceSet = project.extensions.getByType(JavaPluginExtension::class.java).sourceSets + .getByName("moiraFromDir") val uploader = MoiraUploader(url = extension.url!!, login = extension.login, password = extension.password) val targetDir = Paths.get(project.projectDir.toString(), extension.dir).toFile() - targetDir.uploadTriggers(dirConfiguration, uploader) + targetDir.uploadTriggers(dirSourceSet, uploader) val targetDirArtifact = Paths.get(project.buildDir.toString(), TRIGGERS_FROM_ARTIFACT_DIR).toFile() - targetDirArtifact.uploadTriggers(artifactConfiguration, uploader) + targetDirArtifact.uploadTriggers(artifactSourceSet, uploader) } - private fun File.uploadTriggers(configuration: Configuration, uploader: MoiraUploader) { + private fun File.uploadTriggers(sourceSet: SourceSet, uploader: MoiraUploader) { if (!this.exists()) { log.lifecycle("Directory ${this.absolutePath} does not exist. Skip.") return } - val triggersCollector = MoiraTriggersCollector(configuration.files) + val triggersCollector = MoiraTriggersCollector(classPathFiles = sourceSet.compileClasspath.files) val triggersToUpload = triggersCollector .collect(this) .map { it.second } diff --git a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/collect/DirectoryCollector.kt b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/collect/DirectoryCollector.kt index ff64887..510671b 100644 --- a/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/collect/DirectoryCollector.kt +++ b/src/main/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/collect/DirectoryCollector.kt @@ -4,8 +4,6 @@ import java.io.File /** * Collects items from directory using recursive search. - * - * Note that [maxDepth] = 1 means that only root will be scanned. Depth is unlimited by default. */ class DirectoryCollector( private val collector: FilesCollector diff --git a/src/test/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPluginSpec.kt b/src/test/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPluginSpec.kt index e67714e..06b73f3 100644 --- a/src/test/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPluginSpec.kt +++ b/src/test/kotlin/ru/yoomoney/gradle/plugins/moira/trigger/MoiraTriggerPluginSpec.kt @@ -11,7 +11,7 @@ class MoiraTriggerPluginSpec : AbstractPluginSpec() { buildFile.appendText(""" dependencies { - moiraFromDirCompile 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' + moiraFromDirCompileOnly 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' } """.trimIndent()) @@ -27,7 +27,7 @@ class MoiraTriggerPluginSpec : AbstractPluginSpec() { buildFile.appendText(""" dependencies { - moiraFromDirCompile 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' + moiraFromDirCompileOnly 'ru.yoomoney.tech:moira-kotlin-dsl:2.0.0' } """.trimIndent())