-
-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rework addon metadata and library loading
- Switched from addon.yml to addon_metadata.json + addon_libraries.json - Reworked addon (library) class loading to fix some issues
- Loading branch information
1 parent
8a45edd
commit f482562
Showing
13 changed files
with
253 additions
and
324 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
nova-gradle-plugin/src/main/kotlin/xyz/xenondevs/novagradle/task/AddonMetadataTask.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| package xyz.xenondevs.novagradle.task | ||
|
|
||
| import com.google.gson.JsonArray | ||
| import com.google.gson.JsonObject | ||
| import org.gradle.api.DefaultTask | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.artifacts.ExcludeRule | ||
| import org.gradle.api.artifacts.ExternalModuleDependency | ||
| import org.gradle.api.artifacts.repositories.MavenArtifactRepository | ||
| import org.gradle.api.internal.artifacts.repositories.DefaultMavenLocalArtifactRepository | ||
| import org.gradle.api.provider.ListProperty | ||
| import org.gradle.api.provider.Property | ||
| import org.gradle.api.tasks.Input | ||
| import org.gradle.api.tasks.TaskAction | ||
| import org.gradle.internal.component.external.model.DefaultModuleComponentIdentifier | ||
| import org.gradle.jvm.tasks.Jar | ||
| import xyz.xenondevs.commons.gson.toJsonArray | ||
| import xyz.xenondevs.commons.gson.writeToFile | ||
| import xyz.xenondevs.novagradle.util.TaskUtils | ||
| import java.nio.file.FileSystems | ||
|
|
||
| abstract class AddonMetadataTask : DefaultTask() { | ||
|
|
||
| @get:Input | ||
| abstract val id: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val addonName: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val version: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val novaVersion: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val main: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val authors: ListProperty<String> | ||
|
|
||
| @get:Input | ||
| abstract val depend: ListProperty<String> | ||
|
|
||
| @get:Input | ||
| abstract val softdepend: ListProperty<String> | ||
|
|
||
| @get:Input | ||
| abstract val jarTask: Property<Jar> | ||
|
|
||
| @TaskAction | ||
| fun run() { | ||
| FileSystems.newFileSystem(TaskUtils.getOutputFile(jarTask.get()).toPath()).use { | ||
| val root = it.rootDirectories.first() | ||
|
|
||
| val addonMetadataFile = root.resolve("addon_metadata.json") | ||
| createPluginMetadata().writeToFile(addonMetadataFile) | ||
|
|
||
| val addonLibrariesFile = root.resolve("addon_libraries.json") | ||
| createLibrariesJson(project, "nova", emptyList()).writeToFile(addonLibrariesFile) | ||
| } | ||
| } | ||
|
|
||
| private fun createPluginMetadata(): JsonObject { | ||
| return JsonObject().apply { | ||
| addProperty("id", id.get()) | ||
| addProperty("name", addonName.get()) | ||
| addProperty("version", version.get()) | ||
| addProperty("nova_version", novaVersion.get()) | ||
| addProperty("main", main.get()) | ||
| add("authors", authors.get().toJsonArray()) | ||
| add("depend", depend.get().toJsonArray()) | ||
| add("softdepend", softdepend.get().toJsonArray()) | ||
| } | ||
| } | ||
|
|
||
| @Suppress("SENSELESS_COMPARISON") // falsely interpreted as non-nullable | ||
| private fun createLibrariesJson(project: Project, configurationName: String, excludedConfigurationNames: List<String>): JsonObject { | ||
| val json = JsonObject() | ||
|
|
||
| // repositories | ||
| val repositories = JsonArray().also { json.add("repositories", it) } | ||
| project.repositories.asSequence() | ||
| .filterIsInstance<MavenArtifactRepository>() | ||
| .filter { it !is DefaultMavenLocalArtifactRepository } | ||
| .mapTo(LinkedHashSet()) { it.url.toString() } | ||
| .forEach(repositories::add) | ||
|
|
||
| // libraries and exclusions | ||
| val libraries = JsonArray().also { json.add("libraries", it) } | ||
| val configuration = project.configurations.getByName(configurationName) | ||
|
|
||
| fun writeExcludeRules(rules: Set<ExcludeRule>, excludes: JsonArray) { | ||
| rules.forEach { | ||
| require(it.group != null && it.module != null) { "Exclusion rules need to specify group and module" } | ||
| excludes.add("${it.group}:${it.module}") | ||
| } | ||
| } | ||
|
|
||
| configuration.incoming.dependencies.asSequence() | ||
| .filterIsInstance<ExternalModuleDependency>() | ||
| .forEach { dependency -> | ||
| val library = JsonObject().also(libraries::add) | ||
|
|
||
| library.addProperty("coords", getArtifactCoords(dependency)) | ||
| val excludeRules = dependency.excludeRules | ||
| writeExcludeRules(excludeRules, JsonArray().also { library.add("excludes", it) }) | ||
| } | ||
|
|
||
| val excludes = JsonArray().also { json.add("excludes", it) } | ||
| writeExcludeRules(configuration.excludeRules, excludes) | ||
| for (exclusionConfigurationName in excludedConfigurationNames) { | ||
| project.configurations.getByName(exclusionConfigurationName) | ||
| .incoming.artifacts.artifacts.asSequence() | ||
| .map { it.variant.owner } | ||
| .filterIsInstance<DefaultModuleComponentIdentifier>() | ||
| .forEach { excludes.add("${it.group}:${it.module}") } | ||
| } | ||
|
|
||
| return json | ||
| } | ||
|
|
||
| private fun getArtifactCoords(dependency: ExternalModuleDependency): String { | ||
| val artifact = dependency.artifacts.firstOrNull() | ||
| return if (artifact != null) | ||
| "${dependency.group}:${dependency.name}:${artifact.extension}:${artifact.classifier}:${dependency.version}" | ||
| else "${dependency.group}:${dependency.name}:${dependency.version}" | ||
| } | ||
|
|
||
| } |
111 changes: 0 additions & 111 deletions
111
nova-gradle-plugin/src/main/kotlin/xyz/xenondevs/novagradle/task/AddonTask.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.