Skip to content

Commit

Permalink
Release new version
Browse files Browse the repository at this point in the history
  • Loading branch information
bowbahdoe committed May 26, 2024
1 parent 99690cd commit ccf1fb6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion JRESOLVE_RELEASED_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.05.10
2024.05.26
2 changes: 1 addition & 1 deletion JRESOLVE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.05.10
2024.05.26
8 changes: 4 additions & 4 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ make_reflect_config:
./mvnw -Ppicocli-codegen dependency:copy-dependencies
./mvnw package
java \
--class-path target/dependency/picocli-codegen-4.7.5.jar:target/jresolve-cli-2024.05.10.jar:target/dependency/json-2023.12.23.jar:target/dependency/picocli-4.7.5.jar:target/dependency/purl-2023.11.07.jar:target/dependency/resolve-2024.04.21.jar \
--class-path target/dependency/picocli-codegen-4.7.5.jar:target/jresolve-cli-2024.05.26.jar:target/dependency/json-2023.12.23.jar:target/dependency/picocli-4.7.5.jar:target/dependency/purl-2023.11.07.jar:target/dependency/resolve-2024.05.26.jar \
picocli.codegen.aot.graalvm.ReflectionConfigGenerator \
dev.mccue.resolve.cli.CliMain > reflect.json

Expand All @@ -17,17 +17,17 @@ exe static='':
./mvnw dependency:copy-dependencies
./mvnw package
native-image \
--module-path target/dependency/json-2023.12.23.jar:target/dependency/picocli-4.7.5.jar:target/dependency/purl-2023.11.07.jar:target/dependency/resolve-2024.04.21.jar \
--module-path target/dependency/json-2023.12.23.jar:target/dependency/picocli-4.7.5.jar:target/dependency/purl-2023.11.07.jar:target/dependency/resolve-2024.05.26.jar \
-H:+UnlockExperimentalVMOptions -H:ReflectionConfigurationFiles=reflect.json -H:+ReportUnsupportedElementsAtRuntime \
-jar target/jresolve-cli-2024.05.10.jar \
-jar target/jresolve-cli-2024.05.26.jar \
{{static}} jresolve

exe_windows:
./mvnw clean
./mvnw compile
./mvnw dependency:copy-dependencies
./mvnw package
native-image.cmd --module-path "target\dependency\json-2023.12.23.jar;target\dependency\picocli-4.7.5.jar;target\dependency\purl-2023.11.07.jar;target\dependency\resolve-2024.04.21.jar" -H:+UnlockExperimentalVMOptions -H:ReflectionConfigurationFiles=reflect.json -H:+ReportUnsupportedElementsAtRuntime -jar "target\jresolve-cli-2024.05.10.jar" jresolve
native-image.cmd --module-path "target\dependency\json-2023.12.23.jar;target\dependency\picocli-4.7.5.jar;target\dependency\purl-2023.11.07.jar;target\dependency\resolve-2024.05.26.jar" -H:+UnlockExperimentalVMOptions -H:ReflectionConfigurationFiles=reflect.json -H:+ReportUnsupportedElementsAtRuntime -jar "target\jresolve-cli-2024.05.26.jar" jresolve

release:
./mvnw clean
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>dev.mccue</groupId>
<artifactId>jresolve-cli</artifactId>
<version>2024.05.10</version>
<version>2024.05.26</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>dev.mccue</groupId>
<artifactId>resolve</artifactId>
<version>2024.04.21</version>
<version>2024.05.26</version>
</dependency>
<dependency>
<groupId>dev.mccue</groupId>
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/dev/mccue/resolve/cli/CliMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ public CliMain(PrintWriter out, PrintWriter err) {
)
public File outputDirectory = null;

@CommandLine.Option(
names = {"--resolution-file"},
description = "File to save resolutions in to."
)
public File resolutionFile = null;

@CommandLine.Option(
names = {"--select"},
description = "Selects dependencies from the given resolution file."
)
public boolean select = false;

/*
@CommandLine.Option(
names = {"--output-format"},
Expand Down Expand Up @@ -222,6 +234,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
}

var dependencies = new ArrayList<Dependency>();

for (var packageUrl : packageUrls) {
var group = new Group(String.join(".", Objects.requireNonNull(packageUrl.getNamespace(), "Package url must have a namespace")));
var artifact = new Artifact(packageUrl.getName());
Expand Down

0 comments on commit ccf1fb6

Please sign in to comment.