Merge pull request #27 from JavaSaBr/upgrade-java-stack

Upgrade java stack

Author: JavaSaBr

build.gradle

@@ -1,7 +1,7 @@
-rootProject.version = '9.9.2'
+rootProject.version = "9.10.0"
 group = 'javasabr'
 
-allprojects {
+subprojects {
 
   repositories {
     mavenCentral()
@@ -11,26 +11,33 @@ allprojects {
   apply plugin: "java-test-fixtures"
   apply plugin: 'maven-publish'
 
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
+  java {
+    toolchain {
+      languageVersion = JavaLanguageVersion.of(21)
+    }
+  }
 
   javadoc {
     failOnError = false
   }
 
   test {
     useJUnitPlatform()
+    failOnNoDiscoveredTests = false
   }
 
   dependencies {
     compileOnly libs.jetbrains.annotations
+    compileOnly libs.jspecify
     compileOnly libs.lombok
     annotationProcessor libs.lombok
 
     testImplementation libs.junit.api
     testCompileOnly libs.lombok
     testCompileOnly libs.jetbrains.annotations
+    testCompileOnly libs.jspecify
     testRuntimeOnly libs.junit.engine
+    testRuntimeOnly libs.junit.platform.launcher
     testAnnotationProcessor libs.lombok
   }
 
@@ -44,32 +51,28 @@ allprojects {
       }
   }*/
 
-  compileJava {
-    options.encoding = "UTF-8"
-  }
-
-  compileTestJava {
+  tasks.withType(JavaCompile).configureEach {
     options.encoding = "UTF-8"
   }
 
   tasks.withType(Javadoc).configureEach {
     options.encoding = "UTF-8"
   }
 
-  task sourcesJar(type: Jar, dependsOn: classes) {
-    afterEvaluate {
-      getArchiveClassifier().set("sources")
-      getArchiveBaseName().set(jar.getArchiveBaseName())
-      from sourceSets.main.allSource
-    }
+  tasks.register("sourcesJar", Jar) {
+    dependsOn "classes"
+    group "build"
+    archiveClassifier = "sources"
+    archiveBaseName = jar.archiveBaseName
+    from sourceSets.main.allSource
   }
 
-  task javadocJar(type: Jar, dependsOn: javadoc) {
-    afterEvaluate {
-      getArchiveClassifier().set("javadoc")
-      getArchiveBaseName().set(jar.getArchiveBaseName())
-      from sourceSets.main.allSource
-    }
+  tasks.register("javadocJar", Jar) {
+    dependsOn "javadoc"
+    group "build"
+    archiveClassifier = "javadoc"
+    archiveBaseName = jar.archiveBaseName
+    from sourceSets.main.allSource
   }
 
   publishing {
@@ -106,22 +109,20 @@ allprojects {
   }
 
   tasks.register('testJar', Jar) {
-    getArchiveClassifier().set("test")
+    archiveClassifier = "test"
     from sourceSets.test.output
   }
 
   artifacts {
     testArtifacts testJar
   }
 
-  tasks.withType(Test).tap {
-    configureEach {
-      maxParallelForks = Runtime.runtime.availableProcessors()
-    }
+  tasks.withType(Test).configureEach {
+    maxParallelForks = Runtime.runtime.availableProcessors()
   }
 }
 
 wrapper {
-  gradleVersion = '8.11.1'
+  gradleVersion = '9.0.0'
   distributionType = Wrapper.DistributionType.ALL
 }

gradle/libs.versions.toml

@@ -1,26 +1,33 @@
 [versions]
 # https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-slf4j = "2.0.16"
+slf4j = "2.0.17"
 # https://mvnrepository.com/artifact/io.projectreactor/reactor-core
-project-reactor = "3.7.1"
+project-reactor = "3.7.8"
 # https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api
 jakarta-mail = "2.1.3"
-angus-mail = "2.0.3"
+# https://mvnrepository.com/artifact/org.eclipse.angus/angus-mail
+angus-mail = "2.0.4"
 # https://mvnrepository.com/artifact/org.testcontainers/testcontainers
-testcontainers = "1.20.4"
+testcontainers = "1.21.3"
 # https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
-junit-jupiter = "5.11.4"
+junit-jupiter = "5.13.4"
 # https://mvnrepository.com/artifact/org.jetbrains/annotations
-jetbrains-annotations = "26.0.1"
+jetbrains-annotations = "26.0.2"
 # https://mvnrepository.com/artifact/org.projectlombok/lombok
-lombok = "1.18.36"
+lombok = "1.18.38"
+# https://mvnrepository.com/artifact/org.jspecify/jspecify
+jspecify = "1.0.0"
+# https://mvnrepository.com/artifact/org.junit.platform/junit-platform-launcher
+junit-platform-launcher = "1.13.4"
 
 [libraries]
 project-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "project-reactor" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
+jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
 lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher" }
 slf4j-api =  { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-simple =  { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
 slf4j-ext =  { module = "org.slf4j:slf4j-ext", version.ref = "slf4j" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,3 @@
 dependencies {
   api projects.rlibLoggerApi
 }
-
-jar {
-  archiveBaseName.set('rlib.common')
-}

gradlew

@@ -6,10 +6,6 @@ dependencies {
   api projects.rlibCommon
 }
 
-jar {
-  archiveBaseName.set('rlib.fx')
-}
-
 javafx {
   modules = ['javafx.controls']
   version = '17'