Update gradle to 4.3.1, remove useless checkstyle module.

joschock · Nov 26, 2017 · 2ce5cf8 · 2ce5cf8
1 parent eeb8825
commit 2ce5cf8
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 64 deletions.
diff --git a/build.gradle b/build.gradle
@@ -131,6 +131,7 @@ if (gradle.startParameter.taskNames.contains("checkstyle")) {
 
     tasks["checkstyleApi"].enabled = true
     tasks["checkstyleMain"].enabled = true
+    tasks["checkstyleTest"].enabled = false
 }
 
 runClient.jvmArgs += "-Dbuildcraft.dev=true"
@@ -233,32 +234,25 @@ task apiJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = libsDir
     appendix = "api"
 
-    doFirst {
-        from(project.ext.jarFile) {
-            includes.addAll(["buildcraft/api/**"])
-        }
+    from(project.ext.jarFile) {
+        includes.addAll(["buildcraft/api/**"])
     }
 }
 
 task apiSrcJar(type: Jar, dependsOn: build) {
     destinationDir = modulesDirSrc
     appendix = "api"
     classifier = 'sources'
-
-    doFirst {
-        from sourceSets.api.allSource
-    }
+    from sourceSets.api.allSource
 }
 
 task libJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = 'lib'
 
-    doFirst {
-        from(createMCModInfo(0, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraft/**", "assets/buildcraftlib/**", "buildcraft/lib/**", "buildcraft/api/**", "changelog/**", "LICENSE**", "versions.txt"])
-        }
+    from(createMCModInfo(0, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraft/**", "assets/buildcraftlib/**", "buildcraft/lib/**", "buildcraft/api/**", "changelog/**", "LICENSE**", "versions.txt"])
     }
 }
 
@@ -267,23 +261,19 @@ task libSrcJar(type: Jar, dependsOn: build) {
     appendix = "lib"
     classifier = "sources"
 
-    doFirst {
-        from sourceSets.api.allSource
-        from (sourceSets.main.allSource) {
-            includes.addAll(["assets/buildcraft/**", "assets/buildcraftlib/**", "buildcraft/lib/**", "buildcraft/api/**", "LICENSE**"])
-        }
+    from sourceSets.api.allSource
+    from (sourceSets.main.allSource) {
+        includes.addAll(["assets/buildcraft/**", "assets/buildcraftlib/**", "buildcraft/lib/**", "buildcraft/api/**", "LICENSE**"])
     }
 }
 
 task coreJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "core"
 
-    doFirst {
-        from(createMCModInfo(1, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraft/**", "assets/buildcraftlib/**", "assets/buildcraftcore/**", "buildcraft/lib/**", "buildcraft/core/**", "buildcraft/api/**", "changelog/**", "LICENSE**", "versions.txt"])
-        }
+    from(createMCModInfo(1, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraft/**", "assets/buildcraftlib/**", "assets/buildcraftcore/**", "buildcraft/lib/**", "buildcraft/core/**", "buildcraft/api/**", "changelog/**", "LICENSE**", "versions.txt"])
     }
 }
 
@@ -292,11 +282,9 @@ task buildersJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "builders"
 
-    doFirst {
-        from(createMCModInfo(2, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraftbuilders/**", "buildcraft/builders/**", "LICENSE"])
-        }
+    from(createMCModInfo(2, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraftbuilders/**", "buildcraft/builders/**", "LICENSE"])
     }
 }
 
@@ -305,11 +293,9 @@ task energyJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "energy"
 
-    doFirst {
-        from(createMCModInfo(3, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraftenergy/**", "buildcraft/energy/**", "LICENSE"])
-        }
+    from(createMCModInfo(3, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraftenergy/**", "buildcraft/energy/**", "LICENSE"])
     }
 }
 
@@ -318,11 +304,9 @@ task factoryJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "factory"
 
-    doFirst {
-        from(createMCModInfo(4, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraftfactory/**", "buildcraft/factory/**", "LICENSE"])
-        }
+    from(createMCModInfo(4, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraftfactory/**", "buildcraft/factory/**", "LICENSE"])
     }
 }
 
@@ -331,11 +315,9 @@ task siliconJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "silicon"
 
-    doFirst {
-        from(createMCModInfo(5, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraftsilicon/**", "buildcraft/silicon/**", "LICENSE"])
-        }
+    from(createMCModInfo(5, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraftsilicon/**", "buildcraft/silicon/**", "LICENSE"])
     }
 }
 
@@ -344,11 +326,9 @@ task transportJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "transport"
 
-    doFirst {
-        from(createMCModInfo(6, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcrafttransport/**", "buildcraft/transport/**", "LICENSE"])
-        }
+    from(createMCModInfo(6, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcrafttransport/**", "buildcraft/transport/**", "LICENSE"])
     }
 }
 
@@ -357,32 +337,26 @@ task roboticsJar(type: Jar, dependsOn: reobfJar) {
     destinationDir = modulesDir
     appendix = "robotics"
 
-    doFirst {
-        from(createMCModInfo(7, name).parentFile)
-        from(project.ext.jarFile) {
-            includes.addAll(["assets/buildcraftrobotics/**", "buildcraft/robotics/**", "LICENSE"])
-        }
+    from(createMCModInfo(7, name).parentFile)
+    from(project.ext.jarFile) {
+        includes.addAll(["assets/buildcraftrobotics/**", "buildcraft/robotics/**", "LICENSE"])
     }
 }
 
 task allJar(type: Jar, dependsOn:reobfJar) {
     destinationDir = libsDir
 
-    doFirst {
-        from(project.ext.jarFile) {
-            includes.addAll("**")
-        }
+    from(project.ext.jarFile) {
+        includes.addAll("**")
     }
 }
 
 task allSrcJar(type: Jar, dependsOn:reobfJar) {
     destinationDir = libsDir
     classifier = "sources"
 
-    doFirst {
-        from sourceSets.api.allSource
-        from sourceSets.main.allSource
-    }
+    from sourceSets.api.allSource
+    from sourceSets.main.allSource
 }
 
 // add api classes to main package

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 08 01:37:33 MSK 2017
+#Sun Nov 26 22:24:42 GMT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
diff --git a/guidelines/buildcraft.checkstyle b/guidelines/buildcraft.checkstyle
@@ -35,7 +35,6 @@
     <module name="ArrayTypeStyle"/>
     <module name="UpperEll"/>
     <module name="OuterTypeFilename"/>
-    <module name="FileContentsHolder"/>
     <module name="RegexpSinglelineJava">
         <property name="format" value="System\.(out|err)\.print(ln|f){0,1}\(.*\)"/>
         <property name="ignoreComments" value="true"/>