From 03a15433ffe6f443ea3bdbf16f7614b829b24c40 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sat, 11 Jan 2025 12:08:10 -0500 Subject: [PATCH] Updated version to 2.2.0. Updated versions for RIFE2 project creation. Updated RIFE2/core. --- .idea/libraries/bld.xml | 4 +-- README.md | 24 ++++++++---------- core | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes lib/bld/bld-wrapper.properties | 8 +++--- .../bld/blueprints/Rife2ProjectBlueprint.java | 4 +-- src/main/resources/BLD_VERSION | 2 +- .../operations/TestCreateRife2Operation.java | 22 ++++++++-------- .../bld/operations/TestUberJarOperation.java | 2 +- 9 files changed, 32 insertions(+), 36 deletions(-) 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 95eb72200cae1b082387f08442d9e2da0328717c..332ca55b29574ddadb055653e3084d6fe1a718ae 100644 GIT binary patch delta 203 zcmaFymhr_~M!o=VW)=|!4h{~6b&=Xp6ZvXcK=j6b6B{sNa-Y4%=Jz(UnZUfwefC{Y zmW&gd9z;y7;2a}_^`p=LB0E{9L{8qnshM0T=HiJZz6V+Mu*Z+4E0MUkQG3=9mcKpf!B$Rxsmuy1l+ qi4(-0EhQdc#-!3Hello World My-app

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

Hello World my-app

")); } finally { FileUtils.deleteDirectory(tmp); } @@ -506,8 +506,8 @@ void testExecuteLocalDependencies() /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 @@ void testExecuteLocalDependencies() 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 @@ void testExecuteLocalDependenciesFolders() /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 @@ void testExecuteLocalDependenciesFolders() 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 @@ void testFromProjectWeb() 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); }