diff --git a/ClavaWeaver/build.gradle b/ClavaWeaver/build.gradle
index 2358101bf..8bef02710 100644
--- a/ClavaWeaver/build.gradle
+++ b/ClavaWeaver/build.gradle
@@ -1,20 +1,18 @@
 plugins {
     id 'distribution'
+    id 'application' // Executable
+    id 'java' // Java project
 }
 
-// Java project
-apply plugin: 'java'
-
-// Executable
-apply plugin: 'application'
-
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
-}
 
+    withSourcesJar()
+}
 
 application {
+    mainClass.set("pt.up.fe.specs.clava.weaver.ClavaWeaverLauncher")
 
     // For most input codes this is not necessary, but for the largest example we have tested (LSU-gcc, ~700.000 LoC)
     // it needs a large amount of memory
@@ -32,7 +30,6 @@ repositories {
 dependencies {
     implementation "junit:junit:4.12"
 
-
     implementation ":CommonsLangPlus"
     implementation ":GsonPlus"
     implementation ":jOptions"
@@ -60,10 +57,6 @@ dependencies {
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.4'
 }
 
-java {
-    withSourcesJar()
-}
-
 // Project sources
 sourceSets {
     main {
@@ -90,10 +83,6 @@ sourceSets {
 
 }
 
-application {
-    mainClass.set("pt.up.fe.specs.clava.weaver.ClavaWeaverLauncher")
-}
-
 // Clava
 task clava(type: JavaExec) {
     group = "Execution"
@@ -117,7 +106,6 @@ task clavadoc(type: JavaExec) {
             '--exclude',
             '_',
             '--packages',
-//            '{"Clava API": ["../ClavaLaraApi/src-lara-clava/clava"], "LARA API": ["../LaraApi/src-lara-base","../LaraApi}/src-lara","../LARAI/src-lara","../LaraExtraApi/src-lara","../ClavaLaraApi/src-lara/clava"], "LARA Common Language API": ["../LaraCommonLanguageApi/src-lara"], "ANTAREX API": ["../AntarexClavaApi/src-lara/clava"]}',
             '{\'Clava API\': [\'../ClavaLaraApi/src-lara-clava/clava\'], \'LARA API\': [\'../LaraApi/src-lara-base\',\'../LaraApi}/src-lara\',\'../LARAI/src-lara\',\'../LaraExtraApi/src-lara\',\'../ClavaLaraApi/src-lara/clava\'], \'LARA Common Language API\': [\'../LaraCommonLanguageApi/src-lara\'], \'ANTAREX API\': [\'../AntarexClavaApi/src-lara/clava\']}',
     ]
 }
\ No newline at end of file