Merge pull request #88 from panic08/make-version-catalog

Make Version Catalog instead of storing the version in the main build.gradle

Author: therepanic

.idea/gradle.xml

@@ -1,29 +1,21 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.17.0'
-    }
+plugins {
+    alias(libs.plugins.spotless)
 }
 
-ext {
-    jsoupVersion = '1.18.3'
-    okhttpVersion = '4.12.0'
-    gsonVersion = '2.12.1'
-    lombokVersion = '1.18.36'
-    junitVersion = '5.9.1'
-}
 
 allprojects {
     group = 'ru.funpay4j'
     version = '1.0.6'
+
+    repositories {
+        mavenCentral()
+    }
 }
 
 def javaVersion = JavaVersion.current()
 
 subprojects { subproject ->
-    if (subproject.name != 'examples' && javaVersion.compareTo(JavaVersion.VERSION_1_8) == 0) {
+    if (subproject.name != 'examples' && javaVersion == JavaVersion.VERSION_1_8) {
         apply plugin: 'com.diffplug.spotless'
 
         spotless {
@@ -39,10 +31,6 @@ subprojects { subproject ->
         }
     }
 
-    repositories {
-        mavenCentral()
-    }
-
     tasks.withType(Test).configureEach {
         systemProperty 'file.encoding', 'UTF-8'
     }

build.gradle

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        buildLibs {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/settings.gradle

@@ -4,13 +4,13 @@ plugins {
 
 dependencies {
     implementation project(":utils")
-    implementation "com.squareup.okhttp3:okhttp:${rootProject.ext.okhttpVersion}"
-    testImplementation "com.squareup.okhttp3:mockwebserver:${rootProject.ext.okhttpVersion}"
-    implementation "com.google.code.gson:gson:${rootProject.ext.gsonVersion}"
-    implementation "org.jsoup:jsoup:${rootProject.ext.jsoupVersion}"
-    annotationProcessor "org.projectlombok:lombok:${rootProject.ext.lombokVersion}"
-    testImplementation platform("org.junit:junit-bom:${rootProject.ext.junitVersion}")
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    implementation libs.okhttp
+    testImplementation libs.mockwebserver
+    implementation libs.gson
+    implementation libs.jsoup
+    annotationProcessor libs.lombok
+    testImplementation platform(libs.junitBom)
+    testImplementation libs.junit
 }
 
 configurations {

client/build.gradle

@@ -4,11 +4,11 @@ plugins {
 
 dependencies {
     api project(":client")
-    implementation "com.squareup.okhttp3:okhttp:${rootProject.ext.okhttpVersion}"
-    testImplementation "com.squareup.okhttp3:mockwebserver:${rootProject.ext.okhttpVersion}"
-    annotationProcessor "org.projectlombok:lombok:${rootProject.ext.lombokVersion}"
-    testImplementation platform("org.junit:junit-bom:${rootProject.ext.junitVersion}")
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    implementation libs.okhttp
+    testImplementation libs.mockwebserver
+    annotationProcessor libs.lombok
+    testImplementation platform(libs.junitBom)
+    testImplementation libs.junit
 }
 
 configurations {

core/build.gradle

@@ -0,0 +1,19 @@
+[versions]
+jsoup = "1.18.3"
+okhttp = "4.12.0"
+gson = "2.12.1"
+lombok = "1.18.36"
+junit = "5.9.1"
+spotless = "5.17.0"
+
+[libraries]
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
+junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junitBom = { module = "org.junit:junit-bom", version.ref = "junit" }
+
+[plugins]
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

gradle/libs.versions.toml

@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-    annotationProcessor "org.projectlombok:lombok:${rootProject.ext.lombokVersion}"
-    testImplementation platform("org.junit:junit-bom:${rootProject.ext.junitVersion}")
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    annotationProcessor libs.lombok
+    testImplementation platform(libs.junitBom)
+    testImplementation libs.junit
 }
 
 configurations {