Skip to content

Commit

Permalink
Bumped to bld version 2.0.0-SUPPORT
Browse files Browse the repository at this point in the history
  • Loading branch information
ethauvin committed Jul 23, 2024
1 parent efce6b9 commit dd1786c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 15 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/bld.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@ jobs:
distribution: "zulu"
java-version: ${{ matrix.java-version }}

- name: Grant execute permission for bld
run: chmod +x bld

- name: Download the dependencies
- name: Download dependencies
run: ./bld download

- name: Run tests with bld
- name: Run tests
run: ./bld compile test
4 changes: 2 additions & 2 deletions .idea/libraries/bld.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-1.9.1.jar",
"${HOME}/.bld/dist/bld-2.0.0-SNAPSHOT.jar",
"lib/**/*.jar"
]
}
Binary file modified lib/bld/bld-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/bld/bld-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.version=1.9.1
bld.version=2.0.0-SNAPSHOT
11 changes: 5 additions & 6 deletions src/bld/java/rife/bld/extension/PmdOperationBuild.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,33 @@

import java.util.List;

import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
import static rife.bld.dependencies.Repository.*;
import static rife.bld.dependencies.Scope.*;
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;

public class PmdOperationBuild extends Project {
public PmdOperationBuild() {
pkg = "rife.bld.extension";
name = "bld-pmd";
version = version(1, 1, 2);
version = version(1, 1, 3, "SNAPSHOT");

javaRelease = 17;

downloadSources = true;
autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);

var pmd = version(7, 3, 0);
scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1)))
.include(dependency("com.uwyn.rife2", "bld", version(2, 0, 0, "SNAPSHOT")))
.include(dependency("net.sourceforge.pmd", "pmd-java", pmd));
scope(runtime)
.include(dependency("net.sourceforge.pmd", "pmd-java", pmd))
.include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 13)));
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3)))
.include(dependency("org.assertj", "assertj-core", version(3, 26, 0)));
.include(dependency("org.assertj", "assertj-core", version(3, 26, 3)));

javadocOperation()
.javadocOptions()
Expand Down

0 comments on commit dd1786c

Please sign in to comment.