diff --git a/build.gradle b/build.gradle
index ccf2571e..984af453 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,144 +1,128 @@
-buildscript {
-    repositories {
-        maven { url 'https://plugins.gradle.org/m2/' }
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'net.ltgt.gradle:gradle-apt-plugin:0.21'
-    }
-}
-
-rootProject.version = '9.9.0'
-group = 'com.spaceshift'
-
-allprojects {
-
-    repositories {
-        mavenCentral()
-        jcenter()
-    }
+rootProject.version = "9.10.0"
+group = 'javasabr'
 
-    apply plugin: 'java'
-    apply plugin: 'com.jfrog.bintray'
-    apply plugin: 'maven-publish'
-
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-
-    ext {
-        projectreactorVersion = '3.2.9.RELEASE'
-        sl4jVersion = '1.7.26'
-        javaxMailVersion = "1.5.0-b01"
-        testcontainersVersion = '1.11.1'
-        lombokVersion = '1.18.6'
-        junitJupiterVersion = "5.4.2"
-        jetbrainsAnnotation = '17.0.0'
-        bintrayVersion = version
-    }
+subprojects {
 
-    javadoc {
-        failOnError = false
-    }
+  repositories {
+    mavenCentral()
+  }
 
-    test {
-        useJUnitPlatform()
-    }
+  apply plugin: "java-library"
+  apply plugin: "java-test-fixtures"
+  apply plugin: 'maven-publish'
 
-    dependencies {
-        compileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
-        compileOnly "org.projectlombok:lombok:$lombokVersion"
-        annotationProcessor "org.projectlombok:lombok:$lombokVersion"
-    
-        testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-        testCompileOnly "org.projectlombok:lombok:$lombokVersion"
-        testCompileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
-        testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
+  java {
+    toolchain {
+      languageVersion = JavaLanguageVersion.of(21)
     }
-
-    /*compileJava {
-        inputs.property("moduleName", jar.baseName)
-        doFirst {
-            options.compilerArgs = [
-                '--module-path', classpath.asPath,
-            ]
-            classpath = files()
-        }
-    }*/
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        afterEvaluate {
-            getArchiveClassifier().set("sources")
-            getArchiveBaseName().set(jar.getArchiveBaseName())
-            from sourceSets.main.allSource
+  }
+
+  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
+  }
+
+  /*compileJava {
+      inputs.property("moduleName", jar.baseName)
+      doFirst {
+          options.compilerArgs = [
+              '--module-path', classpath.asPath,
+          ]
+          classpath = files()
+      }
+  }*/
+
+  tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+  }
+
+  tasks.withType(Javadoc).configureEach {
+    options.encoding = "UTF-8"
+  }
+
+  tasks.register("sourcesJar", Jar) {
+    dependsOn "classes"
+    group "build"
+    archiveClassifier = "sources"
+    archiveBaseName = jar.archiveBaseName
+    from sourceSets.main.allSource
+  }
+
+  tasks.register("javadocJar", Jar) {
+    dependsOn "javadoc"
+    group "build"
+    archiveClassifier = "javadoc"
+    archiveBaseName = jar.archiveBaseName
+    from sourceSets.main.allSource
+  }
+
+  publishing {
+    repositories {
+      maven {
+        name = "GitlabPackages"
+        url = uri("https://gitlab.com/api/v4/projects/37512056/packages/maven")
+        credentials(HttpHeaderCredentials) {
+          name = "Private-Token"
+          value = project.findProperty("gitlab.token") ?: System.getenv("GITLAB_TOKEN")
         }
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        afterEvaluate {
-            getArchiveClassifier().set("javadoc")
-            getArchiveBaseName().set(jar.getArchiveBaseName())
-            from sourceSets.main.allSource
+        authentication {
+          header(HttpHeaderAuthentication)
         }
+      }
     }
 
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-                version = rootProject.version
-                afterEvaluate {
-                    artifactId = jar.baseName
-                    groupId = rootProject.group
-                }
-            }
-        }
-    }
-
-    bintray {
+    publications {
+      mavenJava(MavenPublication) {
+        from components.java
+        version = rootProject.version
         afterEvaluate {
-            user = project.hasProperty("bintrayUser") ? project.property("bintrayUser") : ""
-            key = project.hasProperty("bintrayKey") ?  project.property("bintrayKey") : ""
-            publications = ['mavenJava']
-            pkg {
-                repo = 'maven'
-                name = 'com.spaceshift.' + jar.baseName
-                licenses = ['Apache-2.0']
-                websiteUrl = 'https://github.com/JavaSaBr/Rlib'
-                vcsUrl = 'https://github.com/JavaSaBr/RLib.git'
-                issueTrackerUrl = 'https://github.com/JavaSaBr/RLib/issues'
-                githubRepo = 'JavaSaBr/RLib'
-                githubReleaseNotesFile = 'README.md'
-                version {
-                    name = rootProject.version
-                    desc = rootProject.version
-                    released = new Date()
-                }
-            }
+          artifactId = jar.archiveBaseName.get()
+          groupId = rootProject.group
         }
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
+  }
 
-    configurations {
-        testArtifacts.extendsFrom testRuntime
-    }
+  configurations {
+    testArtifacts.extendsFrom testRuntime
+  }
 
-    task testJar(type: Jar) {
-        getArchiveClassifier().set("test")
-        from sourceSets.test.output
-    }
+  tasks.register('testJar', Jar) {
+    archiveClassifier = "test"
+    from sourceSets.test.output
+  }
 
-    artifacts {
-        testArtifacts testJar
-    }
+  artifacts {
+    testArtifacts testJar
+  }
 
-    tasks.withType(Test) {
-        maxParallelForks = Runtime.runtime.availableProcessors()
-    }
+  tasks.withType(Test).configureEach {
+    maxParallelForks = Runtime.runtime.availableProcessors()
+  }
 }
 
 wrapper {
-    gradleVersion = '6.0'
-    distributionType = Wrapper.DistributionType.ALL
+  gradleVersion = '9.0.0'
+  distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..3d2ed4fc
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,40 @@
+[versions]
+# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
+slf4j = "2.0.17"
+# https://mvnrepository.com/artifact/io.projectreactor/reactor-core
+project-reactor = "3.7.8"
+# https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api
+jakarta-mail = "2.1.3"
+# https://mvnrepository.com/artifact/org.eclipse.angus/angus-mail
+angus-mail = "2.0.4"
+# https://mvnrepository.com/artifact/org.testcontainers/testcontainers
+testcontainers = "1.21.3"
+# https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
+junit-jupiter = "5.13.4"
+# https://mvnrepository.com/artifact/org.jetbrains/annotations
+jetbrains-annotations = "26.0.2"
+# https://mvnrepository.com/artifact/org.projectlombok/lombok
+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" }
+jakarta-mail-api =  { module = "jakarta.mail:jakarta.mail-api", version.ref = "jakarta-mail" }
+angus-mail =  { module = "org.eclipse.angus:angus-mail", version.ref = "angus-mail" }
+testcontainers =  { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+
+[bundles]
+junit = ["junit-engine", "junit-api"]
+mail = ["jakarta-mail-api", "angus-mail"]
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cb..8bdaf60c 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 ee69dd68..48b43d35 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-5.4.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
diff --git a/gradlew b/gradlew
index af6708ff..ef07e016 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d5937..5eed7ee8 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,25 +27,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
+
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/rlib-common/build.gradle b/rlib-common/build.gradle
index 08f5da75..b3fd7a24 100644
--- a/rlib-common/build.gradle
+++ b/rlib-common/build.gradle
@@ -1,7 +1,3 @@
 dependencies {
-    compile project(":rlib-logger-api")
+  api projects.rlibLoggerApi
 }
-
-jar {
-    baseName "rlib.common"
-}
\ No newline at end of file
diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/Functions.java b/rlib-common/src/main/java/com/ss/rlib/common/function/Functions.java
new file mode 100644
index 00000000..6d179cb5
--- /dev/null
+++ b/rlib-common/src/main/java/com/ss/rlib/common/function/Functions.java
@@ -0,0 +1,70 @@
+package com.ss.rlib.common.function;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+public class Functions {
+
+    public static class Predicates {
+
+        public static @NotNull Predicate<Boolean> isTrue() {
+
+            return bool -> bool;
+        }
+
+        public static @NotNull Predicate<Boolean> ifTrue(@NotNull Runnable task) {
+
+            return bool -> {
+
+                if (bool) {
+                    task.run();
+                }
+
+                return true;
+            };
+        }
+
+        public static @NotNull Predicate<Boolean> throwIfTrue(@NotNull Supplier<? extends RuntimeException> factory) {
+
+            return bool -> {
+
+                if (bool) {
+                    throw factory.get();
+                }
+
+                return true;
+            };
+        }
+
+        public static @NotNull Predicate<Boolean> isFalse() {
+
+            return bool -> !bool;
+        }
+
+        public static @NotNull Predicate<Boolean> ifFalse(@NotNull Runnable task) {
+
+            return bool -> {
+
+                if (!bool) {
+                    task.run();
+                }
+
+                return true;
+            };
+        }
+
+        public static @NotNull Predicate<Boolean> throwIfFalse(@NotNull Supplier<? extends RuntimeException> factory) {
+
+            return bool -> {
+
+                if (!bool) {
+                    throw factory.get();
+                }
+
+                return true;
+            };
+        }
+    }
+}
diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java b/rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java
index fb7405f4..52898285 100644
--- a/rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java
+++ b/rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java
@@ -7,9 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.*;
 
 /**
@@ -244,6 +242,48 @@ public static <T, F> void fill(@NotNull T[] array, @Nullable F argument, @NotNul
         return result;
     }
 
+    /**
+     * Combine two arrays to one single array with uniq elements.
+     *
+     * @param <T>   the base array's component type.
+     * @param <E>   the added array's component type.
+     * @param base  the base array.
+     * @param added the additional array.
+     * @return the combined array with uniq elements.
+     */
+    public static <T, E extends T> @NotNull T[] combineUniq(@NotNull T[] base, @Nullable E[] added) {
+        return combineUniq(base, added, getComponentType(base));
+    }
+
+    /**
+     * Combine two arrays to one single array with uniq elements.
+     *
+     * @param <T>   the base array's component type.
+     * @param <E>   the added array's component type.
+     * @param base  the base array.
+     * @param added the additional array.
+     * @param type  the base array's component type.
+     * @return the combined array with uniq elements.
+     */
+    public static <T, E extends T> @NotNull T[] combineUniq(
+        @Nullable T[] base,
+        @Nullable E[] added,
+        @NotNull Class<T> type
+    ) {
+
+        if (base == null) {
+            return added == null ? create(type, 0) : added;
+        } else if (added == null || added.length < 1) {
+            return base;
+        }
+
+        var result = new HashSet<T>(base.length + added.length);
+        result.addAll(Arrays.asList(base));
+        result.addAll(Arrays.asList(added));
+
+        return result.toArray(create(type, result.size()));
+    }
+
     /**
      * Check the array on contains the value.
      *
diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java b/rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java
index 9e640179..d97f5c79 100644
--- a/rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java
+++ b/rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java
@@ -3,8 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Реализация быстрого рандоминайзера на основе псевдорандом генератора.
- *
  * @author JavaSaBr
  */
 public final class FastRandom implements Random {
diff --git a/rlib-fx/build.gradle b/rlib-fx/build.gradle
index 07238f14..e0ac566c 100644
--- a/rlib-fx/build.gradle
+++ b/rlib-fx/build.gradle
@@ -1,16 +1,12 @@
 plugins {
-    id 'org.openjfx.javafxplugin' version '0.0.8'
+  id 'org.openjfx.javafxplugin' version '0.1.0'
 }
 
 dependencies {
-    compile project(":rlib-common")
-}
-
-jar {
-    baseName "rlib.fx"
+  api projects.rlibCommon
 }
 
 javafx {
-    modules = ['javafx.controls']
-    version = "11.0.1"
+  modules = ['javafx.controls']
+  version = '17'
 }
diff --git a/rlib-logger-api/build.gradle b/rlib-logger-api/build.gradle
index fd144c66..e69de29b 100644
--- a/rlib-logger-api/build.gradle
+++ b/rlib-logger-api/build.gradle
@@ -1,6 +0,0 @@
-dependencies {
-}
-
-jar {
-    baseName "rlib.logger.api"
-}
\ No newline at end of file
diff --git a/rlib-logger-impl/build.gradle b/rlib-logger-impl/build.gradle
index 48d3caee..05c70c97 100644
--- a/rlib-logger-impl/build.gradle
+++ b/rlib-logger-impl/build.gradle
@@ -1,7 +1,3 @@
 dependencies {
-    compile project(":rlib-common")
+  api projects.rlibCommon
 }
-
-jar {
-    baseName "rlib.logger.impl"
-}
\ No newline at end of file
diff --git a/rlib-logger-slf4j/build.gradle b/rlib-logger-slf4j/build.gradle
index 0ca76fa5..1fc24540 100644
--- a/rlib-logger-slf4j/build.gradle
+++ b/rlib-logger-slf4j/build.gradle
@@ -1,10 +1,6 @@
 dependencies {
-    compile project(":rlib-logger-api")
-    compile "org.slf4j:slf4j-api:$sl4jVersion"
+  api projects.rlibLoggerApi
+  api libs.slf4j.api
 
-    testRuntime "org.slf4j:slf4j-simple:$sl4jVersion"
+  testRuntime libs.slf4j.simple
 }
-
-jar {
-    baseName "rlib.logger.slf4j"
-}
\ No newline at end of file
diff --git a/rlib-mail/build.gradle b/rlib-mail/build.gradle
index 01eee726..3f6a80e5 100644
--- a/rlib-mail/build.gradle
+++ b/rlib-mail/build.gradle
@@ -1,10 +1,6 @@
 dependencies {
-    compile project(":rlib-common")
-    compile "javax.mail:mail:$javaxMailVersion"
+  api projects.rlibCommon
+  api libs.bundles.mail
 
-    testImplementation project(":rlib-testcontainers")
+  testImplementation projects.rlibTestcontainers
 }
-
-jar {
-    baseName "rlib.mail"
-}
\ No newline at end of file
diff --git a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java b/rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java
index 86e09d36..22bad3c8 100644
--- a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java
+++ b/rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java
@@ -1,9 +1,8 @@
 package com.ss.rlib.mail.sender.exception;
 
+import jakarta.mail.MessagingException;
 import org.jetbrains.annotations.NotNull;
 
-import javax.mail.MessagingException;
-
 public class UncheckedMessagingException extends RuntimeException {
 
     public UncheckedMessagingException(@NotNull MessagingException cause) {
diff --git a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java b/rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java
index 69141334..e668e0e0 100644
--- a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java
+++ b/rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java
@@ -6,13 +6,20 @@
 import com.ss.rlib.mail.sender.MailSender;
 import com.ss.rlib.mail.sender.MailSenderConfig;
 import com.ss.rlib.mail.sender.exception.UncheckedMessagingException;
+import jakarta.mail.Authenticator;
+import jakarta.mail.MessagingException;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import lombok.Builder;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
-import javax.mail.*;
-import javax.mail.Message.RecipientType;
-import javax.mail.internet.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 import java.util.concurrent.*;
@@ -103,7 +110,7 @@ public void send(@NotNull String email, @NotNull String subject, @NotNull String
 
             var message = new MimeMessage(session);
             message.setFrom(from);
-            message.setRecipients(RecipientType.TO, InternetAddress.parse(email));
+            message.setRecipients(MimeMessage.RecipientType.TO, InternetAddress.parse(email));
             message.setSubject(subject, StandardCharsets.UTF_8.name());
 
             var mimeBodyPart = new MimeBodyPart();
diff --git a/rlib-network/build.gradle b/rlib-network/build.gradle
index 5393c2a1..bc28de0e 100644
--- a/rlib-network/build.gradle
+++ b/rlib-network/build.gradle
@@ -1,9 +1,5 @@
-jar {
-    baseName "rlib.network"
-}
-
 dependencies {
-    compile project(":rlib-common")
-    compile "io.projectreactor:reactor-core:$projectreactorVersion"
-    testRuntimeOnly project(":rlib-logger-impl")
+  api projects.rlibCommon
+  api libs.project.reactor.core
+  testRuntimeOnly projects.rlibLoggerImpl
 }
diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java b/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java
index c192d6c9..d3a165a3 100644
--- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java
+++ b/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java
@@ -278,13 +278,7 @@ else if (packetLength > tempPendingBuffer.capacity()) {
 
             if (packet != null) {
                 LOGGER.debug(packet, pck -> "Created instance of packet to read data: " + pck);
-
-                if (packet.read(connection, bufferToRead, dataLength)) {
-                    readPacketHandler.accept(packet);
-                } else {
-                    LOGGER.error("Packet " + packet + " was read incorrectly");
-                }
-
+                readAndHandlePacket(bufferToRead, dataLength, packet);
                 LOGGER.debug(packet, pck -> "Finished reading data of packet: " + pck);
                 readPackets++;
             } else {
@@ -319,6 +313,14 @@ else if (packetLength > tempPendingBuffer.capacity()) {
         return readPackets;
     }
 
+    protected void readAndHandlePacket(@NotNull ByteBuffer bufferToRead, int dataLength, @NotNull R packet) {
+        if (packet.read(connection, bufferToRead, dataLength)) {
+            readPacketHandler.accept(packet);
+        } else {
+            LOGGER.error("Packet " + packet + " was read incorrectly");
+        }
+    }
+
     /**
      * Check buffer's data.
      *
diff --git a/rlib-testcontainers/build.gradle b/rlib-testcontainers/build.gradle
index dd1d9013..c143c6a5 100644
--- a/rlib-testcontainers/build.gradle
+++ b/rlib-testcontainers/build.gradle
@@ -1,16 +1,12 @@
 dependencies {
-    compile project(":rlib-common")
-    compile "org.testcontainers:testcontainers:$testcontainersVersion"
-    compile "org.slf4j:slf4j-api:$sl4jVersion"
-    compile "org.slf4j:slf4j-ext:$sl4jVersion"
-    // FIXME
-    compile "com.kohlschutter.junixsocket:junixsocket-common:2.1.1"
-    compile "com.kohlschutter.junixsocket:junixsocket-native-common:2.1.1"
-    runtime "org.slf4j:slf4j-simple:$sl4jVersion"
+  api projects.rlibCommon
+  api libs.testcontainers
+  api libs.slf4j.api
+  api libs.slf4j.ext
+  // FIXME
+  api "com.kohlschutter.junixsocket:junixsocket-common:2.1.1"
+  api "com.kohlschutter.junixsocket:junixsocket-native-common:2.1.1"
+  implementation libs.slf4j.simple
 
-    testImplementation project(":rlib-mail")
+  testImplementation projects.rlibMail
 }
-
-jar {
-    baseName "rlib.testcontainers"
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 20c647dd..849dae0d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,5 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 rootProject.name = 'rlib'
 
 include ':rlib-common'