Skip to content

Commit 03a1543

Browse files
gbevingbevin
committed
Updated version to 2.2.0.
Updated versions for RIFE2 project creation. Updated RIFE2/core.
1 parent 625055b commit 03a1543

File tree

9 files changed

+32
-36
lines changed

9 files changed

+32
-36
lines changed

‎.idea/libraries/bld.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
22
[![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
3-
[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
3+
[![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
44
[![Release](https://img.shields.io/github/release/rife2/bld.svg)](https://github.com/rife2/bld/releases/latest)
55
[![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)
66
[![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;
4848
import static rife.bld.dependencies.Repository.*;
4949
import static rife.bld.dependencies.Scope.*;
5050

51-
public class MyappBuild extends Project {
52-
public MyappBuild() {
51+
public class MyAppBuild extends Project {
52+
public MyAppBuild() {
5353
pkg = "com.example";
54-
name = "Myapp";
55-
mainClass = "com.example.MyappMain";
54+
name = "my-app";
55+
mainClass = "com.example.MyApp";
5656
version = version(0,1,0);
5757

5858
downloadSources = true;
5959
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
6060
scope(test)
61-
.include(dependency("org.junit.jupiter",
62-
"junit-jupiter",
63-
version(5,11,0)))
64-
.include(dependency("org.junit.platform",
65-
"junit-platform-console-standalone",
66-
version(1,11,0)));
61+
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4)))
62+
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4)));
6763
}
6864

6965
public static void main(String[] args) {
70-
new MyappBuild().start(args);
66+
new MyAppBuild().start(args);
7167
}
7268
}
7369
```
7470

7571
> **NOTE:** `bld` supports different ways to describe dependencies,
76-
> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0))` can for instance also
77-
> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.0")`. Which format you use,
72+
> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))` can for instance also
73+
> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.4")`. Which format you use,
7874
> is a matter of personal taste.
7975
8076
# Where does `bld` fit?

‎core

‎lib/bld/bld-wrapper.jar

0 Bytes
Binary file not shown.

‎lib/bld/bld-wrapper.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
bld.downloadExtensionJavadoc=false
22
bld.downloadExtensionSources=true
33
bld.downloadLocation=
4-
bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.0
5-
bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.0
6-
bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.0
4+
bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.1
5+
bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.1
6+
bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.1
77
bld.javaOptions=
88
bld.javacOptions=
99
bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
1010
bld.sourceDirectories=core/src/bld/java
11-
bld.version=2.1.0
11+
bld.version=2.2.0

‎src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public Rife2ProjectBlueprint(File work, String packageName, String projectName,
3939
downloadSources = true;
4040
repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
4141
scope(compile)
42-
.include(dependency("com.uwyn.rife2", "rife2", version(1,9,0)));
42+
.include(dependency("com.uwyn.rife2", "rife2", version(1,9,1)));
4343
scope(test)
44-
.include(dependency("org.jsoup", "jsoup", version(1,18,1)))
44+
.include(dependency("org.jsoup", "jsoup", version(1,18,3)))
4545
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4)))
4646
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4)));
4747
scope(standalone)

‎src/main/resources/BLD_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0-SNAPSHOT
1+
2.2.0

‎src/test/java/rife/bld/operations/TestCreateRife2Operation.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ void testExecute()
133133
/my-app/lib/test
134134
/my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
135135
/my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar
136-
/my-app/lib/test/jsoup-1\\.18\\.1-sources\\.jar
137-
/my-app/lib/test/jsoup-1\\.18\\.1\\.jar
136+
/my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar
137+
/my-app/lib/test/jsoup-1\\.18\\.3\\.jar
138138
/my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar
139139
/my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar
140140
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -252,8 +252,8 @@ void testExecute()
252252
/my-app/lib/test
253253
/my-app/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
254254
/my-app/lib/test/apiguardian-api-1\\.1\\.2\\.jar
255-
/my-app/lib/test/jsoup-1\\.18\\.1-sources\\.jar
256-
/my-app/lib/test/jsoup-1\\.18\\.1\\.jar
255+
/my-app/lib/test/jsoup-1\\.18\\.3-sources\\.jar
256+
/my-app/lib/test/jsoup-1\\.18\\.3\\.jar
257257
/my-app/lib/test/junit-jupiter-5\\.11\\.4-sources\\.jar
258258
/my-app/lib/test/junit-jupiter-5\\.11\\.4\\.jar
259259
/my-app/lib/test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -314,7 +314,7 @@ void testExecute()
314314
assertThrows(ExitStatusException.class, run_operation::execute);
315315
Thread.sleep(2000);
316316

317-
assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"));
317+
assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"));
318318
} finally {
319319
FileUtils.deleteDirectory(tmp);
320320
}
@@ -506,8 +506,8 @@ void testExecuteLocalDependencies()
506506
/my-app/lib/local/jetty-session-12\\.0\\.16\\.jar
507507
/my-app/lib/local/jetty-util-12\\.0\\.16-sources\\.jar
508508
/my-app/lib/local/jetty-util-12\\.0\\.16\\.jar
509-
/my-app/lib/local/jsoup-1\\.18\\.1-sources\\.jar
510-
/my-app/lib/local/jsoup-1\\.18\\.1\\.jar
509+
/my-app/lib/local/jsoup-1\\.18\\.3-sources\\.jar
510+
/my-app/lib/local/jsoup-1\\.18\\.3\\.jar
511511
/my-app/lib/local/junit-jupiter-5\\.11\\.4-sources\\.jar
512512
/my-app/lib/local/junit-jupiter-5\\.11\\.4\\.jar
513513
/my-app/lib/local/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -581,7 +581,7 @@ void testExecuteLocalDependencies()
581581
assertThrows(ExitStatusException.class, run_operation::execute);
582582
Thread.sleep(2000);
583583

584-
assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"), check_result.toString());
584+
assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"), check_result.toString());
585585
} finally {
586586
FileUtils.deleteDirectory(tmp);
587587
}
@@ -688,8 +688,8 @@ void testExecuteLocalDependenciesFolders()
688688
/my-app/lib/local_test
689689
/my-app/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar
690690
/my-app/lib/local_test/apiguardian-api-1\\.1\\.2\\.jar
691-
/my-app/lib/local_test/jsoup-1\\.18\\.1-sources\\.jar
692-
/my-app/lib/local_test/jsoup-1\\.18\\.1\\.jar
691+
/my-app/lib/local_test/jsoup-1\\.18\\.3-sources\\.jar
692+
/my-app/lib/local_test/jsoup-1\\.18\\.3\\.jar
693693
/my-app/lib/local_test/junit-jupiter-5\\.11\\.4-sources\\.jar
694694
/my-app/lib/local_test/junit-jupiter-5\\.11\\.4\\.jar
695695
/my-app/lib/local_test/junit-jupiter-api-5\\.11\\.4-sources\\.jar
@@ -757,7 +757,7 @@ void testExecuteLocalDependenciesFolders()
757757
assertThrows(ExitStatusException.class, run_operation::execute);
758758
Thread.sleep(2000);
759759

760-
assertTrue(check_result.toString().contains("<p>Hello World My-app</p>"));
760+
assertTrue(check_result.toString().contains("<p>Hello World my-app</p>"));
761761
} finally {
762762
FileUtils.deleteDirectory(tmp);
763763
}

‎src/test/java/rife/bld/operations/TestUberJarOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void testFromProjectWeb()
174174
assertThrows(ExitStatusException.class, run_operation::execute);
175175
Thread.sleep(2000);
176176

177-
assertTrue(check_result.toString().contains("<p>Hello World App</p>"));
177+
assertTrue(check_result.toString().contains("<p>Hello World app</p>"));
178178
} finally {
179179
FileUtils.deleteDirectory(tmp);
180180
}

0 commit comments

Comments
 (0)