:package: 补上转 kotlin 时漏掉的 withXml；替换掉 java-library 已弃用的特性

build.gradle.kts

@@ -1,3 +1,6 @@
+import groovy.util.Node
+import groovy.util.NodeList
+
 buildscript {
     repositories {
         maven("https://plugins.gradle.org/m2/")
@@ -118,10 +121,11 @@ subprojects {
         compileOnly("${lib["lombok"]}")
 
         testAnnotationProcessor("${lib["lombok"]}")
+        testCompileOnly("${lib["lombok"]}")
         testCompileOnly("${lib["mockito-all"]}")
-        testCompile("${lib["junit-jupiter-api"]}")
-        testRuntime("${lib["junit-jupiter-engine"]}")
-        testCompile("org.mockito:mockito-junit-jupiter:2.23.4")
+        testImplementation("${lib["junit-jupiter-api"]}")
+        testRuntimeOnly("${lib["junit-jupiter-engine"]}")
+        testImplementation("org.mockito:mockito-junit-jupiter:2.23.4")
     }
 
     val sourcesJar by tasks.registering(Jar::class) {
@@ -208,6 +212,21 @@ subprojects {
                             email.set("jobob@qq.com")
                         }
                     }
+
+                    withXml {
+                        val root = asNode()
+                        root["dependencies"].asNodeList().getAt("*").forEach {
+                            val dependency = it.asNode()
+                            if (dependency["scope"].asNodeList().text() == "runtime") {
+                                if (project.configurations.findByName("implementation")?.allDependencies?.none { dep ->
+                                        dep.name == dependency["artifactId"].asNodeList().text()
+                                    } == false) {
+                                    dependency["scope"].asNodeList().forEach { it.asNode().setValue("compile") }
+                                    dependency.appendNode("optional", true)
+                                }
+                            }
+                        }
+                    }
                 }
 
                 from(components["java"])
@@ -221,3 +240,6 @@ subprojects {
         sign(publishing.publications.getByName("mavenJava"))
     }
 }
+
+fun Any?.asNode() = this as Node
+fun Any?.asNodeList() = this as NodeList

mybatis-plus-core/build.gradle.kts

@@ -8,14 +8,14 @@ dependencies {
     implementation("${lib["cglib"]}")
     implementation("${lib["spring-aop"]}")
 
-    testCompile("${lib["mybatis-ehcache"]}")
-    testCompile("${lib["logback-classic"]}")
-    testCompile("${lib["commons-dbcp2"]}") {
+    testImplementation("${lib["mybatis-ehcache"]}")
+    testImplementation("${lib["logback-classic"]}")
+    testImplementation("${lib["commons-dbcp2"]}") {
         exclude(module = "commons-logging")
     }
-    testCompile("${lib["aspectjweaver"]}")
-    testCompile("${lib["hikaricp"]}")
-    testCompile("${lib["druid"]}")
-    testCompile("${lib["fastjson"]}")
-    testCompile("${lib["tomcatjdbc"]}")
+    testImplementation("${lib["aspectjweaver"]}")
+    testImplementation("${lib["hikaricp"]}")
+    testImplementation("${lib["druid"]}")
+    testImplementation("${lib["fastjson"]}")
+    testImplementation("${lib["tomcatjdbc"]}")
 }

mybatis-plus-extension/build.gradle.kts

@@ -13,20 +13,20 @@ dependencies {
     implementation("${lib["spring-jdbc"]}")
     implementation("${lib["slf4j-api"]}")
 
-    testCompile("${lib["spring-web"]}")
-    testCompile("${lib["javax.servlet-api"]}")
-    testCompile("${lib["spring-test"]}")
-    testCompile("${lib["fastjson"]}")
+    testImplementation("${lib["spring-web"]}")
+    testImplementation("${lib["javax.servlet-api"]}")
+    testImplementation("${lib["spring-test"]}")
+    testImplementation("${lib["fastjson"]}")
 
-    testCompile("${lib["hikaricp"]}")
-    testCompile("${lib["commons-dbcp2"]}")
-    testCompile("${lib["druid"]}")
-    testCompile("${lib["tomcatjdbc"]}")
+    testImplementation("${lib["hikaricp"]}")
+    testImplementation("${lib["commons-dbcp2"]}")
+    testImplementation("${lib["druid"]}")
+    testImplementation("${lib["tomcatjdbc"]}")
 
-    testCompile("${lib["h2"]}")
-    testCompile("${lib["sqlserver"]}")
-    testCompile("${lib["postgresql"]}")
-    testCompile(lib["oracle"] as ConfigurableFileTree)
-    testCompile("${lib["mysql"]}")
-    testCompile("${lib["logback-classic"]}")
+    testImplementation("${lib["h2"]}")
+    testImplementation("${lib["sqlserver"]}")
+    testImplementation("${lib["postgresql"]}")
+    testImplementation(lib["oracle"] as ConfigurableFileTree)
+    testImplementation("${lib["mysql"]}")
+    testImplementation("${lib["logback-classic"]}")
 }

mybatis-plus-generator/build.gradle.kts

@@ -7,10 +7,10 @@ dependencies {
     implementation("${lib["freemarker"]}")
     implementation("${lib["beetl"]}")
 
-    testCompile("${lib["sqlserver"]}")
-    testCompile("${lib["postgresql"]}")
-    testCompile(lib["oracle"] as ConfigurableFileTree)
-    testCompile("${lib["h2"]}")
-    testCompile("${lib["mysql"]}")
-    testCompile("${lib["logback-classic"]}")
+    testImplementation("${lib["sqlserver"]}")
+    testImplementation("${lib["postgresql"]}")
+    testImplementation(lib["oracle"] as ConfigurableFileTree)
+    testImplementation("${lib["h2"]}")
+    testImplementation("${lib["mysql"]}")
+    testImplementation("${lib["logback-classic"]}")
 }

mybatis-plus/build.gradle.kts

@@ -4,25 +4,25 @@ dependencies {
     api(project(":mybatis-plus-extension"))
     implementation(project(":mybatis-plus-generator"))
 
-    testCompile("${lib["spring-web"]}")
-    testCompile("${lib["javax.servlet-api"]}")
+    testImplementation("${lib["spring-web"]}")
+    testImplementation("${lib["javax.servlet-api"]}")
 
-    testCompile("${lib["spring-test"]}")
-    testCompile("${lib["fastjson"]}")
+    testImplementation("${lib["spring-test"]}")
+    testImplementation("${lib["fastjson"]}")
 
-    testCompile("${lib["hikaricp"]}")
-    testCompile("${lib["commons-dbcp2"]}")
-    testCompile("${lib["druid"]}")
-    testCompile("${lib["tomcatjdbc"]}")
+    testImplementation("${lib["hikaricp"]}")
+    testImplementation("${lib["commons-dbcp2"]}")
+    testImplementation("${lib["druid"]}")
+    testImplementation("${lib["tomcatjdbc"]}")
 
-    testCompile("${lib["h2"]}")
-    testCompile("${lib["sqlserver"]}")
-    testCompile("${lib["postgresql"]}")
-    testCompile(lib["oracle"] as ConfigurableFileTree)
-    testCompile("${lib["mysql"]}")
-    testCompile("${lib["jackson"]}")
-    testCompile("${lib["logback-classic"]}")
+    testImplementation("${lib["h2"]}")
+    testImplementation("${lib["sqlserver"]}")
+    testImplementation("${lib["postgresql"]}")
+    testImplementation(lib["oracle"] as ConfigurableFileTree)
+    testImplementation("${lib["mysql"]}")
+    testImplementation("${lib["jackson"]}")
+    testImplementation("${lib["logback-classic"]}")
 
-    testCompile("${lib["spring-context-support"]}")
-    testCompile("${lib["spring-jdbc"]}")
+    testImplementation("${lib["spring-context-support"]}")
+    testImplementation("${lib["spring-jdbc"]}")
 }