Merge d05bd7a into master

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "io.github.rtmigo"
-version = "0.5.1-SNAPSHOT" //
+version = "0.6.0" //
 
 repositories {
     mavenCentral()

src/main/kotlin/Build.kt

@@ -1,5 +1,5 @@
 // DO NOT EDIT. Generated by Gradle task "generateBuildKt"
 object Build { 
-    const val version = "0.4.3"
-    const val date = "2022-10-23"
+    const val version = "0.6.0"
+    const val date = "2022-10-24"
 }    

src/main/kotlin/Main.kt

@@ -35,10 +35,14 @@ class Cli : NoOpCliktCommand(
     }
 }
 
-private suspend fun gaa(): GroupArtifact {
-    val ad = ArtifactDir(Paths.get(".").absolute())
-    return GroupArtifact(ad.group(), ad.artifact())
-}
+fun theArtifactDir() = ArtifactDir(Paths.get(".").absolute())
+
+//private suspend fun gaa(): GroupArtifact {
+//    val ad = ArtifactDir(Paths.get(".").absolute())
+//    return GroupArtifact(ad.group(), ad.artifact())
+//}
+
+suspend fun ArtifactDir.toGroupArtifact() = GroupArtifact(this.group(), this.artifact())
 
 data class CliConfig(val trace: Boolean)
 
@@ -58,7 +62,7 @@ open class CheckCentral : CliktCommand(
 
 open class Local(help: String = "Build, publish to $m2str") : CliktCommand(help = help) {
     override fun run() = catchingCommand(this) {
-        cmdLocal(gaa(), isFinal = true)
+        cmdLocal(theArtifactDir(), isFinal = true)
         Unit
     }
 }
@@ -86,7 +90,7 @@ open class Stage(help: String = "Build, sign, publish to OSSRH Staging") :
 
     override fun run() = catchingCommand(this) {
         cmdSign(
-            cmdLocal(gaa()),
+            cmdLocal(theArtifactDir()),
             key = GpgPrivateKey(gpgKey),
             pass = GpgPassphrase(gpgPwd)
         ).use {
@@ -102,7 +106,7 @@ open class Stage(help: String = "Build, sign, publish to OSSRH Staging") :
 class Central : Stage(help = "Build, sign, publish to OSSRH Staging, release to Central") {
     override fun run() = catchingCommand(this) {
         cmdSign(
-            cmdLocal(gaa()),
+            cmdLocal(theArtifactDir()),
             key = GpgPrivateKey(gpgKey),
             pass = GpgPassphrase(gpgPwd)
         ).use { signed ->

src/main/kotlin/maven/PomParsing.kt

@@ -34,7 +34,7 @@ data class PomXml(val xml: String) {
             throw Exception("POM error: item '$selector'.", e)
         }
 
-    fun validate() {
+    fun validate(targetCompatibility: Int) {
         // Отсутствие некоторых элементов в схеме может привести к тому, что Sonatype Staging будет
         // принимать файл, а потом зависать, так никогда и не делая репозиторий доступным. Это
         // конечно большая загадка, в каких ЕЩЁ случаях он так сделает. Но тут можно хоть что-то
@@ -61,13 +61,13 @@ data class PomXml(val xml: String) {
 
 
         val pomJavaVersion = this.javaVersion()
-        val runningJavaVersion = jriVersion()
-
-        if (pomJavaVersion<runningJavaVersion) {
+//        val runningJavaVersion = jriVersion()
+//
+        if (pomJavaVersion<targetCompatibility) {
             // TODO unit test
-            throw Exception("Currently running Java version is $runningJavaVersion, but " +
+            throw Exception("The targetCompatibility Java version is $targetCompatibility, but " +
                                 "<java.version/> in POM is $pomJavaVersion. " +
-                                "Either compile with older Java or change the " +
+                                "Either target older Java or change the " +
                                 "<java.version/> in POM.")
         }
     }

src/main/kotlin/stages/build/Building.kt

@@ -11,10 +11,10 @@ import tools.*
 import java.nio.file.Paths
 import kotlin.io.path.*
 
-suspend fun cmdLocal(ga: GroupArtifact, isFinal: Boolean = false): MavenArtifactDir {
+suspend fun cmdLocal(ga: ArtifactDir, isFinal: Boolean = false): MavenArtifactDir {
     eprintHeader("Publishing to $m2str")
     val f = Paths.get(".").absolute()
-        .toGradlew().publishAndDetect(ga,null)
+        .toGradlew().publishAndDetect(ga.toGroupArtifact(),null)
     eprint()
 
     val mad = f.toMavenArtifactDir()
@@ -31,7 +31,9 @@ suspend fun cmdLocal(ga: GroupArtifact, isFinal: Boolean = false): MavenArtifact
         srcFile.copyTo(dstFile, true)
     }
 
-    PomXml(mad.asUnsignedFileset().pomFile.readText()).validate()
+    PomXml(mad.asUnsignedFileset().pomFile.readText()).validate(
+        targetCompatibility=ga.targetCompatibility()
+    )
 
     eprint()
     eprint(mad.asUnsignedFileset().pomFile.readText())

src/main/kotlin/stages/build/Gradle.kt

@@ -16,7 +16,7 @@ import com.aballano.mnemonik.memoizeSuspend
 import com.github.pgreze.process.*
 
 import maven.*
-import tools.rethrowingState
+import tools.*
 import java.nio.file.*
 import kotlin.io.path.absolute
 import kotlin.io.path.exists
@@ -206,6 +206,13 @@ suspend fun ArtifactDir.artifact(): Artifact = rethrowingState(
     { "Failed to detect the Artifact in ${this.path}" },
     { Artifact(cachedProperties(this)["archivesBaseName"]!!) })
 
+suspend fun ArtifactDir.targetCompatibility(): Int = rethrowingState(
+    { "Failed get 'targetCompatibility' from ${this.path}" },
+    { javaVersionToInt(cachedProperties(this)["targetCompatibility"]!!) })
+
+
+
+
 
 data class Dependency(val notation: Notation, val scope: String)
 

src/main/kotlin/tools/JriVersion.kt

@@ -13,4 +13,18 @@ fun jriVersion(): Int {
         }
     }
     return version.toInt()
-}
+}
+
+fun javaVersionToInt(version: String): Int =
+    version.split('.').let {
+        if (it.size==1)
+            it.single().toInt()
+        else if (it.size>=2) {
+            if (it[0]=="1")
+                it[1].toInt()
+            else
+                it[0].toInt()
+        }
+        else
+            throw IllegalArgumentException(version)
+    }

src/test/kotlin/JavaVersionTest.kt

@@ -0,0 +1,25 @@
+import io.kotest.assertions.throwables.shouldThrow
+import io.kotest.matchers.shouldBe
+import org.junit.jupiter.api.Test
+import tools.javaVersionToInt
+
+class JavaVersionTest {
+    @Test
+    fun test() {
+        javaVersionToInt("1.6").shouldBe(6)
+        javaVersionToInt("1.8").shouldBe(8)
+        javaVersionToInt("1.8.345").shouldBe(8)
+        javaVersionToInt("19").shouldBe(19)
+        javaVersionToInt("9.1").shouldBe(9)
+
+        shouldThrow<IllegalArgumentException> {
+            javaVersionToInt("")
+        }
+        shouldThrow<IllegalArgumentException> {
+            javaVersionToInt("labuda")
+        }
+        shouldThrow<IllegalArgumentException> {
+            javaVersionToInt("1.a.2")
+        }
+    }
+}