6 Commits

Author SHA1 Message Date
3042512a92 v0.14.0 2023-03-13 16:27:02 -07:00
6d6a71b4f8 Fix bug in update manifest generation. 2023-03-13 16:26:30 -07:00
2a38525180 Begin work on v0.14.0-SNAPSHOT 2023-03-13 16:07:18 -07:00
b910e3b2ff v0.13.0 2023-03-13 16:06:41 -07:00
89664eb5d7 Switch to plugin {} for concrete plugin dependency sets. 2023-03-13 16:00:49 -07:00
aaf15e5270 Start on v0.13.0-SANPSHOT 2023-03-13 15:51:12 -07:00
7 changed files with 20 additions and 9 deletions

View File

@ -9,7 +9,7 @@ plugins {
} }
group = "gay.pizza.foundation" group = "gay.pizza.foundation"
version = "0.12.0" version = "0.14.0"
repositories { repositories {
mavenCentral() mavenCentral()

View File

@ -7,6 +7,6 @@ dependencies {
implementation(project(":bukkit-plugins:common-library")) implementation(project(":bukkit-plugins:common-library"))
} }
concrete { plugin {
dependency(project(":bukkit-plugins:goodbye-world")) dependency(project(":bukkit-plugins:goodbye-world"))
} }

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -9,7 +9,7 @@ class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() {
override fun apply(project: Project) { override fun apply(project: Project) {
super.apply(project) super.apply(project)
project.extensions.create("concrete", ConcretePluginExtension::class.java) project.extensions.create("plugin", ConcretePluginExtension::class.java)
project.plugins.apply("com.github.johnrengelman.shadow") project.plugins.apply("com.github.johnrengelman.shadow")

View File

@ -19,7 +19,7 @@ data class ExtensibleManifestItem(
*/ */
val name: String, val name: String,
/** /**
* The type of item, for example "bukkit-plugin" * The type of item.
*/ */
val type: String, val type: String,
/** /**
@ -33,7 +33,7 @@ data class ExtensibleManifestItem(
/** /**
* The files that are required to install the item. * The files that are required to install the item.
*/ */
val files: List<String> val files: List<ExtensibleManifestItemFile>
) )
/** /**
@ -45,7 +45,7 @@ data class ExtensibleManifestItemFile(
*/ */
val name: String, val name: String,
/** /**
* A type of file. For example: "plugin-jar". * A type of file.
*/ */
val type: String, val type: String,
/** /**

View File

@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskAction
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
import kotlin.io.path.name
open class UpdateManifestTask : DefaultTask() { open class UpdateManifestTask : DefaultTask() {
@TaskAction @TaskAction
@ -33,7 +34,17 @@ open class UpdateManifestTask : DefaultTask() {
type = "bukkit-plugin", type = "bukkit-plugin",
version = project.version.toString(), version = project.version.toString(),
dependencies = dependencies, dependencies = dependencies,
files = paths.map { it.toUnixString() } files = paths.map { path ->
var type = "unknown"
if (path.name.endsWith("-plugin.jar")) {
type = "plugin-jar"
}
ExtensibleManifestItemFile(
name = path.name,
type = type,
path = path.toUnixString()
)
}
) )
} }