Update shared build scripts

Author: jakobkmar

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

@@ -2,23 +2,13 @@ object Versions {
     const val simpleJavaMail = "6.5.2"
 }
 
-val repoName = "SimpleKotlinMail"
-
 group = "net.axay"
 version = "1.3.3"
 
-description = "A simple, modern and coroutine based Kotlin Email API, supporting both clientside and serverside projects"
-
 repositories {
     mavenCentral()
 }
 
 plugins {
     kotlin("jvm")
-    `java-library`
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
 }

buildSrc/src/main/kotlin/java-version-script.gradle.kts

@@ -1,21 +1,13 @@
-import org.gradle.api.JavaVersion
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val jvmVersion = JavaVersion.VERSION_11
-val jvmVersionString = jvmVersion.versionString
-
 plugins {
     `java-library`
 }
 
-java {
-    java.sourceCompatibility = jvmVersion
-    java.targetCompatibility = jvmVersion
+tasks.withType<JavaCompile> {
+    options.release.set(11)
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = jvmVersionString
+    kotlinOptions.jvmTarget = "11"
 }
-
-val JavaVersion.versionString: String get() = if (majorVersion.toInt() <= 10) "1.$majorVersion" else majorVersion

buildSrc/src/main/kotlin/maven-publish-script.gradle.kts

@@ -1,5 +1,7 @@
 val githubProject = "bluefireoly/SimpleKotlinMail"
 
+description = "A simple, modern and coroutine based Kotlin Email API, supporting both clientside and serverside projects"
+
 plugins {
     kotlin("jvm")
     `java-library`
@@ -11,6 +13,11 @@ signing {
     sign(publishing.publications)
 }
 
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
 publishing {
     repositories {
         maven("https://oss.sonatype.org/service/local/staging/deploy/maven2") {

simplekotlinmail-test/build.gradle.kts

@@ -1,48 +1,19 @@
-group = "net.axay"
-version = "unspecified"
-
 plugins {
+    `common-build-script`
     `java-version-script`
-
-    kotlin("multiplatform")
-}
-
-/**
- * DEPENDENCY MANAGEMENT
- */
-
-repositories {
-    mavenCentral()
-    jcenter()
 }
 
-kotlin {
-    jvm {
-        withJava()
-    }
-
-    sourceSets {
-        val jvmTest by getting {
+dependencies {
+    implementation(project(":${rootProject.name}-core"))
+    implementation(project(":${rootProject.name}-client"))
+    implementation(project(":${rootProject.name}-server"))
+    implementation(project(":${rootProject.name}-html"))
 
-            dependencies {
+    implementation("org.slf4j:slf4j-simple:1.7.30")
 
-                implementation("org.junit.jupiter:junit-jupiter:5.7.0")
-
-                implementation(project(":${rootProject.name}-core"))
-                implementation(project(":${rootProject.name}-client"))
-                implementation(project(":${rootProject.name}-server"))
-                implementation(project(":${rootProject.name}-html"))
-
-                implementation("org.slf4j:slf4j-simple:1.7.30")
-
-            }
-
-        }
-    }
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
 }
 
-// JUNIT
-
-tasks.withType<Test> {
+tasks.test {
     useJUnitPlatform()
 }

…implekotlinmail/test/ServerClientTest.kt …implekotlinmail/test/ServerClientTest.ktsimplekotlinmail-test/src/jvmTest/kotlin/net/axay/simplekotlinmail/test/ServerClientTest.kt renamed to simplekotlinmail-test/src/test/kotlin/net/axay/simplekotlinmail/test/ServerClientTest.kt simplekotlinmail-test/src/jvmTest/kotlin/net/axay/simplekotlinmail/test/ServerClientTest.kt renamed to simplekotlinmail-test/src/test/kotlin/net/axay/simplekotlinmail/test/ServerClientTest.kt

@@ -52,8 +52,8 @@ class ServerClientTest {
         val smtpServer = smtpServer {
             setupTLS(
                 TLSContext(
-                    File("./src/jvmTest/resources/keystore"), "passphrase",
-                    File("./src/jvmTest/resources/truststore"), "passphrase"
+                    File("./src/test/resources/keystore"), "passphrase",
+                    File("./src/test/resources/truststore"), "passphrase"
                 ),
                 true,
                 requireClientAuth = false