Skip to content

Commit

Permalink
Update POM, and trying to fix javadoc errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@smaybius
smaybius committed May 20, 2024
1 parent 16121f1 commit 17d1d93
Show file tree
Hide file tree
Showing 23 changed files with 844 additions and 186 deletions.
10 changes: 5 additions & 5 deletions ShowcaseOneSort.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ runGroup(shuffles.size() + distributions.size()) { // The number of inputs will
} else {
arrayv.arrayManager.setShuffleSingle(shuffle)
}
run CircleHalverSort go 2048.numbers
run PipoSort go 2048.numbers
} else {
arrayv.setUniqueItems(64)
category = "Few Uniques (64)"
arrayv.arrayManager.setShuffleSingle(Shuffles.RANDOM)
run CircleHalverSort go 2048.numbers
run PipoSort go 2048.numbers
category = "Few Uniques (32)"
arrayv.setUniqueItems(32)
arrayv.arrayManager.setShuffleSingle(Shuffles.RANDOM)
run CircleHalverSort go 2048.numbers
run PipoSort go 2048.numbers
category = "Few Uniques (16)"
arrayv.setUniqueItems(16)
arrayv.arrayManager.setShuffleSingle(Shuffles.RANDOM)
run CircleHalverSort go 2048.numbers
run PipoSort go 2048.numbers
arrayv.setUniqueItems(2048)
}

Expand All @@ -43,7 +43,7 @@ runGroup(shuffles.size() + distributions.size()) { // The number of inputs will
} else {
arrayv.arrayManager.setShuffleSingle(distrib)
}
run CircleHalverSort go 2048.numbers
run PipoSort go 2048.numbers
}
if (distrib == Distributions.CUSTOM)
return;
Expand Down
34 changes: 17 additions & 17 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<repositories>
Expand All @@ -40,7 +40,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.171</version>
<version>4.8.172</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
Expand Down Expand Up @@ -78,7 +78,7 @@
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>4.9.9</version>
<version>8.0.2</version>
<executions>
<execution>
<goals>
Expand All @@ -97,7 +97,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifest>
Expand All @@ -109,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -122,7 +122,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<version>3.6.3</version>
<configuration>
<sourceFileIncludes>
<include>io/github/arrayv/groovyapi/**/*.java</include>
Expand All @@ -132,7 +132,7 @@
<include>io/github/arrayv/utils/**/*.java</include>
</sourceFileIncludes>
<links>
<link>https://javadoc.io/doc/io.github.classgraph/classgraph/4.8.139</link>
<link>https://javadoc.io/doc/io.github.classgraph/classgraph/4.8.172</link>
<link>https://docs.groovy-lang.org/4.0.0/html/api</link>
</links>
</configuration>
Expand All @@ -148,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.2</version>
<version>3.5.3</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -161,7 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.2</version>
<version>3.3.1</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
Expand All @@ -185,7 +185,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.3</version>
<version>10.16.0</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -194,39 +194,39 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.2</version>
</plugin>
<!-- see
http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<version>3.2.5</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>3.1.2</version>
</plugin>
<!-- site lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
<version>3.12.1</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
<version>3.5.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
33 changes: 23 additions & 10 deletions src/main/java/io/github/arrayv/groovyapi/ScriptManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
package io.github.arrayv.groovyapi;

import groovy.lang.GroovyShell;
import groovy.lang.Script;
import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.panes.JErrorPane;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.MultipleCompilationErrorsException;
import org.codehaus.groovy.control.customizers.ImportCustomizer;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.*;
import java.util.Collections;
import java.util.EnumMap;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;

import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.MultipleCompilationErrorsException;
import org.codehaus.groovy.control.customizers.ImportCustomizer;

import groovy.lang.GroovyShell;
import groovy.lang.Script;
import io.github.arrayv.main.ArrayVisualizer;
import io.github.arrayv.panes.JErrorPane;

/**
* This class is used to load and run Groovy scripts.
Expand Down Expand Up @@ -210,6 +219,7 @@ private Script handleCompilationFailure(CompilationFailedException e) {
*
* @param path The path of the script
* @return The loaded {@link Script} object
* @throws IOException The file can't be gotten
*/
public Script loadScript(File path) throws IOException {
Script script;
Expand All @@ -227,6 +237,7 @@ public Script loadScript(File path) throws IOException {
*
* @param url The URL of the script
* @return The loaded {@link Script} object
* @throws IOException when the file can't be gotten
*/
public Script loadScript(URL url) throws IOException {
Script script;
Expand Down Expand Up @@ -272,6 +283,8 @@ public ScriptThread runInThread(File path) throws IOException {
* </p>
*
* @throws IllegalStateException When you call this method.
* @throws IOException When a file can't be accessed.
* @return The default script
*/
public Map<String, Script> loadDefaultScripts() throws IOException, IllegalStateException {
if (defaultScripts != null) {
Expand Down
Loading

0 comments on commit 17d1d93

Please sign in to comment.