Compare commits

...

3 commits

Author SHA1 Message Date
6cb78a9e91
Added soft assertions 2024-10-27 16:10:11 -07:00
41e5467196
Updated dependencies
Bumped JUnit version to 5.11.3
Bumped PMD extension version to 1.1.7
Bumped JDK to version 23 (GitHub CI Workflow)
2024-10-27 16:09:33 -07:00
248d2c3362
Added GitHub repository 2024-10-27 16:05:54 -07:00
6 changed files with 37 additions and 34 deletions

View file

@ -11,8 +11,8 @@ jobs:
strategy: strategy:
matrix: matrix:
java-version: [17, 21, 22] java-version: [17, 21, 23]
kotlin-version: [ 1.19.24, 2.0.0 ] kotlin-version: [1.9.24, 2.0.21]
steps: steps:
- name: Checkout source repository - name: Checkout source repository

View file

@ -7,9 +7,9 @@
<!-- BEST PRACTICES --> <!-- BEST PRACTICES -->
<rule ref="category/java/bestpractices.xml"> <rule ref="category/java/bestpractices.xml">
<exclude name="AvoidPrintStackTrace"/> <exclude name="AvoidPrintStackTrace"/>
<exclude name="JUnit4TestShouldUseTestAnnotation"/>
<exclude name="JUnitTestContainsTooManyAsserts"/>
<exclude name="GuardLogStatement"/> <exclude name="GuardLogStatement"/>
<exclude name="UnitTestContainsTooManyAsserts"/>
<exclude name="UnitTestShouldUseTestAnnotation"/>
</rule> </rule>
<rule ref="category/java/bestpractices.xml/MissingOverride"> <rule ref="category/java/bestpractices.xml/MissingOverride">

View file

@ -27,8 +27,8 @@ public class SampleBuild extends Project {
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
scope(test) scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))); .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3)));
} }
public static void main(String[] args) { public static void main(String[] args) {

View file

@ -1,6 +1,6 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5 bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.7
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.version=2.1.0 bld.version=2.1.0

View file

@ -46,8 +46,8 @@ public class GeneratedVersionOperationBuild extends Project {
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))); .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0)));
scope(test) scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3)))
.include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); .include(dependency("org.assertj", "assertj-core", version(3, 26, 3)));
precompileOperation() precompileOperation()
@ -63,28 +63,26 @@ public class GeneratedVersionOperationBuild extends Project {
publishOperation() publishOperation()
.repositories(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) .repositories(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
.repository(repository("github"))
.info() .info()
.groupId("com.uwyn.rife2") .groupId("com.uwyn.rife2")
.artifactId("bld-generated-version") .artifactId("bld-generated-version")
.description("bld Extension to Generate Project Version Data") .description("bld Extension to Generate Project Version Data")
.url("https://github.com/rife2/generated-version") .url("https://github.com/rife2/generated-version")
.developer( .developer(new PublishDeveloper()
new PublishDeveloper() .id("ethauvin")
.id("ethauvin") .name("Erik C. Thauvin")
.name("Erik C. Thauvin") .email("erik@thauvin.net")
.email("erik@thauvin.net") .url("https://erik.thauvin.net/")
.url("https://erik.thauvin.net/")
) )
.license( .license(new PublishLicense()
new PublishLicense() .name("The Apache License, Version 2.0")
.name("The Apache License, Version 2.0") .url("https://www.apache.org/licenses/LICENSE-2.0.txt")
.url("https://www.apache.org/licenses/LICENSE-2.0.txt")
) )
.scm( .scm(new PublishScm()
new PublishScm() .connection("scm:git:https://github.com/rife2/generated-version.git")
.connection("scm:git:https://github.com/rife2/generated-version.git") .developerConnection("scm:git:git@github.com:rife2/generated-version.git")
.developerConnection("scm:git:git@github.com:rife2/generated-version.git") .url("https://github.com/rife2/generated-version")
.url("https://github.com/rife2/generated-version")
) )
.signKey(property("sign.key")) .signKey(property("sign.key"))
.signPassphrase(property("sign.passphrase")); .signPassphrase(property("sign.passphrase"));

View file

@ -16,6 +16,7 @@
package rife.bld.extension; package rife.bld.extension;
import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import rife.bld.BaseProject; import rife.bld.BaseProject;
@ -116,9 +117,11 @@ class GeneratedVersionTest {
var t = gv.buildTemplate(); var t = gv.buildTemplate();
assertThat(t).isNotNull(); assertThat(t).isNotNull();
assertThat(gv.getProject()).isEqualTo(PROJECT); try (var softly = new AutoCloseableSoftAssertions()) {
assertThat(gv.getPackageName()).isEqualTo(PROJECT.pkg()); softly.assertThat(gv.getProject()).isEqualTo(PROJECT);
assertThat(gv.getProjectName()).isEqualTo(PROJECT.name()); softly.assertThat(gv.getPackageName()).isEqualTo(PROJECT.pkg());
softly.assertThat(gv.getProjectName()).isEqualTo(PROJECT.name());
}
assertThat(t.getContent()).contains("package com.example;").contains("class GeneratedVersion") assertThat(t.getContent()).contains("package com.example;").contains("class GeneratedVersion")
.contains("PROJECT = \"MyExample\";").contains("MAJOR = 2").contains("MINOR = 1") .contains("PROJECT = \"MyExample\";").contains("MAJOR = 2").contains("MINOR = 1")
@ -201,13 +204,15 @@ class GeneratedVersionTest {
gv.setDirectory(new File("build")); gv.setDirectory(new File("build"));
gv.setExtension(".java"); gv.setExtension(".java");
assertThat(gv.getProject()).as("project").isEqualTo(PROJECT); try (var softly = new AutoCloseableSoftAssertions()) {
assertThat(gv.getTemplate()).as("template").exists(); softly.assertThat(gv.getProject()).as("project").isEqualTo(PROJECT);
assertThat(gv.getPackageName()).as("package name").isEqualTo("com.example.cool"); softly.assertThat(gv.getTemplate()).as("template").exists();
assertThat(gv.getProjectName()).as("project name").isEqualTo("Cool App"); softly.assertThat(gv.getPackageName()).as("package name").isEqualTo("com.example.cool");
assertThat(gv.getClassName()).as("class name").isEqualTo("CoolVersion"); softly.assertThat(gv.getProjectName()).as("project name").isEqualTo("Cool App");
assertThat(gv.getExtension()).as("extension").isEqualTo(".java"); softly.assertThat(gv.getClassName()).as("class name").isEqualTo("CoolVersion");
assertThat(gv.getDirectory()).as("directory").isDirectory(); softly.assertThat(gv.getExtension()).as("extension").isEqualTo(".java");
softly.assertThat(gv.getDirectory()).as("directory").isDirectory();
}
} }
@Test @Test