-
Notifications
You must be signed in to change notification settings - Fork 0
Add canvas-plugin Gradle plugin module
#239
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
35 changes: 35 additions & 0 deletions
35
...in/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/canvas/CanvasPluginSurfPlugin.kt
This file contains hidden or 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,35 @@ | ||
| package dev.slne.surf.surfapi.gradle.platform.canvas | ||
|
|
||
| import dev.slne.surf.surfapi.gradle.generated.Constants | ||
| import dev.slne.surf.surfapi.gradle.platform.paper.plugin.AbstractPaperPluginSurfPlugin | ||
| import dev.slne.surf.surfapi.gradle.util.canvasMaven | ||
| import org.gradle.api.Project | ||
| import org.gradle.kotlin.dsl.dependencies | ||
| import org.gradle.kotlin.dsl.repositories | ||
| import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY | ||
|
|
||
| internal class CanvasPluginSurfPlugin : | ||
| AbstractPaperPluginSurfPlugin<CanvasSurfExtension>("canvasPlugin") { | ||
|
|
||
| override val extensionClass = CanvasSurfExtension::class.java | ||
|
|
||
| override fun Project.applyRepositories0() { | ||
| repositories { | ||
| canvasMaven() | ||
| } | ||
| } | ||
|
|
||
| override fun Project.configure0() { | ||
| dependencies { | ||
| add(COMPILE_ONLY, Constants.CANVAS_API) | ||
| } | ||
|
|
||
| // Canvas provides the org.bukkit:bukkit capability (as a Paper fork), so we resolve | ||
| // any capability conflict in favour of canvas-api over paper-api or plain bukkit. | ||
| configurations.all { | ||
| resolutionStrategy.capabilitiesResolution.withCapability("org.bukkit:bukkit") { | ||
| select(Constants.CANVAS_API) | ||
| } | ||
| } | ||
| } | ||
| } |
13 changes: 13 additions & 0 deletions
13
...lugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/canvas/CanvasSurfExtension.kt
This file contains hidden or 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,13 @@ | ||
| package dev.slne.surf.surfapi.gradle.platform.canvas | ||
|
|
||
| import dev.slne.surf.surfapi.gradle.platform.paper.plugin.PaperPluginSurfExtension | ||
| import org.gradle.api.model.ObjectFactory | ||
| import javax.inject.Inject | ||
|
|
||
| open class CanvasSurfExtension @Inject constructor(objects: ObjectFactory) : | ||
| PaperPluginSurfExtension(objects) { | ||
|
|
||
| init { | ||
| foliaSupported.convention(true) | ||
| } | ||
| } |
102 changes: 102 additions & 0 deletions
102
...otlin/dev/slne/surf/surfapi/gradle/platform/paper/plugin/AbstractPaperPluginSurfPlugin.kt
This file contains hidden or 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,102 @@ | ||
| package dev.slne.surf.surfapi.gradle.platform.paper.plugin | ||
|
|
||
| import dev.slne.surf.surfapi.gradle.generated.Constants | ||
| import dev.slne.surf.surfapi.gradle.generators.LibrariesLoaderGenerator.generateLibrariesLoaderTask | ||
| import dev.slne.surf.surfapi.gradle.platform.paper.AbstractPaperSurfPlugin | ||
| import dev.slne.surf.surfapi.gradle.util.registerRequired | ||
| import net.minecrell.pluginyml.GeneratePluginDescription | ||
| import net.minecrell.pluginyml.paper.PaperPluginDescription | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.plugins.JavaPlugin | ||
| import org.gradle.api.tasks.SourceSet | ||
| import org.gradle.api.tasks.SourceSetContainer | ||
| import org.gradle.kotlin.dsl.configure | ||
| import org.gradle.kotlin.dsl.getByType | ||
| import org.gradle.kotlin.dsl.invoke | ||
| import org.gradle.kotlin.dsl.withType | ||
| import xyz.jpenilla.runpaper.task.RunServer | ||
|
|
||
| internal abstract class AbstractPaperPluginSurfPlugin<E : PaperPluginSurfExtension>(platformName: String) : | ||
| AbstractPaperSurfPlugin<E>(platformName) { | ||
|
|
||
| init { | ||
| addRelocationsForDependency( | ||
| "surf-data-api", | ||
| "com.fasterxml.jackson" to "dev.slne.data.libs.jackson" | ||
| ) | ||
| } | ||
|
|
||
| private val paperPlugins = listOf( | ||
| "xyz.jpenilla.run-paper", | ||
| "de.eldoria.plugin-yml.paper" | ||
| ) | ||
|
|
||
| override fun Project.afterEvaluated1(extension: E) { | ||
| val generateLoaderTask = generateLibrariesLoaderTask( | ||
| extension.mainClass.get().substringBeforeLast('.') | ||
| ) | ||
|
|
||
| configure<PaperPluginDescription> { | ||
| authors = extension.authors.get() | ||
| main = extension.mainClass.get() | ||
| bootstrapper = extension.bootstrapper.orNull | ||
| apiVersion = Constants.MINECRAFT_VERSION | ||
| foliaSupported = extension.foliaSupported.get() | ||
|
|
||
| if (extension.generateLibraryLoader.get()) { | ||
| generateLibrariesJson = true | ||
| loader = generateLoaderTask.get().loaderLocation() | ||
| } | ||
|
|
||
| bootstrapDependencies { | ||
| registerRequired("surf-bukkit-api") | ||
|
|
||
| if (extension.withSurfRedis.get() && !extension.surfRedisRelocation.isPresent) { | ||
| registerRequired("surf-redis-paper") | ||
| } | ||
|
|
||
| extension.bootstrapDependencies.orNull?.execute(this) | ||
| } | ||
|
|
||
| serverDependencies { | ||
| registerRequired("surf-bukkit-api") | ||
| if (extension.coreModule.isPresent) { | ||
| registerRequired("surf-core-paper") | ||
| } | ||
|
|
||
| if (extension.withSurfRedis.get() && !extension.surfRedisRelocation.isPresent) { | ||
| registerRequired("surf-redis-paper") | ||
| } | ||
|
|
||
| extension.serverDependencies.orNull?.execute(this) | ||
| } | ||
| } | ||
|
|
||
| if (extension.generateLibraryLoader.get()) { | ||
| plugins.withType<JavaPlugin> { | ||
| extensions.getByType<SourceSetContainer>().named(SourceSet.MAIN_SOURCE_SET_NAME) { | ||
| java.srcDir(generateLoaderTask.map { it.outputDirectory.get() }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| tasks { | ||
| withType<GeneratePluginDescription> { | ||
| useDefaultCentralProxy() | ||
| } | ||
|
|
||
| withType<RunServer> { | ||
| minecraftVersion(Constants.MINECRAFT_VERSION) | ||
|
|
||
| extension.runServer.orNull?.execute(this) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun Project.applyPlugins0() { | ||
| paperPlugins.forEach { plugin -> | ||
| applyPlugin(plugin) | ||
| } | ||
| } | ||
| } |
99 changes: 1 addition & 98 deletions
99
...c/main/kotlin/dev/slne/surf/surfapi/gradle/platform/paper/plugin/PaperPluginSurfPlugin.kt
This file contains hidden or 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 |
|---|---|---|
| @@ -1,104 +1,7 @@ | ||
| package dev.slne.surf.surfapi.gradle.platform.paper.plugin | ||
|
|
||
| import dev.slne.surf.surfapi.gradle.generated.Constants | ||
| import dev.slne.surf.surfapi.gradle.generators.LibrariesLoaderGenerator.generateLibrariesLoaderTask | ||
| import dev.slne.surf.surfapi.gradle.platform.paper.AbstractPaperSurfPlugin | ||
| import dev.slne.surf.surfapi.gradle.util.registerRequired | ||
| import net.minecrell.pluginyml.GeneratePluginDescription | ||
| import net.minecrell.pluginyml.paper.PaperPluginDescription | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.plugins.JavaPlugin | ||
| import org.gradle.api.tasks.SourceSet | ||
| import org.gradle.api.tasks.SourceSetContainer | ||
| import org.gradle.kotlin.dsl.configure | ||
| import org.gradle.kotlin.dsl.getByType | ||
| import org.gradle.kotlin.dsl.invoke | ||
| import org.gradle.kotlin.dsl.withType | ||
| import xyz.jpenilla.runpaper.task.RunServer | ||
|
|
||
| internal class PaperPluginSurfPlugin : | ||
| AbstractPaperSurfPlugin<PaperPluginSurfExtension>("paperPlugin") { | ||
| AbstractPaperPluginSurfPlugin<PaperPluginSurfExtension>("paperPlugin") { | ||
|
|
||
| override val extensionClass = PaperPluginSurfExtension::class.java | ||
|
|
||
| init { | ||
| addRelocationsForDependency( | ||
| "surf-data-api", | ||
| "com.fasterxml.jackson" to "dev.slne.data.libs.jackson" | ||
| ) | ||
| } | ||
|
|
||
| private val paperPlugins = listOf( | ||
| "xyz.jpenilla.run-paper", | ||
| "de.eldoria.plugin-yml.paper" | ||
| ) | ||
|
|
||
| override fun Project.afterEvaluated1(extension: PaperPluginSurfExtension) { | ||
| val generateLoaderTask = generateLibrariesLoaderTask( | ||
| extension.mainClass.get().substringBeforeLast('.') | ||
| ) | ||
|
|
||
| configure<PaperPluginDescription> { | ||
| authors = extension.authors.get() | ||
| main = extension.mainClass.get() | ||
| bootstrapper = extension.bootstrapper.orNull | ||
| apiVersion = Constants.MINECRAFT_VERSION | ||
| foliaSupported = extension.foliaSupported.get() | ||
|
|
||
| if (extension.generateLibraryLoader.get()) { | ||
| generateLibrariesJson = true | ||
| loader = generateLoaderTask.get().loaderLocation() | ||
| } | ||
|
|
||
| bootstrapDependencies { | ||
| registerRequired("surf-bukkit-api") | ||
|
|
||
| if (extension.withSurfRedis.get() && !extension.surfRedisRelocation.isPresent) { | ||
| registerRequired("surf-redis-paper") | ||
| } | ||
|
|
||
| extension.bootstrapDependencies.orNull?.execute(this) | ||
| } | ||
|
|
||
| serverDependencies { | ||
| registerRequired("surf-bukkit-api") | ||
| if (extension.coreModule.isPresent) { | ||
| registerRequired("surf-core-paper") | ||
| } | ||
|
|
||
| if (extension.withSurfRedis.get() && !extension.surfRedisRelocation.isPresent) { | ||
| registerRequired("surf-redis-paper") | ||
| } | ||
|
|
||
| extension.serverDependencies.orNull?.execute(this) | ||
| } | ||
| } | ||
|
|
||
| if (extension.generateLibraryLoader.get()) { | ||
| plugins.withType<JavaPlugin> { | ||
| extensions.getByType<SourceSetContainer>().named(SourceSet.MAIN_SOURCE_SET_NAME) { | ||
| java.srcDir(generateLoaderTask.map { it.outputDirectory.get() }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| tasks { | ||
| withType<GeneratePluginDescription> { | ||
| useDefaultCentralProxy() | ||
| } | ||
|
|
||
| withType<RunServer> { | ||
| minecraftVersion(Constants.MINECRAFT_VERSION) | ||
|
|
||
| extension.runServer.orNull?.execute(this) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun Project.applyPlugins0() { | ||
| paperPlugins.forEach { plugin -> | ||
| applyPlugin(plugin) | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.