Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with Java 17, and publish Java 11 class file format #946

Merged
merged 4 commits into from
Aug 14, 2023
+11 −12
Merged

Build with Java 17, and publish Java 11 class file format #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7488836
fix: publish Java 11 class files
KengoTODA Aug 14, 2023
108302a
ci: use Java 17 to resolve warnings reported from SonarCloud
KengoTODA Aug 14, 2023
a15843f
ci: resolve a warning
KengoTODA Aug 14, 2023
ffdab6f
build(deps): bump com.android.tools.build:gradle from 7.3.1 to 8.1.0
dependabot[bot] Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dokka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions .java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17
8 changes: 3 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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())
Expand Down Expand Up @@ -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)
Expand Down