diff --git a/.gitignore b/.gitignore index db55dad..ad148c2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,14 @@ natives/samplerate/src natives/vorbis/*/ udpqueue-natives/dist -*.log \ No newline at end of file +*.log + +# Windows +Thumbs.db +desktop.ini + +# OS X +.DS_Store +.Spotlight-V100 +.Trashes +._* diff --git a/README.md b/README.md index 34bff4b..7fcdc34 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The plugin first needs to be included: ```groovy plugins { - id 'com.sedmelluq.jdaction' version '1.0.2' + id 'com.sedmelluq.jdaction' version '1.0.3' } ``` diff --git a/build.gradle b/build.gradle index b863a9a..a34b5d3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,16 @@ -buildscript { - repositories { - maven { - url 'https://plugins.gradle.org/m2/' - } - } - dependencies { - classpath 'com.gradle.publish:plugin-publish-plugin:0.9.7' - } -} - plugins { id 'java-gradle-plugin' id 'maven-publish' id 'com.jfrog.bintray' version '1.7.3' + id "com.gradle.plugin-publish" version "0.10.1" } -apply plugin: 'com.gradle.plugin-publish' +ext.moduleName = 'jdaction' group 'com.sedmelluq' -ext.moduleName = 'jdaction' -version = '1.0.2' +version '1.0.3' + +sourceCompatibility = 1.8 repositories { jcenter() @@ -27,7 +18,7 @@ repositories { dependencies { compile gradleApi() - compile 'org.ow2.asm:asm-debug-all:5.0.3' + compile group: 'org.ow2.asm', name: 'asm-debug-all', version: '6.0_BETA' } gradlePlugin { @@ -68,4 +59,4 @@ pluginBundle { artifactId = moduleName version = project.version } -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 51288f9..28861d2 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 a46485c..bfa8bce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Dec 20 23:58:45 EET 2016 +#Thu Mar 07 00:55:48 GMT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 4453cce..cccdd3d --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4581ae4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'jdaction' + diff --git a/src/main/java/com/sedmelluq/discord/jdaction/NoActionClassVisitor.java b/src/main/java/com/sedmelluq/discord/jdaction/NoActionClassVisitor.java index da51916..eceb41b 100644 --- a/src/main/java/com/sedmelluq/discord/jdaction/NoActionClassVisitor.java +++ b/src/main/java/com/sedmelluq/discord/jdaction/NoActionClassVisitor.java @@ -14,7 +14,7 @@ public class NoActionClassVisitor extends ClassVisitor { private int issueCount; public NoActionClassVisitor(Logger logger, boolean ignoreFailures) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); this.logger = logger; this.ignoreFailures = ignoreFailures; } @@ -38,7 +38,7 @@ private class UnusedReturnMethodVisitor extends MethodVisitor { private int lineNumber; public UnusedReturnMethodVisitor() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override diff --git a/src/main/java/com/sedmelluq/discord/jdaction/NoActionPlugin.java b/src/main/java/com/sedmelluq/discord/jdaction/NoActionPlugin.java index e57cfca..20db6d4 100644 --- a/src/main/java/com/sedmelluq/discord/jdaction/NoActionPlugin.java +++ b/src/main/java/com/sedmelluq/discord/jdaction/NoActionPlugin.java @@ -1,9 +1,12 @@ package com.sedmelluq.discord.jdaction; +import java.util.stream.Collectors; import org.gradle.api.Project; import org.gradle.api.Task; +import org.gradle.api.artifacts.Configuration; import org.gradle.api.file.FileCollection; import org.gradle.api.internal.ConventionMapping; +import org.gradle.api.internal.file.UnionFileCollection; import org.gradle.api.plugins.quality.CodeQualityExtension; import org.gradle.api.plugins.quality.internal.AbstractCodeQualityPlugin; import org.gradle.api.tasks.SourceSet; @@ -21,6 +24,11 @@ protected Class getTaskType() { return NoActionVerificationTask.class; } + @Override + protected void configureConfiguration(Configuration configuration) { + + } + @Override protected CodeQualityExtension createExtension() { extension = project.getExtensions().create("jdaction", Extension.class, project); @@ -35,7 +43,9 @@ protected void configureForSourceSet(SourceSet sourceSet, NoActionVerificationTa taskMapping.map("classes", new Callable() { @Override public FileCollection call() { - return project.fileTree(sourceSet.getOutput().getClassesDir()).builtBy(sourceSet.getOutput()); + return new UnionFileCollection(sourceSet.getOutput().getClassesDirs().getFiles().stream() + .map(file -> project.fileTree(file).builtBy(sourceSet.getOutput())) + .collect(Collectors.toList())); } });