Upgrade to Koltin 1.9.21
This commit is contained in:
parent
72f8031c3c
commit
2a88bbb045
5 changed files with 11 additions and 5 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
[](https://opensource.org/licenses/Apache-2.0)
|
[](https://opensource.org/licenses/Apache-2.0)
|
||||||
[](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
|
[](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
|
||||||
[](https://kotlinlang.org)
|
[](https://kotlinlang.org)
|
||||||
[](https://rife2.com/bld)
|
[](https://rife2.com/bld)
|
||||||
[](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-kotlin)
|
[](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-kotlin)
|
||||||
[](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-kotlin)
|
[](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-kotlin)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
## Compile the Kotlin Example
|
j## Compile the Kotlin Example
|
||||||
|
|
||||||
```console
|
```console
|
||||||
./bld compile
|
./bld compile
|
||||||
|
|
|
@ -33,9 +33,9 @@ public class ExampleBuild extends Project {
|
||||||
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
|
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
|
||||||
|
|
||||||
scope(compile)
|
scope(compile)
|
||||||
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20)));
|
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 21)));
|
||||||
scope(test)
|
scope(test)
|
||||||
.include(dependency("org.jetbrains.kotlin:kotlin-test-junit5:1.9.20"))
|
.include(dependency("org.jetbrains.kotlin:kotlin-test-junit5:1.9.21"))
|
||||||
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
|
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
|
||||||
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)));
|
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)));
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class CompileKotlinOperationBuild extends Project {
|
||||||
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
|
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
|
||||||
|
|
||||||
var dokka = version(1, 9, 10);
|
var dokka = version(1, 9, 10);
|
||||||
var kotlin = version(1, 9, 20);
|
var kotlin = version(1, 9, 21);
|
||||||
scope(compile)
|
scope(compile)
|
||||||
.include(dependency("org.jetbrains.kotlin", "kotlin-compiler", kotlin))
|
.include(dependency("org.jetbrains.kotlin", "kotlin-compiler", kotlin))
|
||||||
.include(dependency("org.jetbrains.kotlin", "kotlin-annotation-processing", kotlin))
|
.include(dependency("org.jetbrains.kotlin", "kotlin-annotation-processing", kotlin))
|
||||||
|
|
|
@ -239,6 +239,9 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
|
||||||
*/
|
*/
|
||||||
protected void executeBuildMainSources()
|
protected void executeBuildMainSources()
|
||||||
throws IOException {
|
throws IOException {
|
||||||
|
if (!silent()) {
|
||||||
|
System.out.println("Compiling Kotlin main sources.");
|
||||||
|
}
|
||||||
executeBuildSources(
|
executeBuildSources(
|
||||||
compileMainClasspath(),
|
compileMainClasspath(),
|
||||||
sources(mainSourceFiles(), mainSourceDirectories()),
|
sources(mainSourceFiles(), mainSourceDirectories()),
|
||||||
|
@ -305,6 +308,9 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
|
||||||
*/
|
*/
|
||||||
protected void executeBuildTestSources()
|
protected void executeBuildTestSources()
|
||||||
throws IOException {
|
throws IOException {
|
||||||
|
if (!silent()) {
|
||||||
|
System.out.println("Compiling Kotlin test sources.");
|
||||||
|
}
|
||||||
executeBuildSources(
|
executeBuildSources(
|
||||||
compileTestClasspath(),
|
compileTestClasspath(),
|
||||||
sources(testSourceFiles(), testSourceDirectories()),
|
sources(testSourceFiles(), testSourceDirectories()),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue