feat: gradle file size reduced

MystoriaStudios · Nov 7, 2023 · 54d8b47 · 54d8b47
1 parent 073e8ab
commit 54d8b47
Show file tree

Hide file tree

Showing 16 changed files with 119 additions and 118 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,13 +6,13 @@ import org.jetbrains.gradle.ext.runConfigurations
 import org.jetbrains.gradle.ext.settings
 
 plugins {
+    kotlin("jvm") version "1.9.10"
+    kotlin("kapt") version "1.9.10"
     id("maven-publish")
     id("io.sentry.jvm.gradle") version "3.12.0"
     id("com.github.johnrengelman.shadow") version "7.1.2"
-    kotlin("jvm") version "1.9.10"
     id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
     id("org.jetbrains.dokka") version "1.9.0"
-    kotlin("kapt") version "1.9.10"
     id("com.google.protobuf") version "0.9.4" apply false
 }
 
@@ -39,7 +39,6 @@ allprojects {
     apply(plugin = "maven-publish")
     apply(plugin = "kotlin")
     apply(plugin = "com.github.johnrengelman.shadow")
-    apply(plugin = "com.github.johnrengelman.shadow")
     apply(plugin = "org.jetbrains.gradle.plugin.idea-ext")
     apply(plugin = "org.jetbrains.dokka")
     apply(plugin = "org.jetbrains.kotlin.kapt")
@@ -53,11 +52,59 @@ allprojects {
         maven("https://jitpack.io")
     }
 
-    dependencies {
-        testImplementation(kotlin("test"))
+    fun applyGlobalDepends(scope: DependencyHandlerScope, shade: Boolean = false) {
+        scope {
+            if (!shade) {
+                compileOnly(kotlin("stdlib"))
+                compileOnly(kotlin("reflect")) // Add this line
+
+                compileOnly("org.mongodb:mongo-java-driver:3.12.11")
+                compileOnly("io.lettuce:lettuce-core:6.2.4.RELEASE")
+                compileOnly("io.sentry:sentry:6.29.0")
+                compileOnly("com.konghq:unirest-java:3.13.6:standalone")
+
+                // Docker
+                compileOnly("com.github.docker-java:docker-java:3.3.4")
+
+                // Cloudflare
+                compileOnly("com.github.robinbraemer:CloudflareAPI:1.4.1")
+
+                compileOnly("com.google.guava:guava:31.0.1-jre")
+                compileOnly("commons-io:commons-io:2.11.0")
+            } else {
+                implementation(kotlin("stdlib"))
+                implementation(kotlin("reflect")) // Add this line
 
+                implementation("org.mongodb:mongo-java-driver:3.12.11")
+                implementation("io.lettuce:lettuce-core:6.2.4.RELEASE")
+                implementation("com.google.code.gson:gson:2.9.0")
+                implementation("io.sentry:sentry:6.29.0")
+                implementation("com.konghq:unirest-java:3.13.6:standalone")
+
+                // Docker
+                implementation("com.github.docker-java:docker-java:3.3.4")
+
+                // Cloudflare
+                implementation("com.github.robinbraemer:CloudflareAPI:1.4.1")
+
+                implementation("com.google.guava:guava:31.0.1-jre")
+                implementation("commons-io:commons-io:2.11.0")
+            }
+        }
+    }
+
+    dependencies {
         // Generate documentation
         dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.9.0")
+
+        if (name.contains("api") || name.contains("protocol") || name.contains("minecraft-platform") || name == "paper-core") {
+            applyGlobalDepends(this)
+        } else if ((name.contains("core") && !name.contains("paper") && !name.contains("nms")) || name.contains("backend")) {
+            applyGlobalDepends(this, true)
+        } else {
+            compileOnly(kotlin("stdlib"))
+            compileOnly(kotlin("reflect")) // Add this line
+        }
     }
 
     tasks.withType<ShadowJar> {
@@ -82,50 +129,6 @@ allprojects {
         }
     }
 
-    configurations.create("final") {
-        dependencies {
-            implementation(kotlin("stdlib"))
-            implementation(kotlin("reflect")) // Add this line
-
-            implementation("org.mongodb:mongo-java-driver:3.12.11")
-            implementation("io.lettuce:lettuce-core:6.2.4.RELEASE")
-            implementation("com.google.code.gson:gson:2.9.0")
-            implementation("io.sentry:sentry:6.29.0")
-            implementation("com.konghq:unirest-java:3.13.6:standalone")
-
-            // Docker
-            implementation("com.github.docker-java:docker-java:3.3.4")
-
-            // Cloudflare
-            implementation("com.github.robinbraemer:CloudflareAPI:1.4.1")
-
-            implementation("com.google.guava:guava:31.0.1-jre")
-            implementation("commons-io:commons-io:2.11.0")
-        }
-    }
-
-    configurations.create("non-final") {
-        dependencies {
-            compileOnly(kotlin("stdlib"))
-            compileOnly(kotlin("reflect")) // Add this line
-
-            compileOnly("org.mongodb:mongo-java-driver:3.12.11")
-            compileOnly("io.lettuce:lettuce-core:6.2.4.RELEASE")
-            compileOnly("com.google.code.gson:gson:2.9.0")
-            compileOnly("io.sentry:sentry:6.29.0")
-            compileOnly("com.konghq:unirest-java:3.13.6:standalone")
-
-            // Docker
-            compileOnly("com.github.docker-java:docker-java:3.3.4")
-
-            // Cloudflare
-            compileOnly("com.github.robinbraemer:CloudflareAPI:1.4.1")
-
-            compileOnly("com.google.guava:guava:31.0.1-jre")
-            compileOnly("commons-io:commons-io:2.11.0")
-        }
-    }
-
     publishing {
         publications {
             register(
@@ -161,6 +164,8 @@ allprojects {
     tasks.processResources {
         duplicatesStrategy = DuplicatesStrategy.WARN // or DuplicatesStrategy.FAIL
     }
+
+    tasks["build"].dependsOn("shadowJar")
 }
 
 kotlin {

diff --git a/independent/api/build.gradle.kts b/independent/api/build.gradle.kts
@@ -1,12 +1,8 @@
 dependencies {
-    api("org.reflections:reflections:0.10.2")
-    api("com.github.ben-manes.caffeine:caffeine:3.1.8")
-    api("com.squareup.retrofit2:retrofit:2.9.0")
-    api("com.squareup.retrofit2:converter-gson:2.9.0")
-    api("co.aikar:acf-core:0.5.1-SNAPSHOT")
-    api("de.mkammerer:argon2-jvm:2.11")
-
-    configurations.getByName("non-final").dependencies.forEach {
-        this.compileOnly(it)
-    }
+    compileOnly("org.reflections:reflections:0.10.2")
+    compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.8")
+    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
+    compileOnly("com.squareup.retrofit2:converter-gson:2.9.0")
+    compileOnly("co.aikar:acf-core:0.5.1-SNAPSHOT")
+    compileOnly("de.mkammerer:argon2-jvm:2.11")
 }
diff --git a/independent/backend/build.gradle.kts b/independent/backend/build.gradle.kts
@@ -12,5 +12,3 @@ dependencies {
 
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
 }
-
-tasks["build"].dependsOn("shadowJar")
diff --git a/independent/core/build.gradle.kts b/independent/core/build.gradle.kts
@@ -23,6 +23,4 @@ dependencies {
     implementation("io.kubernetes:client-java:15.0.1")
 
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
-}
-
-tasks["build"].dependsOn("shadowJar")
+}
diff --git a/independent/protocol-stub/build.gradle.kts b/independent/protocol-stub/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
 dependencies {
     protobuf(project(":independent:protocol"))
 
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.ext["coroutinesVersion"]}")
+    compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.ext["coroutinesVersion"]}")
 
-    api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
-    api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
-    api("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
-    api("com.google.protobuf:protobuf-kotlin:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
+    compileOnly("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
+    compileOnly("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
+    compileOnly("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
+    compileOnly("com.google.protobuf:protobuf-kotlin:${rootProject.ext["protobufVersion"]}")
+    compileOnly("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
 }
 
 

diff --git a/mc-commons/build.gradle.kts b/mc-commons/build.gradle.kts
@@ -1,14 +1,14 @@
 dependencies {
-    api("net.kyori:adventure-api:4.14.0")
-    api("net.kyori:adventure-key:4.14.0")
-    api("net.kyori:adventure-text-minimessage:4.10.1")
+    compileOnly("net.kyori:adventure-api:4.14.0")
+    compileOnly("net.kyori:adventure-key:4.14.0")
+    compileOnly("net.kyori:adventure-text-minimessage:4.10.1")
 
-    api("co.aikar:acf-core:0.5.1-SNAPSHOT")
-    api(project(":independent:independent-api"))
+    compileOnly("co.aikar:acf-core:0.5.1-SNAPSHOT")
+    compileOnly(project(":independent:independent-api"))
 
-    api("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")
-    api(project(":independent:protocol-stub"))
-    api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
-    api("api.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
+    compileOnly("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")
+    compileOnly(project(":independent:protocol-stub"))
+    compileOnly("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
+    compileOnly("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
+    compileOnly("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
 }
diff --git a/mc-commons/src/main/kotlin/net/revive/framework/maven/MavenLibraryLoader.kt b/mc-commons/src/main/kotlin/net/revive/framework/maven/MavenLibraryLoader.kt
@@ -2,10 +2,6 @@ package net.revive.framework.maven
 
 import com.google.common.base.Supplier
 import com.google.common.base.Suppliers
-import net.revive.framework.Framework
-import net.revive.framework.flavor.annotation.Inject
-import net.revive.framework.flavor.service.Service
-import net.revive.framework.server.IMinecraftPlatform
 import java.io.File
 import java.net.MalformedURLException
 import java.net.URL
@@ -18,16 +14,9 @@ import java.util.*
  * Resolves [MavenLibrary] annotations for a class, and loads the dependency
  * into the classloader.
  */
-@Service
 object MavenLibraryLoader {
-    private val URL_INJECTOR: Supplier<URLClassLoaderAccess> = Suppliers.memoize {
-        URLClassLoaderAccess.create(
-            IMinecraftPlatform::class.java.getClassLoader() as URLClassLoader
-        )
-    }
 
-    @Inject
-    lateinit var minecraftPlatform: IMinecraftPlatform
+    lateinit var URL_INJECTOR: Supplier<URLClassLoaderAccess>
 
     /**
      * Resolves all [MavenLibrary] annotations on the given object.
@@ -44,6 +33,12 @@ object MavenLibraryLoader {
      * @param clazz the class to load libraries for.
      */
     fun loadAll(clazz: Class<*>) {
+        URL_INJECTOR = Suppliers.memoize {
+            URLClassLoaderAccess.create(
+                clazz.getClassLoader() as URLClassLoader
+            )
+        }
+
         val libs: Array<MavenLibrary> = clazz.getDeclaredAnnotationsByType(MavenLibrary::class.java) ?: return
         for (lib in libs) {
             load(lib.groupId, lib.artifactId, lib.version, lib.repo.url)

diff --git a/paper/api/build.gradle.kts b/paper/api/build.gradle.kts
@@ -6,17 +6,21 @@ repositories {
 }
 
 dependencies {
+    // all of our stuff
     implementation(project(":paper"))
     implementation(project(":independent:independent-api"))
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("net.wesjd:anvilgui:1.9.0-SNAPSHOT")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
-    implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
-    implementation("fr.mrmicky:fastboard:2.0.0")
+    implementation(project(":minecraft-platform"))
+
     implementation("me.lucko:helper:5.6.10")
+
+    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
+    compileOnly("net.wesjd:anvilgui:1.9.0-SNAPSHOT")
+    compileOnly("com.squareup.retrofit2:converter-gson:2.9.0")
+    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
+    compileOnly("co.aikar:acf-paper:0.5.1-SNAPSHOT")
+    compileOnly("fr.mrmicky:fastboard:2.0.0")
+    compileOnly("me.lucko:helper:5.6.10")
     compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0")
-    implementation(project(":minecraft-platform"))
 
     compileOnly(project(":paper:nms:nms-core"))
     compileOnly("com.github.cryptomorin:XSeries:9.5.0") { isTransitive = false }

diff --git a/paper/api/src/main/kotlin/net/revive/framework/plugin/ExtendedKotlinPlugin.kt b/paper/api/src/main/kotlin/net/revive/framework/plugin/ExtendedKotlinPlugin.kt
@@ -98,7 +98,9 @@ open class ExtendedKotlinPlugin : ExtendedJavaPlugin(), IConfigProvider {
             Bukkit.shutdown()
             return
         }
+
         MavenLibraryLoader.loadAll(this::class.java)
+
         this.flavor =
             Flavor.create((Bukkit.getPluginManager().getPlugin(description.name) ?: this)::class, FlavorOptions(logger))
         this.flavor.reflections = PackageIndexer(this::class, FlavorOptions(logger), listOf(this.classLoader))

diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
@@ -1,9 +0,0 @@
-repositories {
-
-    maven("https://maven.enginehub.org/repo/")
-    maven("https://repo.papermc.io/repository/maven-public/")
-    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-}
-dependencies {
-    implementation("com.squareup.retrofit:retrofit:2.0.0-beta2")
-}

diff --git a/paper/core/build.gradle.kts b/paper/core/build.gradle.kts
@@ -9,6 +9,9 @@ repositories {
 
 dependencies {
     // local project includes
+    implementation(kotlin("stdlib"))
+    implementation(kotlin("reflect")) // Add this line
+
     implementation(project(":independent:independent-api"))
 
     implementation(project(":paper:paper-api"))
@@ -25,7 +28,7 @@ dependencies {
     compileOnly("net.luckperms:api:5.4")
     compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")
 
-    compileOnly("co.aikar:acf-paper:0.5.1-SNAPSHOT")
+    implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
     // final compilation libraries
     implementation("net.wesjd:anvilgui:1.9.0-SNAPSHOT")
     compileOnly("net.kyori:adventure-text-serializer-gson:4.10.1")
@@ -52,5 +55,3 @@ dependencies {
     compileOnly("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
     compileOnly("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
 }
-
-tasks["build"].dependsOn("shadowJar")
diff --git a/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt b/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt
@@ -67,6 +67,11 @@ import java.util.concurrent.TimeUnit
     ]
 )
 @HelperImplementationPlugin
+@MavenLibrary(
+    "javassist",
+    "javassist",
+    "3.12.1.GA"
+)
 @MavenLibrary(
     "net.kyori",
     "adventure-text-serializer-gson",

diff --git a/paper/nms/v1_12_R2/build.gradle.kts b/paper/nms/v1_12_R2/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+
+}
diff --git a/paper/nms/v1_8_R8/build.gradle.kts b/paper/nms/v1_8_R8/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+
+}
diff --git a/velocity/api/build.gradle.kts b/velocity/api/build.gradle.kts
@@ -1,11 +1,11 @@
 dependencies {
-    api(project(":independent:independent-api"))
+    compileOnly(project(":independent:independent-api"))
 
-    api("com.squareup.retrofit2:retrofit:2.9.0")
-    api("com.squareup.retrofit2:converter-gson:2.9.0")
-    api("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
+    compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
+    compileOnly("com.squareup.retrofit2:converter-gson:2.9.0")
+    compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
 
-    api("co.aikar:acf-core:0.5.1-SNAPSHOT")
+    compileOnly("co.aikar:acf-core:0.5.1-SNAPSHOT")
 
-    configurations.getByName("non-final")
+    //configurations.getByName("non-final")
 }
diff --git a/velocity/core/build.gradle.kts b/velocity/core/build.gradle.kts
@@ -13,5 +13,5 @@ dependencies {
     compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
     annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
 
-    configurations.getByName("final")
+    //configurations.getByName("final")
 }