Commit 9526c64a authored by Stephanie Gawroriski's avatar Stephanie Gawroriski
Browse files

Upgrade Gradle to 7.4.2.

parent bbdeede1
Pipeline #108720 passed with stages
in 5 minutes and 47 seconds
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$PROJECT_DIR$/../.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.24/13a394eed5c4f9efb2a6d956e2086f1d81e857d9/lombok-1.18.24.jar" />
</processorPath>
<module name="squirreljme.buildSrc.main" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel target="11">
<module name="squirreljme.emulators.emulator-runner.main" target="8" />
<module name="squirreljme.emulators.emulator-runner.test" target="8" />
......
......@@ -15,4 +15,8 @@ dependencies
// Jasmin Sable (Java byte code assembler)
implementation "ca.mcgill.sable:jasmin:3.0.2"
// Lombok for simpler getters/setters
implementation 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
}
......@@ -12,9 +12,11 @@ package cc.squirreljme.plugin.multivm;
import java.io.File;
import java.nio.file.Paths;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.DefaultTask;
import org.gradle.api.Project;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Internal;
import org.gradle.jvm.tasks.Jar;
/**
......@@ -27,9 +29,13 @@ public class VMDumpLibraryTask
implements VMExecutableTask
{
/** The source set used. */
@Internal
@Getter
public final String sourceSet;
/** The virtual machine type. */
@Internal
@Getter
public final VMSpecifier vmType;
/**
......@@ -77,14 +83,4 @@ public class VMDumpLibraryTask
// Performs the action of the task
this.doLast(new VMDumpLibraryTaskAction(__sourceSet, __vmType));
}
/**
* {@inheritDoc}
* @since 2021/05/16
*/
@Override
public String getSourceSet()
{
return this.sourceSet;
}
}
......@@ -10,7 +10,9 @@
package cc.squirreljme.plugin.multivm;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.SourceSet;
/**
......@@ -23,9 +25,13 @@ public class VMFullSuite
implements VMExecutableTask
{
/** The source set used. */
@Internal
@Getter
public final String sourceSet;
/** The virtual machine type. */
@Internal
@Getter
public final VMSpecifier vmType;
/**
......@@ -61,14 +67,4 @@ public class VMFullSuite
// Actual running of everything
this.doLast(new VMFullSuiteTaskAction(__vmType));
}
/**
* {@inheritDoc}
* @since 2021/03/08
*/
@Override
public String getSourceSet()
{
return this.sourceSet;
}
}
......@@ -11,9 +11,12 @@ package cc.squirreljme.plugin.multivm;
import java.nio.file.Path;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.DefaultTask;
import org.gradle.api.Project;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.Internal;
import org.gradle.jvm.tasks.Jar;
/**
......@@ -27,9 +30,13 @@ public class VMLibraryTask
implements VMExecutableTask
{
/** The source set used. */
@Internal
@Getter
public final String sourceSet;
/** The virtual machine type. */
@Internal
@Getter
public final VMSpecifier vmType;
/**
......@@ -88,14 +95,4 @@ public class VMLibraryTask
.resolve(this.vmType.outputLibraryName(this.getProject(),
this.sourceSet)));
}
/**
* {@inheritDoc}
* @since 2020/10/17
*/
@Override
public String getSourceSet()
{
return this.sourceSet;
}
}
......@@ -11,8 +11,10 @@ package cc.squirreljme.plugin.multivm;
import java.nio.file.Path;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.DefaultTask;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Internal;
/**
* This task is responsible for compiling a combined ROM, if a VM uses one.
......@@ -24,9 +26,13 @@ public class VMRomTask
implements VMExecutableTask
{
/** The source set used. */
@Internal
@Getter
public final String sourceSet;
/** The virtual machine type. */
@Internal
@Getter
public final VMSpecifier vmType;
/**
......@@ -70,16 +76,6 @@ public class VMRomTask
this.doLast(new VMRomTaskAction(__sourceSet, __vmType));
}
/**
* {@inheritDoc}
* @since 2020/10/17
*/
@Override
public String getSourceSet()
{
return this.sourceSet;
}
/**
* Returns the output path of the archive.
*
......
......@@ -10,7 +10,9 @@
package cc.squirreljme.plugin.multivm;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.Internal;
/**
* Used to run the virtual machine.
......@@ -22,9 +24,13 @@ public class VMRunTask
implements VMExecutableTask
{
/** The source set used. */
@Internal
@Getter
protected final String sourceSet;
/** The virtual machine type. */
@Internal
@Getter
protected final VMSpecifier vmType;
/**
......@@ -65,14 +71,4 @@ public class VMRunTask
// Performs the action of the task
this.doLast(new VMRunTaskAction(__sourceSet, __vmType));
}
/**
* {@inheritDoc}
* @since 2020/08/21
*/
@Override
public String getSourceSet()
{
return this.sourceSet;
}
}
......@@ -12,7 +12,9 @@ package cc.squirreljme.plugin.multivm;
import cc.squirreljme.plugin.util.SimpleJavaExecSpecFiller;
import cc.squirreljme.plugin.util.SingleTaskOutputFile;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.Internal;
import org.gradle.workers.WorkerExecutor;
/**
......@@ -33,9 +35,13 @@ public class VMTestTask
"single.test";
/** The source set used. */
@Internal
@Getter
protected final String sourceSet;
/** The virtual machine type. */
@Internal
@Getter
protected final VMSpecifier vmType;
/**
......@@ -97,14 +103,4 @@ public class VMTestTask
SimpleJavaExecSpecFiller::new, __sourceSet,
__vmType));
}
/**
* {@inheritDoc}
* @since 2020/08/21
*/
@Override
public String getSourceSet()
{
return this.sourceSet;
}
}
......@@ -15,6 +15,7 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.LinkedList;
import javax.inject.Inject;
import lombok.Getter;
import org.gradle.api.Action;
import org.gradle.api.DefaultTask;
import org.gradle.api.Project;
......@@ -23,6 +24,7 @@ import org.gradle.api.file.DirectoryTree;
import org.gradle.api.file.FileCollection;
import org.gradle.api.file.FileCopyDetails;
import org.gradle.api.plugins.JavaPluginConvention;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.SourceSetOutput;
import org.gradle.language.jvm.tasks.ProcessResources;
......@@ -35,12 +37,18 @@ public abstract class AbstractResourceTask
extends DefaultTask
{
/** The file extension. */
@Internal
@Getter
protected final String extension;
/** The source set to modify. */
@Internal
@Getter
protected final String sourceSet;
/** The output extension. */
@Internal
@Getter
protected final String outputExtension;
/**
......
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment