rife2/kotlin-bld-example
rife2/kotlin-bld-example
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bumped Kotlin to version 2.1.0

Browse source
This commit is contained in:
Erik C. Thauvin 2024-11-28 11:02:42 -08:00
parent 35f7f73a24
commit 22db48da7a
Signed by: erik
GPG key ID: 776702A6A2DA330E
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/bld.yml vendored
View file

@ -1,6 +1,6 @@
name: bld-ci name: bld-ci
on: [ push, pull_request, workflow_dispatch ] on: [push, pull_request, workflow_dispatch]
env: env:
KOTLIN_HOME: /usr/share/kotlinc KOTLIN_HOME: /usr/share/kotlinc
@ -11,8 +11,8 @@ jobs:
strategy: strategy:
matrix: matrix:
java-version: [ 17, 21, 23 ] java-version: [17, 21, 23]
kotlin-version: [ 1.19.24, 2.0.21 ] kotlin-version: [1.9.24, 2.1.0]
steps: steps:
- name: Checkout source repository - name: Checkout source repository

2
lib/bld/bld-wrapper.properties
View file

@ -6,7 +6,7 @@ bld.javaOptions=
bld.javacOptions= bld.javacOptions=
bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7 bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7
bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1 bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2 bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.1.0 bld.version=2.1.0

6
src/bld/java/com/example/ExampleBuild.java
View file

@ -30,13 +30,13 @@ public class ExampleBuild extends Project {
autoDownloadPurge = true; autoDownloadPurge = true;
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
final var kotlin = version(2, 0, 21); final var kotlin = version(2, 1, 0);
scope(compile) scope(compile)
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)); .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin));
scope(test) scope(test)
.include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 2))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 2))); .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3)));
// Include the Kotlin source directory when creating or publishing sources Java Archives // Include the Kotlin source directory when creating or publishing sources Java Archives
jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin")); jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin"));