Skip to content
Merged

Java 25 #2124

Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: '17'
java-version: '25'
cache: 'gradle'
- name: Cache SonarCloud packages
uses: actions/cache@v5
Expand All @@ -47,11 +47,11 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: '17'
java-version: '25'
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew test --no-daemon
Expand All @@ -65,11 +65,11 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: '17'
java-version: '25'
cache: 'gradle'
- name: Build with Gradle
run: chmod +x gradlew && ./gradlew test --no-daemon
Expand All @@ -81,11 +81,11 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: '17'
java-version: '25'
cache: 'maven'
- name: Build and analyze
run: mvn -B compile
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'maven-publish'
id 'com.diffplug.spotless' version '7.0.4'
id 'com.diffplug.spotless' version '7.2.1'
id 'org.sonarqube' version '6.2.0.5505'
id 'jacoco'
}
Expand All @@ -12,10 +12,10 @@ repositories {
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:[5.13.3,)'
testImplementation 'org.junit.jupiter:junit-jupiter:[5.14.4,)'
testImplementation 'org.hamcrest:hamcrest-core:[3.0,)'
testImplementation 'org.zapodot:embedded-db-junit-jupiter:[2.2.3,)'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:[1.13.3,)'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:[1.14.4,)'
}

test {
Expand All @@ -26,7 +26,7 @@ test {
group = 'com.github.javadev'
version = '1.49-SNAPSHOT'
description = 'leetcode-in-java'
java.sourceCompatibility = JavaVersion.VERSION_17
java.sourceCompatibility = JavaVersion.VERSION_25

java {
withSourcesJar()
Expand All @@ -46,7 +46,7 @@ spotless {
}
importOrder '\\#', '', '*'
removeUnusedImports()
googleJavaFormat('1.22.0').aosp()
googleJavaFormat('1.30.0').aosp()
toggleOffOn()
endWithNewline()
}
Expand Down
10 changes: 5 additions & 5 deletions pom-central.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<source>17</source>
<target>17</target>
<source>25</source>
<target>25</target>
<encoding>UTF-8</encoding>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
Expand All @@ -61,7 +61,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -179,13 +179,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions pom-central21.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<configuration>
<source>21</source>
<target>21</target>
Expand Down Expand Up @@ -185,13 +185,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.15.0</version>
<configuration>
<source>17</source>
<target>17</target>
<source>25</source>
<target>25</target>
<encoding>UTF-8</encoding>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
Expand All @@ -60,7 +60,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -172,19 +172,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.13.3,)</version>
<version>[5.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>[1.13.3,)</version>
<version>[1.14.4,)</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading