Finish 9.9.1

Author: JavaSaBr

build.gradle

@@ -1,41 +1,19 @@
-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.10.0'
+rootProject.version = '9.9.1'
 group = 'com.spaceshift'
 
 allprojects {
 
     repositories {
         mavenCentral()
-        jcenter()
     }
 
-    apply plugin: 'java'
-    apply plugin: 'com.jfrog.bintray'
+    apply plugin: "java-library"
+    apply plugin: "java-test-fixtures"
     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
-    }
-
     javadoc {
         failOnError = false
     }
@@ -45,15 +23,15 @@ allprojects {
     }
 
     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"
+        compileOnly libs.jetbrains.annotations
+        compileOnly libs.lombok
+        annotationProcessor libs.lombok
+
+        testImplementation libs.junit.api
+        testCompileOnly libs.lombok
+        testCompileOnly libs.jetbrains.annotations
+        testRuntimeOnly libs.junit.engine
+        testAnnotationProcessor libs.lombok
     }
 
     /*compileJava {
@@ -66,6 +44,18 @@ allprojects {
         }
     }*/
 
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+
+    compileTestJava {
+        options.encoding = "UTF-8"
+    }
+
+    tasks.withType(Javadoc) {
+        options.encoding = "UTF-8"
+    }
+
     task sourcesJar(type: Jar, dependsOn: classes) {
         afterEvaluate {
             getArchiveClassifier().set("sources")
@@ -83,6 +73,20 @@ allprojects {
     }
 
     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")
+                }
+                authentication {
+                    header(HttpHeaderAuthentication)
+                }
+            }
+        }
+
         publications {
             mavenJava(MavenPublication) {
                 from components.java
@@ -97,29 +101,6 @@ allprojects {
         }
     }
 
-    bintray {
-        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()
-                }
-            }
-        }
-    }
-
     configurations {
         testArtifacts.extendsFrom testRuntime
     }
@@ -139,6 +120,6 @@ allprojects {
 }
 
 wrapper {
-    gradleVersion = '6.0'
+    gradleVersion = '7.4.2'
     distributionType = Wrapper.DistributionType.ALL
 }

gradle/libs.versions.toml

@@ -0,0 +1,30 @@
+[versions]
+# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
+slf4j = "1.7.36"
+# https://mvnrepository.com/artifact/io.projectreactor/reactor-core
+project-reactor = "3.4.19"
+# https://mvnrepository.com/artifact/javax.mail/mail
+javax-mail = "1.5.0-b01"
+# https://mvnrepository.com/artifact/org.testcontainers/testcontainers
+testcontainers = "1.17.3"
+# https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
+junit-jupiter = "5.8.2"
+# https://mvnrepository.com/artifact/org.jetbrains/annotations
+jetbrains-annotations = "23.0.0"
+# https://mvnrepository.com/artifact/org.projectlombok/lombok
+lombok = "1.18.24"
+
+[libraries]
+project-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "project-reactor" }
+jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
+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" }
+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" }
+javax-mail =  { module = "javax.mail:mail", version.ref = "javax-mail" }
+testcontainers =  { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+
+[bundles]
+junit = ["junit-engine", "junit-api"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

rlib-common/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(":rlib-logger-api")
+    api projects.rlibLoggerApi
 }
 
 jar {

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 {

rlib-fx/build.gradle

@@ -1,9 +1,9 @@
 plugins {
-    id 'org.openjfx.javafxplugin' version '0.0.8'
+    id 'org.openjfx.javafxplugin' version '0.0.13'
 }
 
 dependencies {
-    compile project(":rlib-common")
+    api projects.rlibCommon
 }
 
 jar {

rlib-logger-impl/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(":rlib-common")
+    api projects.rlibCommon
 }
 
 jar {

rlib-logger-slf4j/build.gradle

@@ -1,8 +1,8 @@
 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 {

rlib-mail/build.gradle

@@ -1,8 +1,8 @@
 dependencies {
-    compile project(":rlib-common")
-    compile "javax.mail:mail:$javaxMailVersion"
+    api projects.rlibCommon
+    api libs.javax.mail
 
-    testImplementation project(":rlib-testcontainers")
+    testImplementation projects.rlibTestcontainers
 }
 
 jar {

rlib-network/build.gradle

@@ -3,7 +3,7 @@ jar {
 }
 
 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
 }