ソースを参照

升级gradle5.1.

nieqiuqiu 6 年 前
コミット
c9e559db95
5 ファイル変更9 行追加10 行削除
  1. 6 7
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 1 1
      gradle/wrapper/gradle-wrapper.properties
  4. 1 1
      gradlew
  5. 1 1
      gradlew.bat

+ 6 - 7
build.gradle

@@ -106,14 +106,13 @@ subprojects {
         annotationProcessor "${lib.lombok}"
         implementation "${lib.lombok}"
         testAnnotationProcessor "${lib.lombok}"
-        testCompileOnly "${lib.lombok}"
         testCompileOnly "${lib.'mockito-all'}"
         testCompile "${lib.junit}"
     }
 
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
+    task sourcesJar(type: Jar) {
+        archiveClassifier.set('sources')
+        from sourceSets.main.allJava
     }
 
     javadoc {
@@ -129,9 +128,9 @@ subprojects {
         }
     }
 
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
-        from 'build/docs/javadoc'
+    task javadocJar(type: Jar) {
+        archiveClassifier.set('javadoc')
+        from javadoc
     }
 
     artifacts {

BIN
gradle/wrapper/gradle-wrapper.jar


+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

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

+ 1 - 1
gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

+ 1 - 1
gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome