diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 68f24205..80dfff68 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -26,11 +26,11 @@ jobs: # Only include this step if you are running this workflow on pull requests. - run: git checkout HEAD^2 if: ${{ github.event_name == 'pull_request' }} - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version-file: .java-version - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v1 - name: Build with Gradle diff --git a/.github/workflows/dokka.yml b/.github/workflows/dokka.yml index 9deba03d..e859d0ef 100644 --- a/.github/workflows/dokka.yml +++ b/.github/workflows/dokka.yml @@ -12,11 +12,11 @@ jobs: uses: actions/checkout@v3 with: persist-credentials: false - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version-file: .java-version - name: Set up Node.js uses: actions/setup-node@v3 with: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f6e618c5..b9edf7a8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,11 +20,11 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version-file: .java-version - name: Set up Node.js uses: actions/setup-node@v3 with: @@ -40,7 +40,7 @@ jobs: - run: | echo Verifying the java version used in class files... cd build/classes/kotlin/main - javap -v com.github.spotbugs.snom.SpotBugsPlugin | grep -q 'major version: 52' + javap -v com.github.spotbugs.snom.SpotBugsPlugin | grep -q 'major version: 55' - name: Run Semantic Release run: | echo "gradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }}" > ~/.gradle/gradle.properties diff --git a/.java-version b/.java-version new file mode 100644 index 00000000..98d9bcb7 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17 diff --git a/build.gradle.kts b/build.gradle.kts index 8db6e0a4..ae09a127 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,10 +13,8 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } group = "com.github.spotbugs.snom" @@ -30,7 +28,7 @@ repositories { val spotBugsVersion = "4.7.3" val slf4jVersion = "2.0.0" -val androidGradlePluginVersion = "7.3.1" +val androidGradlePluginVersion = "8.1.0" dependencies { compileOnly(localGroovy()) @@ -58,7 +56,7 @@ tasks { } } val processVersionFile by registering(WriteProperties::class) { - outputFile = file("src/main/resources/spotbugs-gradle-plugin.properties") + destinationFile = file("src/main/resources/spotbugs-gradle-plugin.properties") property("slf4j-version", slf4jVersion) property("spotbugs-version", spotBugsVersion)