erik/semver-gradle
erik/semver-gradle
1
1
Fork 0
Code Issues Pull requests Releases Activity

Set Detekt JVM target to 23 under JDK 24

Browse source
This commit is contained in:
Erik C. Thauvin 2025-04-26 01:39:18 -07:00
parent db489cc19f
commit db0c3c856e
Signed by: erik
GPG key ID: 776702A6A2DA330E
4 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/gradle.yml vendored
View file

@ -35,15 +35,10 @@ jobs:
~/.gradle/wrapper ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: | restore-keys: |
${{ runner.os }}-gradle-${{ matrix.java-version }}- ${{ runner.os }}-gradle-${{ matrix.java-version }}
- name: Check with Gradle
if: matrix.java-version != '24'
run: ./gradlew build check --stacktrace
- name: Test with Gradle - name: Test with Gradle
if: matrix.java-version == '24' run: ./gradlew build check --stacktrace
run: ./gradlew build test --stacktrace
- name: Cleanup Gradle Cache - name: Cleanup Gradle Cache
run: | run: |

9
build.gradle.kts
View file

@ -1,3 +1,4 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@ -59,10 +60,16 @@ tasks {
} }
detekt { detekt {
// toolVersion = "main-SNAPSHOT" toolVersion = "main-SNAPSHOT"
baseline = project.rootDir.resolve("detekt-baseline.xml") baseline = project.rootDir.resolve("detekt-baseline.xml")
} }
tasks.withType<Detekt>().configureEach {
if (JavaVersion.current() >= JavaVersion.VERSION_24) {
jvmTarget = "23"
}
}
gradlePlugin { gradlePlugin {
website.set(github) website.set(github)
vcsUrl.set(github) vcsUrl.set(github)

14
detekt-baseline.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<SmellBaseline> <SmellBaseline>
<ManuallySuppressedIssues></ManuallySuppressedIssues> <ManuallySuppressedIssues/>
<CurrentIssues> <CurrentIssues>
<ID>MagicNumber:utils.kt$3</ID> <ID>MagicNumber:utils.kt:3</ID>
<ID>MagicNumber:utils.kt$4</ID> <ID>MagicNumber:utils.kt:4</ID>
<ID>MagicNumber:utils.kt$5</ID> <ID>MagicNumber:utils.kt:5</ID>
<ID>NestedBlockDepth:utils.kt$fun File.loadProperties(): Properties</ID> <ID>NestedBlockDepth:utils.kt:fun File.loadProperties(): Properties</ID>
<ID>NestedBlockDepth:utils.kt$fun parseSemVer(input: String?, version: Version): Boolean</ID> <ID>NestedBlockDepth:utils.kt:fun parseSemVer(input: String?, version: Version): Boolean</ID>
<ID>NestedBlockDepth:utils.kt$fun saveProperties(projectDir: File, config: SemverConfig, version: Version)</ID> <ID>NestedBlockDepth:utils.kt:fun saveProperties(projectDir: File, config: SemverConfig, version: Version)</ID>
</CurrentIssues> </CurrentIssues>
</SmellBaseline> </SmellBaseline>

6
examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java
View file

@ -14,16 +14,16 @@ import java.util.Date;
*/ */
public final class GeneratedVersion { public final class GeneratedVersion {
public static final String PROJECT = "Java Example"; public static final String PROJECT = "Java Example";
public static final Date BUILDDATE = new Date(1707709694421L); public static final Date BUILDDATE = new Date(1745642618838L);
public static final int MAJOR = 2; public static final int MAJOR = 2;
public static final int MINOR = 12; public static final int MINOR = 13;
public static final int PATCH = 0; public static final int PATCH = 0;
public static final String PRERELEASE = ""; public static final String PRERELEASE = "";
public static final String PRERELEASE_PREFIX = "-"; public static final String PRERELEASE_PREFIX = "-";
public static final String BUILDMETA = ""; public static final String BUILDMETA = "";
public static final String BUILDMETA_PREFIX = "+"; public static final String BUILDMETA_PREFIX = "+";
public static final String SEPARATOR = "."; public static final String SEPARATOR = ".";
public static final String VERSION = "2.12.0"; public static final String VERSION = "2.13.0";
/** /**
* Disables the default constructor. * Disables the default constructor.