diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 8105a64..63c014a 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/README.md b/README.md index 8d4619b..86c7ca2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![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) -[![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) [![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/) @@ -48,33 +48,29 @@ import java.util.List; import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Scope.*; -public class MyappBuild extends Project { - public MyappBuild() { +public class MyAppBuild extends Project { + public MyAppBuild() { pkg = "com.example"; - name = "Myapp"; - mainClass = "com.example.MyappMain"; + name = "my-app"; + mainClass = "com.example.MyApp"; version = version(0,1,0); downloadSources = true; repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(test) - .include(dependency("org.junit.jupiter", - "junit-jupiter", - version(5,11,0))) - .include(dependency("org.junit.platform", - "junit-platform-console-standalone", - version(1,11,0))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,4))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,4))); } public static void main(String[] args) { - new MyappBuild().start(args); + new MyAppBuild().start(args); } } ``` > **NOTE:** `bld` supports different ways to describe dependencies, -> `dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0))` can for instance also -> be written as `dependency("org.junit.jupiter:junit-jupiter:5.11.0")`. Which format you use, +> `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.4")`. Which format you use, > is a matter of personal taste. # Where does `bld` fit? diff --git a/core b/core index bbf33d8..f8bde83 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bbf33d8ef07f58fb0f3e234573d412ac3a8293c3 +Subproject commit f8bde83ca806403dd8f37294239ac77dba8ad010 diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 95eb722..332ca55 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 9e3fead..322e315 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,11 +1,11 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.0 -bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.0 -bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.0 +bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.4.1 +bld.extension-archive=com.uwyn.rife2:bld-archive:0.6.1 +bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.6.1 bld.javaOptions= bld.javacOptions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.sourceDirectories=core/src/bld/java -bld.version=2.1.0 \ No newline at end of file +bld.version=2.2.0 \ No newline at end of file diff --git a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java index da7dafb..92845de 100644 --- a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java @@ -39,9 +39,9 @@ public class Rife2ProjectBlueprint extends WebProject { downloadSources = true; repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1,9,0))); + .include(dependency("com.uwyn.rife2", "rife2", version(1,9,1))); 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.platform", "junit-platform-console-standalone", version(1,11,4))); scope(standalone) diff --git a/src/main/resources/BLD_VERSION b/src/main/resources/BLD_VERSION index c93ab31..e3a4f19 100644 --- a/src/main/resources/BLD_VERSION +++ b/src/main/resources/BLD_VERSION @@ -1 +1 @@ -2.2.0-SNAPSHOT \ No newline at end of file +2.2.0 \ No newline at end of file diff --git a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java index f5f26e0..074865c 100644 --- a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java +++ b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java @@ -133,8 +133,8 @@ public class TestCreateRife2Operation { /my-app/lib/test /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/jsoup-1\\.18\\.1-sources\\.jar - /my-app/lib/test/jsoup-1\\.18\\.1\\.jar + /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.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\\.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/apiguardian-api-1\\.1\\.2-sources\\.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\\.1\\.jar + /my-app/lib/test/jsoup-1\\.18\\.3-sources\\.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\\.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); Thread.sleep(2000); - assertTrue(check_result.toString().contains("

Hello World My-app

")); + assertTrue(check_result.toString().contains("

Hello World my-app

")); } finally { 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-util-12\\.0\\.16-sources\\.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\\.1\\.jar + /my-app/lib/local/jsoup-1\\.18\\.3-sources\\.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\\.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); Thread.sleep(2000); - assertTrue(check_result.toString().contains("

Hello World My-app

"), check_result.toString()); + assertTrue(check_result.toString().contains("

Hello World my-app

"), check_result.toString()); } finally { FileUtils.deleteDirectory(tmp); } @@ -688,8 +688,8 @@ public class TestCreateRife2Operation { /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\\.jar - /my-app/lib/local_test/jsoup-1\\.18\\.1-sources\\.jar - /my-app/lib/local_test/jsoup-1\\.18\\.1\\.jar + /my-app/lib/local_test/jsoup-1\\.18\\.3-sources\\.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\\.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); Thread.sleep(2000); - assertTrue(check_result.toString().contains("

Hello World My-app

")); + assertTrue(check_result.toString().contains("

Hello World my-app

")); } finally { FileUtils.deleteDirectory(tmp); } diff --git a/src/test/java/rife/bld/operations/TestUberJarOperation.java b/src/test/java/rife/bld/operations/TestUberJarOperation.java index 41429a2..0638021 100644 --- a/src/test/java/rife/bld/operations/TestUberJarOperation.java +++ b/src/test/java/rife/bld/operations/TestUberJarOperation.java @@ -174,7 +174,7 @@ public class TestUberJarOperation { assertThrows(ExitStatusException.class, run_operation::execute); Thread.sleep(2000); - assertTrue(check_result.toString().contains("

Hello World App

")); + assertTrue(check_result.toString().contains("

Hello World app

")); } finally { FileUtils.deleteDirectory(tmp); }