Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
Bumped Kotlin to version 2.0.21
Bumped JUnit to version 5.11.2
Bumped PMD extension to version 1.1.6
  • Loading branch information
ethauvin committed Oct 10, 2024
1 parent 6a508f1 commit 0aea209
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/bld.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: bld-ci

on: [ push, pull_request, workflow_dispatch ]
on: [push, pull_request, workflow_dispatch]

env:
KOTLIN_HOME: /usr/share/kotlinc
Expand All @@ -11,8 +11,8 @@ jobs:

strategy:
matrix:
java-version: [ 17, 21, 22 ]
kotlin-version: [ 1.9.24, 2.0.0 ]
java-version: [17, 21, 22]
kotlin-version: [1.9.24, 2.0.21]

steps:
- name: Checkout source repository
Expand Down
1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/src/bld/java/com/example/ExampleBuild.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ public ExampleBuild() {

repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);

final var kotlin = version(2, 0, 20);
final var kotlin = version(2, 0, 21);
scope(compile)
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin));
scope(test)
.include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
.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, 2)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 2)));

// Include the Kotlin source directory when creating or publishing sources Java Archives
jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin"));
Expand Down
2 changes: 1 addition & 1 deletion lib/bld/bld-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bld.downloadLocation=
bld.javaOptions=
bld.javacOptions=
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.3
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.6
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=2.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class CompileKotlinOperationBuild extends Project {
public CompileKotlinOperationBuild() {
pkg = "rife.bld.extension";
name = "bld-kotlin";
version = version(1, 0, 2);
version = version(1, 0, 3, "SNAPSHOT");

javaRelease = 17;

Expand All @@ -45,8 +45,8 @@ public CompileKotlinOperationBuild() {
scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0)));
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, 2)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 2)))
.include(dependency("org.assertj", "assertj-core", version(3, 26, 3)));

javadocOperation()
Expand Down

0 comments on commit 0aea209

Please sign in to comment.