Merge branch 'master' into feature/adventure-api

LunarClient · Aug 22, 2023 · f4ff0d7 · f4ff0d7
2 parents 39fb169 + d6c4ce3
commit f4ff0d7
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 23 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -10,6 +10,9 @@ dependencies {
 
     api(libs.geantyref)
 
+    "commonsCompileOnly"(libs.jetbrains.annotations)
+    "commonsCompileOnly"(libs.lombok)
+
     "bukkitCompileOnly"(libs.bukkit.api)
     "bukkitCompileOnly"(libs.bukkit)
 

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     implementation(libs.artifactregistry)
+    implementation(libs.idea)
     implementation(libs.spotless)
     implementation(libs.shadow)
 }

diff --git a/build-logic/src/main/kotlin/apollo.parent-conventions.gradle.kts b/build-logic/src/main/kotlin/apollo.parent-conventions.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    eclipse
+    id("org.jetbrains.gradle.plugin.idea-ext")
+}
+
+eclipse {
+    val shadowJar = tasks.getByPath(":apollo-api:shadowJar")
+    synchronizationTasks(shadowJar)
+}
+
+idea {
+    if(project != null) {
+        (project as ExtensionAware).extensions["settings"].run {
+            (this as ExtensionAware).extensions.getByType(org.jetbrains.gradle.ext.TaskTriggersConfig::class).run {
+                afterSync(":apollo-api:shadowJar")
+            }
+        }
+    }
+}
diff --git a/build-logic/src/main/kotlin/apollo.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/apollo.shadow-conventions.gradle.kts
@@ -8,13 +8,11 @@ plugins {
 tasks {
     jar {
         archiveClassifier.set("dev")
-//        archiveFileName.set("${project.name}-${project.version}-dev.jar")
     }
 
     val shadowJar = named<ShadowJar>("shadowJar") {
         archiveClassifier.set("")
         configureRelocations()
-//        archiveFileName.set("${project.name}-${project.version}.jar")
     }
 
     assemble {

diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt
@@ -6,44 +6,71 @@ import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.jvm.tasks.Jar
 import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.getValue
-import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.*
 
 fun JavaPluginExtension.javaTarget(version: Int) {
     toolchain.languageVersion.set(JavaLanguageVersion.of(version))
 }
 
 fun Project.createApiSources(vararg names: String) {
     extensions.configure<JavaPluginExtension> {
-        val mainSource by sourceSets.named("main")
-        val platformSources = mutableListOf(mainSource)
-        platformSources.addAll(names.map {
+        val commonsCompileOnly by configurations.register("commonsCompileOnly")
+
+        val main by sourceSets
+        names.forEach {
             sourceSets.register(it) {
                 java.setSrcDirs(setOf("src/$it/java"))
-                compileClasspath += mainSource.compileClasspath
-                runtimeClasspath += mainSource.runtimeClasspath
-                dependencies.add(implementationConfigurationName, objects.fileCollection().from(mainSource.output.classesDirs))
+
+                project.dependencies.add(this.implementationConfigurationName, main.output)
+
+                configurations.named(compileOnlyConfigurationName) {
+                    extendsFrom(commonsCompileOnly)
+                }
             }.get()
-        })
+        }
 
-        tasks.named<ShadowJar>("shadowJar") {
-            platformSources.forEach {
-                from(it.output)
+        sourceSets.configureEach {
+            val sourceSet = this
+            val sourceName = sourceSet.name
+            if (sourceName.equals("main")) return@configureEach
+
+            tasks.register("${sourceName}Jar", Jar::class.java) {
+                archiveClassifier.set(sourceName)
+                from(sourceSet.output)
             }
         }
 
-        tasks.named<Jar>("sourcesJar") {
-            platformSources.forEach {
-                from(it.allSource)
+        tasks.named<ShadowJar>("shadowJar") {
+            sourceSets.forEach {
+                val sourceName = it.name
+                val sourceJarName = if (sourceName.equals("main")) "sourcesJar" else "${sourceName}Jar"
+
+                val sourceJar by tasks.named<Jar>(sourceJarName)
+                from(sourceJar)
             }
         }
 
         tasks.named<Javadoc>("javadoc") {
-            source(platformSources.map { it.allJava })
-            classpath += platformSources.map { it.compileClasspath }.reduce { first, second -> first + second }
+            source(sourceSets.map { it.allJava })
+            classpath += sourceSets.map { it.compileClasspath }.reduce { first, second -> first + second }
         }
+
+//        tasks.named<ShadowJar>("shadowJar") {
+//            platformSources.forEach {
+//                from(it.output)
+//            }
+//        }
+//
+//        tasks.named<Jar>("sourcesJar") {
+//            platformSources.forEach {
+//                from(it.allSource)
+//            }
+//        }
+//
+//        tasks.named<Javadoc>("javadoc") {
+//            source(platformSources.map { it.allJava })
+//            classpath += platformSources.map { it.compileClasspath }.reduce { first, second -> first + second }
+//        }
     }
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,2 +1,5 @@
+plugins {
+    id("apollo.parent-conventions")
+}
 
 // Project metadata is configured in gradle.properties
diff --git a/bukkit-example/build.gradle.kts b/bukkit-example/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("apollo.base-conventions")
+    id("apollo.shadow-conventions")
 }
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ bukkit = "1.8.8-R0.1-SNAPSHOT"
 bungee = "1.19-R0.1-SNAPSHOT"
 configurate = "4.2.0-SNAPSHOT"
 geantyref = "1.3.11"
+idea = "1.1.7"
 jetbrains = "24.0.1"
 lombok = "1.18.26"
 protobuf = "1.0-SNAPSHOT"
@@ -46,6 +47,7 @@ velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocit
 artifactregistry = { module = "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin", version.ref = "artifactregistry" }
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "shadow" }
+idea = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "idea" }
 
 stylecheck = "ca.stellardrift:stylecheck:0.1"
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,7 +19,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {
-        maven("https://repo.lunarclient.dev")
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         maven("https://us-maven.pkg.dev/moonsworth-299m4oir/maven-public")