diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0c5c8226a9..80949d9d35 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,14 +14,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'gradle' - name: Build with Gradle run: chmod +x gradlew && ./gradlew build diff --git a/build.gradle b/build.gradle index 212460cc37..1cac05d548 100644 --- a/build.gradle +++ b/build.gradle @@ -1,46 +1,56 @@ -apply plugin: 'java' -apply plugin: 'checkstyle' +plugins { + id 'java' + id 'checkstyle' +} group = 'com.fishercoder' version = '1.0-SNAPSHOT' -javadoc.options.encoding = 'UTF-8' -compileJava.options.encoding = 'UTF-8' - -checkstyle { - //include ( '**/*.java') - configFile = file("${rootDir}/fishercoder_checkstyle.xml") +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } -sourceSets { - main { - java { - srcDir 'src/fishercoder' - } - } +tasks.javadoc { + options.encoding = 'UTF-8' } -description = """""" +tasks.compileJava { + options.encoding = 'UTF-8' +} repositories { mavenCentral() - maven { url "http://repo.maven.apache.org/maven2" } } dependencies { - compile 'com.google.code.gson:gson:2.8.0' - compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.0' + implementation 'com.google.code.gson:gson:2.10.1' + implementation 'org.apache.commons:commons-collections4:4.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3' - testCompile("org.assertj:assertj-core:3.11.1") - compileOnly 'org.projectlombok:lombok:1.18.12' - annotationProcessor 'org.projectlombok:lombok:1.18.12' - testCompileOnly 'org.projectlombok:lombok:1.18.12' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.12' + testImplementation 'org.assertj:assertj-core:3.11.1' + compileOnly 'org.projectlombok:lombok:1.18.32' + annotationProcessor 'org.projectlombok:lombok:1.18.32' + testCompileOnly 'org.projectlombok:lombok:1.18.32' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.32' } -test { - useJUnitPlatform() +testing { + suites { + test { + useJUnitJupiter() + } + } +} + +tasks.withType(Test).configureEach { + maxParallelForks = Runtime.runtime.availableProcessors() +} + +checkstyle { + toolVersion = '6.17' + config = rootProject.resources.text.fromFile('fishercoder_checkstyle.xml') } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 758de960ec..e6441136f3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d80b69a76..09523c0e54 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists