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

Bump Kotlin to version 2.2.0

Browse source
This commit is contained in:
Erik C. Thauvin 2025-06-23 14:57:45 -07:00
parent 7bc0b0fa54
commit 71df82b1c0
Signed by: erik
GPG key ID: 776702A6A2DA330E
5 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ jobs:
strategy: strategy:
matrix: matrix:
java-version: [ 17, 21, 24 ] java-version: [ 17, 21, 24 ]
kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ] kotlin-version: [ 1.9.25, 2.0.21, 2.2.0 ]
os: [ ubuntu-latest, windows-latest, macos-latest ] os: [ ubuntu-latest, windows-latest, macos-latest ]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

2
.idea/misc.xml generated
View file

@ -3,7 +3,7 @@
<component name="EntryPointsManager"> <component name="EntryPointsManager">
<pattern value="rife.bld.extension.DetektOperationBuild" method="pmd" /> <pattern value="rife.bld.extension.DetektOperationBuild" method="pmd" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" /> <output url="file://$PROJECT_DIR$/build" />
</component> </component>
</project> </project>

9
examples/.idea/kotlinc.xml generated
View file

@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="moduleKind" value="plain" />
</component>
<component name="Kotlin2JvmCompilerArguments"> <component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="1.8" /> <option name="jvmTarget" value="17" />
</component>
<component name="KotlinCommonCompilerArguments">
<option name="apiVersion" value="2.1" />
<option name="languageVersion" value="2.1" />
</component> </component>
</project> </project>

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

@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.10-SNAPSHOT bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.10-SNAPSHOT
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0-SNAPSHOT bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.2.1 bld.version=2.2.1

8
examples/src/bld/java/com/example/ExampleBuild.java
View file

@ -26,12 +26,12 @@ public class ExampleBuild extends Project {
javaRelease = 17; javaRelease = 17;
downloadSources = true;
autoDownloadPurge = true; autoDownloadPurge = true;
downloadSources = true;
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES);
final var kotlin = version(2, 1, 20); final var kotlin = version(2, 2, 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)
@ -102,9 +102,9 @@ public class ExampleBuild extends Project {
.execute(); .execute();
} }
@BuildCommand(value = "test-ci", summary = "Run detek with a test baseline") @BuildCommand(value = "test-ci", summary = "Run detekt with a test baseline")
public void testCi() throws ExitStatusException, IOException, InterruptedException { public void testCi() throws ExitStatusException, IOException, InterruptedException {
// Run detek with the test basline (for CI testing) // Run detekt with the test baseline (for CI testing)
new DetektOperation() new DetektOperation()
.fromProject(this) .fromProject(this)
.baseline("src/test/resources/detekt-baseline.xml") .baseline("src/test/resources/detekt-baseline.xml")