miemie 5 gadi atpakaļ
vecāks
revīzija
f408abe4e9

+ 9 - 8
build.gradle

@@ -79,7 +79,8 @@ ext {
         "swagger-annotations"        : "io.swagger:swagger-annotations:1.6.1",
         //cache
         "mybatis-ehcache"            : "org.mybatis.caches:mybatis-ehcache:1.2.1",
-        "mybatis-redis"              : "org.mybatis.caches:mybatis-redis:1.0.0-beta2"
+        "mybatis-redis"              : "org.mybatis.caches:mybatis-redis:1.0.0-beta2",
+        "mybatis-caffeine"           : "org.mybatis.caches:mybatis-caffeine:1.0.0-beta1"
     ]
 }
 
@@ -144,15 +145,15 @@ subprojects {
     dependencies {
         annotationProcessor "${lib.lombok}"
         compileOnly "${lib.lombok}"
-
         testAnnotationProcessor "${lib.lombok}"
         testCompileOnly "${lib.lombok}"
-        testImplementation("${lib["assertj-core"]}")
-        testImplementation("${lib["junit-jupiter-api"]}")
-        testRuntimeOnly("${lib["junit-jupiter-engine"]}")
-        testImplementation("org.mockito:mockito-junit-jupiter:3.3.3")
-        testImplementation("${lib["lagarto"]}")
-        testImplementation("${lib["logback-classic"]}")
+
+        testImplementation "${lib["assertj-core"]}"
+        testImplementation "${lib["junit-jupiter-api"]}"
+        testRuntimeOnly "${lib["junit-jupiter-engine"]}"
+        testImplementation "org.mockito:mockito-junit-jupiter:3.3.3"
+        testImplementation "${lib["lagarto"]}"
+        testImplementation "${lib["logback-classic"]}"
     }
 
     //noinspection GroovyAssignabilityCheck

+ 2 - 2
mybatis-plus-annotation/build.gradle

@@ -1,3 +1,3 @@
-dependencies{
-    implementation("${lib.mybatis}")
+dependencies {
+    implementation "${lib.mybatis}"
 }

+ 7 - 7
mybatis-plus-boot-starter-test/build.gradle

@@ -1,11 +1,11 @@
 // 全量 copy 自 mybatis 的 mybatis-spring-boot-starter-test
 
 dependencies {
-    api(project(":mybatis-plus-boot-starter"))
-    implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
-    api("org.springframework.boot:spring-boot-autoconfigure")
-    api("org.springframework.boot:spring-boot-starter-test")
-    api("org.springframework:spring-tx")
-    implementation("${lib.'junit-jupiter-api'}")
-    testImplementation("${lib.h2}")
+    api project(":mybatis-plus-boot-starter")
+    implementation platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
+    api "org.springframework.boot:spring-boot-autoconfigure"
+    api "org.springframework.boot:spring-boot-starter-test"
+    api "org.springframework:spring-tx"
+    implementation "${lib.'junit-jupiter-api'}"
+    testImplementation "${lib.h2}"
 }

+ 8 - 8
mybatis-plus-boot-starter/build.gradle

@@ -1,16 +1,16 @@
 dependencies {
     api project(":mybatis-plus")
-    implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}" as String))
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+    implementation platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
     annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}"
-    api 'org.springframework.boot:spring-boot-autoconfigure'
-    api 'org.springframework.boot:spring-boot-starter-jdbc'
-    implementation 'org.springframework.boot:spring-boot-configuration-processor'
-    implementation "${lib.'mybatis-thymeleaf'}"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+    api "org.springframework.boot:spring-boot-autoconfigure"
+    api "org.springframework.boot:spring-boot-starter-jdbc"
+    implementation "org.springframework.boot:spring-boot-configuration-processor"
+    implementation "org.springframework.boot:spring-boot-autoconfigure-processor"
+    implementation "${lib['mybatis-thymeleaf']}"
     implementation "${lib.'mybatis-velocity'}"
     implementation "${lib.'mybatis-freemarker'}"
-    implementation 'org.springframework.boot:spring-boot-autoconfigure-processor'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "${lib.'mybatis-spring-boot-starter'}"
 }
 

+ 7 - 7
mybatis-plus-core/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'org.jetbrains.kotlin.jvm'
 
 dependencies {
-    api(project(":mybatis-plus-annotation"))
-    api("${lib.'jsqlparser'}")
-    api("${lib.mybatis}")
+    api project(":mybatis-plus-annotation")
+    api "${lib.'jsqlparser'}"
+    api "${lib.mybatis}"
 
-    implementation("${lib.cglib}")
-    implementation("${lib.'spring-aop'}")
-    implementation("${lib.'mybatis-ehcache'}")
-    implementation("${lib.'mybatis-redis'}")
+    implementation "${lib.cglib}"
+    implementation "${lib.'spring-aop'}"
+    implementation "${lib.'mybatis-ehcache'}"
+    implementation "${lib.'mybatis-redis'}"
 }

+ 11 - 11
mybatis-plus-extension/build.gradle

@@ -1,16 +1,16 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    api(project(":mybatis-plus-core"))
-    api("${lib["mybatis-spring"]}")
+    api project(":mybatis-plus-core")
+    api "${lib."mybatis-spring"}"
 
-    implementation("${lib["kotlin-stdlib-jdk8"]}")
-    implementation("${lib["kotlin-reflect"]}")
-    implementation("${lib["spring-context-support"]}")
-    implementation("${lib["spring-jdbc"]}")
-    implementation("${lib["slf4j-api"]}")
-    implementation("${lib["p6spy"]}")
-    implementation("${lib["jackson"]}")
-    implementation("${lib["fastjson"]}")
-    implementation("${lib["gson"]}")
+    implementation "${lib."kotlin-stdlib-jdk8"}"
+    implementation "${lib."kotlin-reflect"}"
+    implementation "${lib."spring-context-support"}"
+    implementation "${lib."spring-jdbc"}"
+    implementation "${lib."slf4j-api"}"
+    implementation "${lib."p6spy"}"
+    implementation "${lib."jackson"}"
+    implementation "${lib."fastjson"}"
+    implementation "${lib."gson"}"
 }

+ 9 - 9
mybatis-plus-generator/build.gradle

@@ -5,13 +5,13 @@ dependencies {
     implementation "${lib.freemarker}"
     implementation "${lib.beetl}"
 
-    testCompile "${lib.sqlserver}"
-    testCompile "${lib.postgresql}"
-    testCompile lib.oracle as ConfigurableFileTree
-    testCompile lib.dm as ConfigurableFileTree
-    testCompile lib.kingbase as ConfigurableFileTree
-    testCompile "${lib.h2}"
-    testCompile "${lib.mysql}"
-    testCompile "${lib.sqlite}"
-    testCompile "${lib.'swagger-annotations'}"
+    testImplementation "${lib.sqlserver}"
+    testImplementation "${lib.postgresql}"
+    testImplementation lib.oracle as ConfigurableFileTree
+    testImplementation lib.dm as ConfigurableFileTree
+    testImplementation lib.kingbase as ConfigurableFileTree
+    testImplementation "${lib.h2}"
+    testImplementation "${lib.mysql}"
+    testImplementation "${lib.sqlite}"
+    testImplementation "${lib.'swagger-annotations'}"
 }

+ 18 - 18
mybatis-plus/build.gradle

@@ -1,24 +1,24 @@
 dependencies {
-    api(project(":mybatis-plus-extension"))
-    implementation(project(":mybatis-plus-generator"))
+    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.h2}")
-    testCompile("${lib.sqlserver}")
-    testCompile("${lib.postgresql}")
-    testCompile(lib.oracle as ConfigurableFileTree)
-    testCompile("${lib.mysql}")
-    testCompile("${lib.jackson}")
-    testCompile("${lib.'mybatis-ehcache'}")
-    testCompile("${lib.'mybatis-redis'}")
-    testCompile("${lib.'spring-context-support'}")
-    testCompile("${lib.'spring-jdbc'}")
-    testCompile("javax.annotation:javax.annotation-api:1.3.2")
-    testCompile("${lib.cglib}")
+    testImplementation "${lib.h2}"
+    testImplementation "${lib.sqlserver}"
+    testImplementation "${lib.postgresql}"
+    testImplementation lib.oracle as ConfigurableFileTree
+    testImplementation "${lib.mysql}"
+    testImplementation "${lib.jackson}"
+    testImplementation "${lib.'mybatis-ehcache'}"
+    testImplementation "${lib.'mybatis-redis'}"
+    testImplementation "${lib.'spring-context-support'}"
+    testImplementation "${lib.'spring-jdbc'}"
+    testImplementation "javax.annotation:javax.annotation-api:1.3.2"
+    testImplementation "${lib.cglib}"
 //    testCompile ('org.apache.phoenix:phoenix-core:5.0.0-HBase-2.0')
 }