rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-26 00:37:10 -07:00
Code Activity

Updated version to 2.2.0.

Browse source 
Updated versions for RIFE2 project creation.
Updated RIFE2/core.
This commit is contained in:
Geert Bevin 2025-01-11 12:08:10 -05:00
parent 625055bbb6
commit 03a15433ff
9 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.idea/libraries/bld.xml generated
View file

@ -2,12 +2,12 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

24
README.md
View file

@ -1,6 +1,6 @@
[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
[![Release](https://img.shields.io/github/release/rife2/bld.svg)](https://github.com/rife2/bld/releases/latest) [![Release](https://img.shields.io/github/release/rife2/bld.svg)](https://github.com/rife2/bld/releases/latest)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld/badge.svg?color=blue)](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld/badge.svg?color=blue)](https://maven-badges.herokuapp.com/maven-central/com.uwyn.rife2/bld)
[![Nexus Snapshot](https://img.shields.io/nexus/s/com.uwyn.rife2/bld?server=https%3A%2F%2Fs01.oss.sonatype.org%2F)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/bld/) [![Nexus Snapshot](https://img.shields.io/nexus/s/com.uwyn.rife2/bld?server=https%3A%2F%2Fs01.oss.sonatype.org%2F)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/bld/)
@ -48,33 +48,29 @@ import java.util.List;
import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Repository.*;
import static rife.bld.dependencies.Scope.*; import static rife.bld.dependencies.Scope.*;
public class MyappBuild extends Project { public class MyAppBuild extends Project {
public MyappBuild() { public MyAppBuild() {
pkg = "com.example"; pkg = "com.example";
name = "Myapp"; name = "my-app";
mainClass = "com.example.MyappMain"; mainClass = "com.example.MyApp";
version = version(0,1,0); version = version(0,1,0);
downloadSources = true; downloadSources = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
scope(test) scope(test)
.include(dependency("org.junit.jupiter", .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4)))
"junit-jupiter", .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4)));
version(5,11,0)))
.include(dependency("org.junit.platform",
"junit-platform-console-standalone",
version(1,11,0)));
} }
public static void main(String[] args) { public static void main(String[] args) {
new MyappBuild().start(args); new MyAppBuild().start(args);
} }
} }
``` ```
> **NOTE:** `bld` supports different ways to describe dependencies, > **NOTE:** `bld` supports different ways to describe dependencies,
> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0))` can for instance also > `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))` can for instance also
> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.0")`. Which format you use, > be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.4")`. Which format you use,
> is a matter of personal taste. > is a matter of personal taste.
# Where does `bld` fit? # Where does `bld` fit?

2
core

@ -1 +1 @@
Subproject commit bbf33d8ef07f58fb0f3e234573d412ac3a8293c3 Subproject commit f8bde83ca806403dd8f37294239ac77dba8ad010

BIN
lib/bld/bld-wrapper.jar
View file

Binary file not shown.

8
lib/bld/bld-wrapper.properties
View file

@ -1,11 +1,11 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.0 bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.1
bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.0 bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.1
bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.0 bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.1
bld.javaOptions= bld.javaOptions=
bld.javacOptions= bld.javacOptions=
bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
bld.sourceDirectories=core/src/bld/java bld.sourceDirectories=core/src/bld/java
bld.version=2.1.0 bld.version=2.2.0

4
src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java
View file

@ -39,9 +39,9 @@ public class Rife2ProjectBlueprint extends WebProject {
downloadSources = true; downloadSources = true;
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "rife2", version(1,9,0))); .include(dependency("com.uwyn.rife2", "rife2", version(1,9,1)));
scope(test) scope(test)
.include(dependency("org.jsoup", "jsoup", version(1,18,1))) .include(dependency("org.jsoup", "jsoup", version(1,18,3)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4))); .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4)));
scope(standalone) scope(standalone)

2
src/main/resources/BLD_VERSION
View file

@ -1 +1 @@
2.2.0-SNAPSHOT 2.2.0

22
src/test/java/rife/bld/operations/TestCreateRife2Operation.java
View file

@ -133,8 +133,8 @@ public class TestCreateRife2Operation {
/my-app/lib/test /my-app/lib/test
/my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
/my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar
/my-app/lib/test/jsoup-1\\.18\\.1-sources\\.jar /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar
/my-app/lib/test/jsoup-1\\.18\\.1\\.jar /my-app/lib/test/jsoup-1\\.18\\.3\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@ -252,8 +252,8 @@ public class TestCreateRife2Operation {
/my-app/lib/test /my-app/lib/test
/my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
/my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar /my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar
/my-app/lib/test/jsoup-1\\.18\\.1-sources\\.jar /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar
/my-app/lib/test/jsoup-1\\.18\\.1\\.jar /my-app/lib/test/jsoup-1\\.18\\.3\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar /my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar
/my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar /my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar /my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@ -314,7 +314,7 @@ public class TestCreateRife2Operation {
assertThrows(ExitStatusException.class, run_operation::execute); assertThrows(ExitStatusException.class, run_operation::execute);
Thread.sleep(2000); Thread.sleep(2000);
assertTrue(check_result.toString().contains("<p>Hello World My-app</p>")); assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"));
} finally { } finally {
FileUtils.deleteDirectory(tmp); FileUtils.deleteDirectory(tmp);
} }
@ -506,8 +506,8 @@ public class TestCreateRife2Operation {
/my-app/lib/local/jetty-session-12\\.0\\.16\\.jar /my-app/lib/local/jetty-session-12\\.0\\.16\\.jar
/my-app/lib/local/jetty-util-12\\.0\\.16-sources\\.jar /my-app/lib/local/jetty-util-12\\.0\\.16-sources\\.jar
/my-app/lib/local/jetty-util-12\\.0\\.16\\.jar /my-app/lib/local/jetty-util-12\\.0\\.16\\.jar
/my-app/lib/local/jsoup-1\\.18\\.1-sources\\.jar /my-app/lib/local/jsoup-1\\.18\\.3-sources\\.jar
/my-app/lib/local/jsoup-1\\.18\\.1\\.jar /my-app/lib/local/jsoup-1\\.18\\.3\\.jar
/my-app/lib/local/junit-jupiter-5\\.11\\.4-sources\\.jar /my-app/lib/local/junit-jupiter-5\\.11\\.4-sources\\.jar
/my-app/lib/local/junit-jupiter-5\\.11\\.4\\.jar /my-app/lib/local/junit-jupiter-5\\.11\\.4\\.jar
/my-app/lib/local/junit-jupiter-api-5\\.11\\.4-sources\\.jar /my-app/lib/local/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@ -581,7 +581,7 @@ public class TestCreateRife2Operation {
assertThrows(ExitStatusException.class, run_operation::execute); assertThrows(ExitStatusException.class, run_operation::execute);
Thread.sleep(2000); Thread.sleep(2000);
assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"), check_result.toString()); assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"), check_result.toString());
} finally { } finally {
FileUtils.deleteDirectory(tmp); FileUtils.deleteDirectory(tmp);
} }
@ -688,8 +688,8 @@ public class TestCreateRife2Operation {
/my-app/lib/local_test /my-app/lib/local_test
/my-app/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar /my-app/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar
/my-app/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar /my-app/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar
/my-app/lib/local_test/jsoup-1\\.18\\.1-sources\\.jar /my-app/lib/local_test/jsoup-1\\.18\\.3-sources\\.jar
/my-app/lib/local_test/jsoup-1\\.18\\.1\\.jar /my-app/lib/local_test/jsoup-1\\.18\\.3\\.jar
/my-app/lib/local_test/junit-jupiter-5\\.11\\.4-sources\\.jar /my-app/lib/local_test/junit-jupiter-5\\.11\\.4-sources\\.jar
/my-app/lib/local_test/junit-jupiter-5\\.11\\.4\\.jar /my-app/lib/local_test/junit-jupiter-5\\.11\\.4\\.jar
/my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4-sources\\.jar /my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@ -757,7 +757,7 @@ public class TestCreateRife2Operation {
assertThrows(ExitStatusException.class, run_operation::execute); assertThrows(ExitStatusException.class, run_operation::execute);
Thread.sleep(2000); Thread.sleep(2000);
assertTrue(check_result.toString().contains("<p>Hello World My-app</p>")); assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"));
} finally { } finally {
FileUtils.deleteDirectory(tmp); FileUtils.deleteDirectory(tmp);
} }

2
src/test/java/rife/bld/operations/TestUberJarOperation.java
View file

@ -174,7 +174,7 @@ public class TestUberJarOperation {
assertThrows(ExitStatusException.class, run_operation::execute); assertThrows(ExitStatusException.class, run_operation::execute);
Thread.sleep(2000); Thread.sleep(2000);
assertTrue(check_result.toString().contains("<p>Hello World App</p>")); assertTrue(check_result.toString().contains("<p>Hello World app</p>"));
} finally { } finally {
FileUtils.deleteDirectory(tmp); FileUtils.deleteDirectory(tmp);
} }