Sync gradle scripts between projects

Author: RaphiMC

Agent/build.gradle

@@ -6,8 +6,8 @@ plugins {
 }
 
 dependencies {
-    include "org.ow2.asm:asm:9.8"
-    include "org.ow2.asm:asm-tree:9.8"
+    includeInJar "org.ow2.asm:asm:9.8"
+    includeInJar "org.ow2.asm:asm-tree:9.8"
 }
 
 jar {

buildSrc/src/main/groovy/base.application-conventions.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "application"
-    id "base.include-configuration"
+    id "base.include-in-jar-configuration"
     id "base.exclude-run-folder"
 }
 

buildSrc/src/main/groovy/base.base-conventions.gradle

@@ -11,9 +11,16 @@ repositories {
 }
 
 jar {
-    var projectName = project.name
-    from("LICENSE") {
-        rename { "${it}_${projectName}" }
+    if (layout.projectDirectory.file("LICENSE").asFile.exists()) {
+        def projectName = project.name
+        from(layout.projectDirectory.file("LICENSE")) {
+            rename { "${it}_${projectName}" }
+        }
+    } else if (rootProject.layout.projectDirectory.file("LICENSE").asFile.exists()) {
+        def projectName = rootProject.name
+        from(rootProject.layout.projectDirectory.file("LICENSE")) {
+            rename { "${it}_${projectName}" }
+        }
     }
 }
 

buildSrc/src/main/groovy/base.exclude-run-folder.gradle

@@ -5,7 +5,7 @@ plugins {
 idea {
     module {
         ["run"].each {
-            excludeDirs << file("$it")
+            excludeDirs << layout.projectDirectory.file("$it").asFile
         }
     }
 }

…groovy/base.include-configuration.gradle …base.include-in-jar-configuration.gradlebuildSrc/src/main/groovy/base.include-configuration.gradle renamed to buildSrc/src/main/groovy/base.include-in-jar-configuration.gradle buildSrc/src/main/groovy/base.include-configuration.gradle renamed to buildSrc/src/main/groovy/base.include-in-jar-configuration.gradle

@@ -1,15 +1,15 @@
 configurations {
-    include
+    includeInJar
 
-    implementation.extendsFrom(include)
-    api.extendsFrom(include)
+    implementation.extendsFrom(includeInJar)
+    api.extendsFrom(includeInJar)
 }
 
 jar {
-    dependsOn(configurations.include)
+    dependsOn(configurations.includeInJar)
     from {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        configurations.include.collect {
+        configurations.includeInJar.collect {
             zipTree(it)
         }
     } {

buildSrc/src/main/groovy/viaproxy.plugin-conventions.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "java-library"
     id "base.base-conventions"
-    id "base.include-configuration"
+    id "base.include-in-jar-configuration"
     id "viaproxy.run-with-viaproxy-task"
 }