Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle 4.10 #4

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,14 @@ natives/samplerate/src
natives/vorbis/*/
udpqueue-natives/dist

*.log
*.log

# Windows
Thumbs.db
desktop.ini

# OS X
.DS_Store
.Spotlight-V100
.Trashes
._*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
```

Expand Down
23 changes: 7 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
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()
}

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 {
Expand Down Expand Up @@ -68,4 +59,4 @@ pluginBundle {
artifactId = moduleName
version = project.version
}
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions gradlew
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 " "
}
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rootProject.name = 'jdaction'

Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -38,7 +38,7 @@ private class UnusedReturnMethodVisitor extends MethodVisitor {
private int lineNumber;

public UnusedReturnMethodVisitor() {
super(Opcodes.ASM5);
super(Opcodes.ASM6);
}

@Override
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/com/sedmelluq/discord/jdaction/NoActionPlugin.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -21,6 +24,11 @@ protected Class<NoActionVerificationTask> getTaskType() {
return NoActionVerificationTask.class;
}

@Override
protected void configureConfiguration(Configuration configuration) {

}

@Override
protected CodeQualityExtension createExtension() {
extension = project.getExtensions().create("jdaction", Extension.class, project);
Expand All @@ -35,7 +43,9 @@ protected void configureForSourceSet(SourceSet sourceSet, NoActionVerificationTa
taskMapping.map("classes", new Callable<FileCollection>() {
@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()));
}
});

Expand Down