Skip to content

Commit

Permalink
Version and style updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wmdietl committed Jan 8, 2025
1 parent 3f6c4f7 commit 0716235
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
java: [ '11', '17', '21', '23-ea' ]
java: [ '8', '11', '17', '21', '23' ]

steps:
- uses: actions/checkout@v4
Expand Down
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
// Code formatting; defines targets "spotlessApply" and "spotlessCheck".
// https://github.com/diffplug/spotless/tags ; see tags starting "gradle/"
// Only works on JDK 11+.
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:7.0.1'
}
}
}
Expand All @@ -17,15 +17,15 @@ plugins {
id 'com.gradleup.shadow' version '8.3.5'

// Error Prone linter
id('net.ltgt.errorprone') version '4.1.0'
id 'net.ltgt.errorprone' version '4.1.0'

// Checker Framework pluggable type-checking
id 'org.checkerframework' version '0.6.48'
id 'org.checkerframework' version '0.6.48' apply false
}

repositories {
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

ext {
Expand Down Expand Up @@ -71,7 +71,7 @@ if (isJava11orHigher) {

// define the steps to apply to those files
trimTrailingWhitespace()
indentWithSpaces(2)
leadingTabsToSpaces(2)
endWithNewline()
}
java {
Expand All @@ -82,7 +82,7 @@ if (isJava11orHigher) {
groovyGradle {
target '**/*.gradle'
greclipse() // which formatter Spotless should use to format .gradle files.
indentWithSpaces(2)
leadingTabsToSpaces(2)
trimTrailingWhitespace()
// endWithNewline() // Don't want to end empty files with a newline
}
Expand All @@ -109,7 +109,7 @@ apply plugin: 'org.checkerframework'

if (true) {
// Use the released version of the EISOP Checker Framework.
ext.checkerFrameworkVersion = '3.42.0-eisop3'
ext.checkerFrameworkVersion = '3.42.0-eisop5'
} else {
// To use a snapshot version of the EISOP Checker Framework.
// TODO: Change the above test to false to use a snapshot.
Expand All @@ -122,6 +122,7 @@ if (true) {
dependencies {
compileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
testCompileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
checkerFramework "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
checkerFramework "io.github.eisop:checker:${checkerFrameworkVersion}"
}

Expand Down Expand Up @@ -199,6 +200,6 @@ check.dependsOn requireJavadoc

/* Make Emacs TAGS table */
task tags(type: Exec) {
description 'Run etags to create an Emacs TAGS table'
description = 'Run etags to create an Emacs TAGS table'
commandLine 'bash', '-c', "find src/ -name '*.java' | sort | xargs etags"
}

0 comments on commit 0716235

Please sign in to comment.