From 33a0cce87e916c11fde4215b93b354685aeb9b2a Mon Sep 17 00:00:00 2001 From: Petr Zinin Date: Wed, 6 Apr 2022 15:49:50 +0300 Subject: [PATCH] gradle version updated to `7.4.1` --- CHANGELOG.md | 4 +- README.md | 8 +- dependencies.gradle | 13 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- gradlew.bat | 21 +- project.gradle | 2 +- .../grafana/CollectGrafanaDashboardsTask.java | 26 +- .../grafana/GrafanaDashboardPlugin.java | 63 +++-- .../grafana/UploadGrafanaDashboardsTask.java | 26 +- .../impl/KotlinScriptContentCreator.java | 6 +- 11 files changed, 233 insertions(+), 195 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f44dd..0c65158 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 version updated to `7.4.1` +* **breaking changes** `compile` configuration changed to `compileOnly`; ### NEXT_VERSION_DESCRIPTION_END ## [5.4.0](https://github.com/yoomoney/grafana-dashboard-plugin/pull/7) (15-10-2021) diff --git a/README.md b/README.md index 73c04e8..f616232 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ grafana { The plugin supports two work scenarios. 1. Scans the folder, configured in settings (grafana.dir) -2. Scans the artifacts, declare in grafanaDashboardsCompile configuration +2. Scans the artifacts, declare in grafanaDashboardsCompileOnly configuration Scans for files with dashboards description, in following formats: @@ -91,13 +91,13 @@ an output is a description of dashboards in JSON format. It is most useful when used with another one of our projects: [Grafana Dashboard Dsl](https://github.com/yoomoney-tech/grafana-dashboard-dsl) SourceSet was separated into grafanaFromArtifact and grafanaFromDir for the purpose to announce different versions of dsl. -Just add a dependency to build script, in the `grafanaFromDirCompile` and `grafanaFromArtifactCompile` source set, +Just add a dependency to build script, in the `grafanaFromDirCompileOnly` and `grafanaFromArtifactCompileOnly` source set, as follows: ```groovy dependencies { - grafanaFromDirCompile 'ru.yoomoney.tech:grafana-dashboard-dsl:1.2.0' - grafanaFromArtifactCompile 'ru.yoomoney.tech:grafana-dashboard-dsl:1.1.0' + grafanaFromDirCompileOnly 'ru.yoomoney.tech:grafana-dashboard-dsl:1.2.0' + grafanaFromArtifactCompileOnly 'ru.yoomoney.tech:grafana-dashboard-dsl:1.1.0' } ``` diff --git a/dependencies.gradle b/dependencies.gradle index f220a68..174e03e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,17 +1,14 @@ import kotlin.KotlinVersion dependencies { - compile 'org.apache.httpcomponents:httpclient:4.5.3', + implementation 'org.apache.httpcomponents:httpclient:4.5.3', 'com.google.code.findbugs:annotations:3.0.1', "org.json:json:20180130", - "org.jetbrains.kotlin:kotlin-stdlib:${KotlinVersion.CURRENT}", - "org.jetbrains.kotlin:kotlin-reflect:${KotlinVersion.CURRENT}", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${KotlinVersion.CURRENT}", - "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.50", - "org.jetbrains.kotlin:kotlin-script-util:1.3.50", - "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.50" + "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31", + "org.jetbrains.kotlin:kotlin-script-util:1.5.31", + "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31" - testCompile gradleTestKit(), + testImplementation gradleTestKit(), 'junit:junit:4.12', 'org.eclipse.jetty:jetty-webapp:9.4.12.v20180830' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 21e622d..d7e66b5 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 diff --git a/gradlew b/gradlew index fbd7c51..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## 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/. +# ############################################################################## # 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 +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +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 () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,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 @@ -106,80 +140,95 @@ 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 +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" = "true" -o "$msys" = "true" ] ; 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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=`expr $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 -# 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; +# * $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. +# -# 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" +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 5093609..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ 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. @@ -54,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% @@ -64,21 +64,6 @@ 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 @@ -86,7 +71,7 @@ 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/java/ru/yoomoney/gradle/plugins/grafana/CollectGrafanaDashboardsTask.java b/src/main/java/ru/yoomoney/gradle/plugins/grafana/CollectGrafanaDashboardsTask.java index 8b45b08..c1e8a8d 100644 --- a/src/main/java/ru/yoomoney/gradle/plugins/grafana/CollectGrafanaDashboardsTask.java +++ b/src/main/java/ru/yoomoney/gradle/plugins/grafana/CollectGrafanaDashboardsTask.java @@ -1,9 +1,9 @@ package ru.yoomoney.gradle.plugins.grafana; import org.gradle.api.DefaultTask; -import org.gradle.api.artifacts.Configuration; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; +import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.TaskAction; import org.json.JSONObject; import ru.yoomoney.gradle.plugins.grafana.impl.GrafanaDashboard; @@ -23,8 +23,8 @@ public class CollectGrafanaDashboardsTask extends DefaultTask { private final Logger log = Logging.getLogger(CollectGrafanaDashboardsTask.class); - private Configuration grafanaFromDirConfiguration; - private Configuration grafanaFromArtifactConfiguration; + private SourceSet grafanaFromDirSourceSet; + private SourceSet grafanaFromArtifactSourceSet; private GrafanaDashboardExtension grafanaDashboardExtension; /** @@ -34,10 +34,10 @@ public class CollectGrafanaDashboardsTask extends DefaultTask { void collectGrafanaDashboards() { log.lifecycle("Collect Grafana dashboards: printCollectedDashboards={}", grafanaDashboardExtension.printCollectedDashboards); - List dashboardsContentFromArtifact = getDashboardsContent(grafanaFromArtifactConfiguration, + List dashboardsContentFromArtifact = getDashboardsContent(grafanaFromArtifactSourceSet, Paths.get(getProject().getBuildDir().toString(), GrafanaDashboardPlugin.DASHBOARDS_FROM_ARTIFACT_DIR).toFile()); - List dashboardsContentFromDir = getDashboardsContent(grafanaFromDirConfiguration, + List dashboardsContentFromDir = getDashboardsContent(grafanaFromDirSourceSet, Paths.get(getProject().getProjectDir().toString(), grafanaDashboardExtension.dir).toFile()); if (!grafanaDashboardExtension.printCollectedDashboards) { @@ -48,8 +48,8 @@ void collectGrafanaDashboards() { printDashboards(dashboardsContentFromDir); } - private List getDashboardsContent(Configuration configuration, File targetDir) { - return new GrafanaDashboardCollector(Arrays.asList(new RawContentCreator(), kotlinScriptContentCreator(configuration))) + private List getDashboardsContent(SourceSet sourceSet, File targetDir) { + return new GrafanaDashboardCollector(Arrays.asList(new RawContentCreator(), kotlinScriptContentCreator(sourceSet))) .collectDashboards(targetDir); } @@ -60,16 +60,16 @@ private void printDashboards(List dashboardsContent) { } - private KotlinScriptContentCreator kotlinScriptContentCreator(Configuration grafanaConfiguration) { - return new KotlinScriptContentCreator(grafanaConfiguration, grafanaDashboardExtension.classpath); + private KotlinScriptContentCreator kotlinScriptContentCreator(SourceSet sourceSet) { + return new KotlinScriptContentCreator(sourceSet, grafanaDashboardExtension.classpath); } - void setGrafanaFromArtifactConfiguration(Configuration artifactConfiguration) { - this.grafanaFromArtifactConfiguration = artifactConfiguration; + void setGrafanaFromArtifactSourceSet(SourceSet artifactConfiguration) { + this.grafanaFromArtifactSourceSet = artifactConfiguration; } - void setGrafanaFromDirConfiguration(Configuration dirConfiguration) { - this.grafanaFromDirConfiguration = dirConfiguration; + void setGrafanaFromDirSourceSet(SourceSet grafanaFromDirSourceSet) { + this.grafanaFromDirSourceSet = grafanaFromDirSourceSet; } void setGrafanaDashboardExtension(GrafanaDashboardExtension grafanaDashboardExtension) { diff --git a/src/main/java/ru/yoomoney/gradle/plugins/grafana/GrafanaDashboardPlugin.java b/src/main/java/ru/yoomoney/gradle/plugins/grafana/GrafanaDashboardPlugin.java index e057b55..5a8de18 100644 --- a/src/main/java/ru/yoomoney/gradle/plugins/grafana/GrafanaDashboardPlugin.java +++ b/src/main/java/ru/yoomoney/gradle/plugins/grafana/GrafanaDashboardPlugin.java @@ -5,10 +5,11 @@ import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.DependencySet; +import org.gradle.api.file.DuplicatesStrategy; import org.gradle.api.file.FileTree; import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency; 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 org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; @@ -42,20 +43,23 @@ public class GrafanaDashboardPlugin implements Plugin { public void apply(Project target) { target.getPluginManager().apply(JavaBasePlugin.class); GrafanaDashboardExtension grafanaDashboardExtension = getGrafanaDashboardExtensionWithDefaults(target); - Configuration grafanaFromDirConfiguration = configureDirSourceSets(target, grafanaDashboardExtension); - Configuration grafanaFromArtifactConfiguration = configureArtifactSourceSets(target); + SourceSet grafanaFromDirSourceSet = configureDirSourceSets(target, grafanaDashboardExtension); + SourceSet grafanaFromArtifactSourceSet = configureArtifactSourceSets(target); Configuration grafanaDashboardsConfiguration = target.getConfigurations() - .maybeCreate(GRAFANA_DASHBOARDS_CONFIGURATION_NAME + "Compile"); + .maybeCreate(GRAFANA_DASHBOARDS_CONFIGURATION_NAME + "CompileOnly"); + + target.afterEvaluate(project -> { - grafanaFromArtifactConfiguration.extendsFrom(grafanaDashboardsConfiguration); + target.getConfigurations().getByName(grafanaFromArtifactSourceSet.getCompileOnlyConfigurationName()) + .extendsFrom(grafanaDashboardsConfiguration); createUploadGrafanaDashboardTask(project, - grafanaFromDirConfiguration, grafanaFromArtifactConfiguration, grafanaDashboardExtension); + grafanaFromDirSourceSet, grafanaFromArtifactSourceSet, grafanaDashboardExtension); createCollectGrafanaDashboardTask(project, - grafanaFromDirConfiguration, grafanaFromArtifactConfiguration, grafanaDashboardExtension); + grafanaFromDirSourceSet, grafanaFromArtifactSourceSet, grafanaDashboardExtension); createExtractGrafanaDashboardsTask(grafanaDashboardsConfiguration, target); }); @@ -68,31 +72,27 @@ private static GrafanaDashboardExtension getGrafanaDashboardExtensionWithDefault return grafanaDashboardExtension; } - private Configuration configureDirSourceSets(Project project, + private SourceSet configureDirSourceSets(Project project, GrafanaDashboardExtension grafanaDashboardExtension) { - SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets(); + SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets(); SourceSet grafanaSourceset = sourceSets.create(GRAFANA_DIR_SOURCE_SET_NAME); grafanaSourceset.getJava().srcDir(new File(grafanaDashboardExtension.dir)); - Configuration grafanaDirCompile = project.getConfigurations() - .maybeCreate(GRAFANA_DIR_SOURCE_SET_NAME + "Compile"); - - return addKotlinDependencies(grafanaDirCompile); + addKotlinDependencies(project.getConfigurations().getByName(grafanaSourceset.getCompileOnlyConfigurationName())); + return grafanaSourceset; } - private Configuration configureArtifactSourceSets(Project project) { - SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets(); + private SourceSet configureArtifactSourceSets(Project project) { + SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets(); SourceSet grafanaSourceset = sourceSets.create(GRAFANA_ARTIFACT_SOURCE_SET_NAME); grafanaSourceset.getJava() .srcDir(Paths.get(project.getBuildDir().toString(), GRAFANA_ARTIFACT_SOURCE_SET_NAME).toString()); - Configuration grafanaDirCompile = project.getConfigurations() - .maybeCreate(GRAFANA_ARTIFACT_SOURCE_SET_NAME + "Compile"); - - return addKotlinDependencies(grafanaDirCompile); + addKotlinDependencies(project.getConfigurations().getByName(grafanaSourceset.getCompileOnlyConfigurationName())); + return grafanaSourceset; } - private Configuration addKotlinDependencies(Configuration grafanaConfiguration) { + private void addKotlinDependencies(Configuration grafanaConfiguration) { DependencySet grafanaCompileDependencies = grafanaConfiguration.getDependencies(); grafanaCompileDependencies.add(new DefaultExternalModuleDependency( "org.jetbrains.kotlin", "kotlin-stdlib", KotlinVersion.CURRENT.toString())); @@ -100,7 +100,6 @@ private Configuration addKotlinDependencies(Configuration grafanaConfiguration) "org.jetbrains.kotlin", "kotlin-reflect", KotlinVersion.CURRENT.toString())); grafanaCompileDependencies.add(new DefaultExternalModuleDependency( "org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable", KotlinVersion.CURRENT.toString())); - return grafanaConfiguration; } private void createExtractGrafanaDashboardsTask(Configuration grafanaDashboardsConfiguration, Project project) { @@ -111,32 +110,38 @@ private void createExtractGrafanaDashboardsTask(Configuration grafanaDashboardsC task.from(files); task.into(Paths.get(project.getBuildDir().toString(), DASHBOARDS_FROM_ARTIFACT_DIR).toString()); + task.setDuplicatesStrategy(DuplicatesStrategy.WARN); + project.getTasks().getByName(UPLOAD_TASK_NAME).dependsOn(task); project.getTasks().getByName(COLLECT_TASK_NAME).dependsOn(task); } private static void createUploadGrafanaDashboardTask( - Project target, Configuration grafanaFromDirConfiguration, - Configuration grafanaFromArtifactConfiguration, GrafanaDashboardExtension grafanaDashboardExtension) { + Project target, + SourceSet grafanaFromDirSourceSet, + SourceSet grafanaFromArtifactSourceSet, + GrafanaDashboardExtension grafanaDashboardExtension) { UploadGrafanaDashboardsTask task = target.getTasks() .create(UPLOAD_TASK_NAME, UploadGrafanaDashboardsTask.class); task.setGroup("other"); task.setDescription("Upload Grafana dashboards"); - task.setGrafanaFromDirConfiguration(grafanaFromDirConfiguration); - task.setGrafanaFromArtifactConfiguration(grafanaFromArtifactConfiguration); + task.setGrafanaFromDirSourceSet(grafanaFromDirSourceSet); + task.setGrafanaFromArtifactSourceSet(grafanaFromArtifactSourceSet); task.setGrafanaDashboardExtension(grafanaDashboardExtension); } private static void createCollectGrafanaDashboardTask( - Project target, Configuration grafanaFromDirConfiguration, - Configuration grafanaFromArtifactConfiguration, GrafanaDashboardExtension grafanaDashboardExtension) { + Project target, + SourceSet grafanaFromDirSourceSet, + SourceSet grafanaFromArtifactSourceSet, + GrafanaDashboardExtension grafanaDashboardExtension) { CollectGrafanaDashboardsTask task = target.getTasks() .create(COLLECT_TASK_NAME, CollectGrafanaDashboardsTask.class); task.setGroup("other"); task.setDescription("Collect grafana dashboards"); - task.setGrafanaFromDirConfiguration(grafanaFromDirConfiguration); - task.setGrafanaFromArtifactConfiguration(grafanaFromArtifactConfiguration); + task.setGrafanaFromDirSourceSet(grafanaFromDirSourceSet); + task.setGrafanaFromArtifactSourceSet(grafanaFromArtifactSourceSet); task.setGrafanaDashboardExtension(grafanaDashboardExtension); } } \ No newline at end of file diff --git a/src/main/java/ru/yoomoney/gradle/plugins/grafana/UploadGrafanaDashboardsTask.java b/src/main/java/ru/yoomoney/gradle/plugins/grafana/UploadGrafanaDashboardsTask.java index e098c1b..a4461da 100644 --- a/src/main/java/ru/yoomoney/gradle/plugins/grafana/UploadGrafanaDashboardsTask.java +++ b/src/main/java/ru/yoomoney/gradle/plugins/grafana/UploadGrafanaDashboardsTask.java @@ -1,7 +1,7 @@ package ru.yoomoney.gradle.plugins.grafana; import org.gradle.api.DefaultTask; -import org.gradle.api.artifacts.Configuration; +import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.TaskAction; import ru.yoomoney.gradle.plugins.grafana.impl.GrafanaDashboard; import ru.yoomoney.gradle.plugins.grafana.impl.GrafanaDashboardCollector; @@ -22,8 +22,8 @@ */ public class UploadGrafanaDashboardsTask extends DefaultTask { - private Configuration grafanaFromDirConfiguration; - private Configuration grafanaFromArtifactConfiguration; + private SourceSet grafanaFromDirSourceSet; + private SourceSet grafanaFromArtifactSourceSet; private GrafanaDashboardExtension grafanaDashboardExtension; /** @@ -43,30 +43,30 @@ void uploadGrafanaDashboards() { GrafanaDashboardUploader grafanaUploader = new GrafanaDashboardUploader(grafanaUploadSettings); - List dashboardsContent = getDashboardsContent(grafanaFromArtifactConfiguration, + List dashboardsContent = getDashboardsContent(grafanaFromArtifactSourceSet, Paths.get(getProject().getBuildDir().toString(), DASHBOARDS_FROM_ARTIFACT_DIR).toFile()); grafanaUploader.uploadDashboards(dashboardsContent); - List dashboardsContentFromDir = getDashboardsContent(grafanaFromDirConfiguration, + List dashboardsContentFromDir = getDashboardsContent(grafanaFromDirSourceSet, Paths.get(getProject().getProjectDir().toString(), grafanaDashboardExtension.dir).toFile()); grafanaUploader.uploadDashboards(dashboardsContentFromDir); } - private List getDashboardsContent(Configuration configuration, File targetDir) { - return new GrafanaDashboardCollector(Arrays.asList(new RawContentCreator(), kotlinScriptContentCreator(configuration))) + private List getDashboardsContent(SourceSet sourceSet, File targetDir) { + return new GrafanaDashboardCollector(Arrays.asList(new RawContentCreator(), kotlinScriptContentCreator(sourceSet))) .collectDashboards(targetDir); } - private KotlinScriptContentCreator kotlinScriptContentCreator(Configuration grafanaConfiguration) { - return new KotlinScriptContentCreator(grafanaConfiguration, grafanaDashboardExtension.classpath); + private KotlinScriptContentCreator kotlinScriptContentCreator(SourceSet grafanaSourceSet) { + return new KotlinScriptContentCreator(grafanaSourceSet, grafanaDashboardExtension.classpath); } - void setGrafanaFromArtifactConfiguration(Configuration artifactConfiguration) { - this.grafanaFromArtifactConfiguration = artifactConfiguration; + void setGrafanaFromArtifactSourceSet(SourceSet sourceSet) { + this.grafanaFromArtifactSourceSet = sourceSet; } - void setGrafanaFromDirConfiguration(Configuration dirConfiguration) { - this.grafanaFromDirConfiguration = dirConfiguration; + void setGrafanaFromDirSourceSet(SourceSet dirSourceSet) { + this.grafanaFromDirSourceSet = dirSourceSet; } void setGrafanaDashboardExtension(GrafanaDashboardExtension grafanaDashboardExtension) { diff --git a/src/main/java/ru/yoomoney/gradle/plugins/grafana/impl/KotlinScriptContentCreator.java b/src/main/java/ru/yoomoney/gradle/plugins/grafana/impl/KotlinScriptContentCreator.java index 51c8e39..8f4a5a1 100644 --- a/src/main/java/ru/yoomoney/gradle/plugins/grafana/impl/KotlinScriptContentCreator.java +++ b/src/main/java/ru/yoomoney/gradle/plugins/grafana/impl/KotlinScriptContentCreator.java @@ -1,8 +1,8 @@ package ru.yoomoney.gradle.plugins.grafana.impl; import kotlin.text.Charsets; -import org.gradle.api.artifacts.Configuration; import org.gradle.api.file.FileCollection; +import org.gradle.api.tasks.SourceSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngine; @@ -24,10 +24,10 @@ public class KotlinScriptContentCreator implements DashboardContentCreator { private final KotlinJsr223JvmLocalScriptEngine kotlinEngine; - public KotlinScriptContentCreator(@Nonnull Configuration grafanaConfiguration, @Nullable FileCollection grafanaClasspath) { + public KotlinScriptContentCreator(@Nonnull SourceSet sourceSet, @Nullable FileCollection grafanaClasspath) { kotlinEngine = (KotlinJsr223JvmLocalScriptEngine) new ScriptEngineManager() .getEngineByExtension("kts"); - kotlinEngine.getTemplateClasspath().addAll(grafanaConfiguration.getFiles()); + kotlinEngine.getTemplateClasspath().addAll(sourceSet.getCompileClasspath().getFiles()); if (Objects.nonNull(grafanaClasspath)) { kotlinEngine.getTemplateClasspath().addAll(grafanaClasspath.getFiles()); }