Merge pull request #4 from InsanusMokrassar/patch-1

Update dependencies and concentrate dependencies in toml

Author: jakobkmar

buildSrc/build.gradle.kts

@@ -3,9 +3,9 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.5.20"))
+    implementation(kotlin("gradle-plugin", "1.6.10"))
 }

buildSrc/src/main/kotlin/common-build-script.gradle.kts

@@ -1,7 +1,3 @@
-object Versions {
-    const val simpleJavaMail = "6.6.1"
-}
-
 group = "net.axay"
 version = "1.3.3"
 

gradle/libs.versions.toml

@@ -0,0 +1,25 @@
+[versions]
+
+kotlin = "1.6.10"
+kotlinSerialization = "1.3.2"
+kotlinCoroutines = "1.6.0"
+kotlinHtml = "0.7.3"
+
+simpleJavaMail = "6.6.1"
+
+subethasmtp = "5.2.8"
+
+[libraries]
+
+simpleJavaMail = { module = "org.simplejavamail:simple-java-mail", version.ref = "simpleJavaMail" }
+simpleJavaMail-batch = { module = "org.simplejavamail:batch-module", version.ref = "simpleJavaMail" }
+simpleJavaMail-smime = { module = "org.simplejavamail:smime-module", version.ref = "simpleJavaMail" }
+kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
+kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinSerialization" }
+kt-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinHtml" }
+subethasmtp = { module = "com.github.davidmoten:subethasmtp", version.ref = "subethasmtp" }
+
+[plugins]
+
+kt-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kt-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -9,3 +9,5 @@ include("$projectName-client")
 include("$projectName-html")
 
 include("$projectName-test")
+
+enableFeaturePreview("VERSION_CATALOGS")

simplekotlinmail-client/build.gradle.kts

@@ -1,13 +1,11 @@
-import Common_build_script_gradle.*
-
 plugins {
     `common-build-script`
     `java-version-script`
     `maven-publish-script`
 }
 
 dependencies {
-    implementation(project(":${rootProject.name}-core"))
+    api(project(":${rootProject.name}-core"))
 
-    api("org.simplejavamail:batch-module:${Versions.simpleJavaMail}")
+    api(libs.simpleJavaMail.batch)
 }

simplekotlinmail-core/build.gradle.kts

@@ -1,11 +1,9 @@
-import Common_build_script_gradle.*
-
 plugins {
     `common-build-script`
     `java-version-script`
     `maven-publish-script`
 
-    kotlin("plugin.serialization") version "1.5.20"
+    libs.plugins.kt.serialization
 }
 
 /**
@@ -14,12 +12,12 @@ plugins {
 
 dependencies {
     // SIMPLE JAVA MAIL
-    api("org.simplejavamail:simple-java-mail:${Versions.simpleJavaMail}")
-    api("org.simplejavamail:smime-module:${Versions.simpleJavaMail}")
+    api(libs.simpleJavaMail)
+    api(libs.simpleJavaMail.smime)
 
     // COROUTINES
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
+    api(libs.kt.coroutines)
 
     // SERIALIZATION
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
+    api(libs.kt.serialization)
 }

simplekotlinmail-html/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":${rootProject.name}-core"))
+    api(project(":${rootProject.name}-core"))
 
-    api("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3")
+    api(libs.kt.html)
 }

simplekotlinmail-server/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":${rootProject.name}-core"))
+    api(project(":${rootProject.name}-core"))
 
-    api("com.github.davidmoten:subethasmtp:5.2.8")
+    api(libs.subethasmtp)
 }