mirror of
https://github.com/GayPizzaSpecifications/concrete.git
synced 2025-08-05 14:11:34 +00:00
Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
4f82639658
|
|||
5429dcddd5
|
|||
1a968a6489
|
|||
aa2750bdc0
|
|||
075cd169bb
|
|||
d561146024
|
|||
900b430e58
|
|||
4cec9a74a9
|
|||
bb3d3cb6bc
|
|||
3042512a92
|
|||
6d6a71b4f8
|
|||
2a38525180
|
|||
b910e3b2ff
|
|||
89664eb5d7
|
|||
aaf15e5270
|
|||
353f62dfc8
|
|||
e6f1efb346
|
|||
df8f755ff7
|
|||
0478616f34
|
|||
43d76cfb96
|
|||
0d60664838
|
|||
02abbabb08
|
@ -5,4 +5,3 @@ Concrete is a Gradle plugin for Bukkit projects. Originally spawned out of the G
|
||||
## Contributors
|
||||
|
||||
- [@azenla](https://github.com/azenla)
|
||||
- [@kubeliv](https://github.com/kubeliv)
|
||||
|
@ -9,7 +9,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "gay.pizza.foundation"
|
||||
version = "0.11.0"
|
||||
version = "0.16.0"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
@ -17,9 +17,9 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
|
||||
implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.10")
|
||||
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
|
||||
implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.21")
|
||||
implementation("com.github.johnrengelman:shadow:8.1.1")
|
||||
implementation("com.google.code.gson:gson:2.10.1")
|
||||
|
||||
// Implementation of crypto used in smart downloader.
|
||||
@ -36,7 +36,7 @@ gradlePlugin {
|
||||
implementationClass = "gay.pizza.foundation.concrete.ConcreteRootPlugin"
|
||||
|
||||
displayName = "Concrete Root"
|
||||
description = "Concrete project root."
|
||||
description = "Gradle conventions for Foundation Bukkit plugins. Root project plugin."
|
||||
}
|
||||
|
||||
create("concrete-base") {
|
||||
@ -44,7 +44,7 @@ gradlePlugin {
|
||||
implementationClass = "gay.pizza.foundation.concrete.ConcreteBasePlugin"
|
||||
|
||||
displayName = "Concrete Base"
|
||||
description = "Concrete project base."
|
||||
description = "Gradle conventions for Foundation Bukkit plugins. Base project plugin."
|
||||
}
|
||||
|
||||
create("concrete-library") {
|
||||
@ -52,7 +52,7 @@ gradlePlugin {
|
||||
implementationClass = "gay.pizza.foundation.concrete.ConcreteLibraryPlugin"
|
||||
|
||||
displayName = "Concrete Library"
|
||||
description = "Concrete project library."
|
||||
description = "Gradle conventions for Foundation Bukkit plugins. Library project plugin."
|
||||
}
|
||||
|
||||
create("concrete-plugin") {
|
||||
@ -60,7 +60,7 @@ gradlePlugin {
|
||||
implementationClass = "gay.pizza.foundation.concrete.ConcretePluginPlugin"
|
||||
|
||||
displayName = "Concrete Library"
|
||||
description = "Concrete project plugin."
|
||||
description = "Gradle conventions for Foundation Bukkit plugins. Plugin project plugin."
|
||||
}
|
||||
|
||||
forEach { declaration ->
|
||||
@ -128,7 +128,7 @@ publishing {
|
||||
}
|
||||
|
||||
tasks.withType<Wrapper> {
|
||||
gradleVersion = "7.6"
|
||||
gradleVersion = "8.1.1"
|
||||
}
|
||||
|
||||
java {
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
4
gradlew
vendored
4
gradlew
vendored
@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
@ -2,9 +2,10 @@ plugins {
|
||||
id("gay.pizza.foundation.concrete-root")
|
||||
}
|
||||
|
||||
concrete {
|
||||
concreteRoot {
|
||||
minecraftServerPath.set("server")
|
||||
paperServerVersionGroup.set("1.19")
|
||||
paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")
|
||||
acceptServerEula.set(true)
|
||||
expansiveItemInclusion.set(true)
|
||||
}
|
||||
|
@ -6,3 +6,7 @@ dependencies {
|
||||
implementation(project(":other-library"))
|
||||
implementation(project(":bukkit-plugins:common-library"))
|
||||
}
|
||||
|
||||
concreteItem {
|
||||
dependency(project(":bukkit-plugins:goodbye-world"))
|
||||
}
|
||||
|
BIN
samples/mixed/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
samples/mixed/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,5 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
12
samples/mixed/gradlew
vendored
12
samples/mixed/gradlew
vendored
@ -55,7 +55,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -80,10 +80,10 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
@ -143,12 +143,16 @@ fi
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
1
samples/mixed/gradlew.bat
vendored
1
samples/mixed/gradlew.bat
vendored
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
|
@ -1,3 +1,10 @@
|
||||
plugins {
|
||||
id("gay.pizza.foundation.concrete-base")
|
||||
}
|
||||
|
||||
concreteItem {
|
||||
type.set("library")
|
||||
fileInclusion {
|
||||
tasks.jar.get().outputs.files.associateWith { "library-jar" }
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ plugins {
|
||||
id("gay.pizza.foundation.concrete-plugin")
|
||||
}
|
||||
|
||||
concrete {
|
||||
concreteRoot {
|
||||
minecraftServerPath.set("server")
|
||||
paperServerVersionGroup.set("1.19")
|
||||
paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")
|
||||
|
BIN
samples/shared/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
samples/shared/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,5 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
12
samples/shared/gradlew
vendored
12
samples/shared/gradlew
vendored
@ -55,7 +55,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -80,10 +80,10 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
@ -143,12 +143,16 @@ fi
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
1
samples/shared/gradlew.bat
vendored
1
samples/shared/gradlew.bat
vendored
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
|
@ -2,7 +2,7 @@ plugins {
|
||||
id("gay.pizza.foundation.concrete-root")
|
||||
}
|
||||
|
||||
concrete {
|
||||
concreteRoot {
|
||||
minecraftServerPath.set("server")
|
||||
paperServerVersionGroup.set("1.19")
|
||||
paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")
|
||||
|
BIN
samples/simple/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
samples/simple/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,5 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
12
samples/simple/gradlew
vendored
12
samples/simple/gradlew
vendored
@ -55,7 +55,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -80,10 +80,10 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
@ -143,12 +143,16 @@ fi
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
1
samples/simple/gradlew.bat
vendored
1
samples/simple/gradlew.bat
vendored
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
|
@ -4,6 +4,7 @@ import org.gradle.api.JavaVersion
|
||||
import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.plugins.JavaPluginExtension
|
||||
import org.gradle.kotlin.dsl.create
|
||||
import org.gradle.kotlin.dsl.getByType
|
||||
import org.gradle.kotlin.dsl.withType
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
@ -40,5 +41,7 @@ open class ConcreteBasePlugin : Plugin<Project> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
project.extensions.create<ConcreteItemExtension>("concreteItem")
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,21 @@
|
||||
package gay.pizza.foundation.concrete
|
||||
|
||||
import org.gradle.api.DomainObjectSet
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.provider.Property
|
||||
import java.io.File
|
||||
|
||||
interface ConcreteItemExtension {
|
||||
val type: Property<String>
|
||||
val version: Property<String>
|
||||
val dependencies: DomainObjectSet<Project>
|
||||
val fileInclusion: Property<() -> Map<File, String>>
|
||||
|
||||
fun dependency(project: Project) {
|
||||
dependencies.add(project)
|
||||
}
|
||||
|
||||
fun fileInclusion(inclusion: () -> Map<File, String>) {
|
||||
fileInclusion.set(inclusion)
|
||||
}
|
||||
}
|
@ -2,9 +2,10 @@ package gay.pizza.foundation.concrete
|
||||
|
||||
import org.gradle.api.provider.Property
|
||||
|
||||
interface ConcreteExtension {
|
||||
interface ConcreteRootExtension {
|
||||
val paperServerVersionGroup: Property<String>
|
||||
val paperApiVersion: Property<String>
|
||||
val minecraftServerPath: Property<String>
|
||||
val acceptServerEula: Property<Boolean>
|
||||
val expansiveItemInclusion: Property<Boolean>
|
||||
}
|
@ -9,7 +9,7 @@ import java.nio.file.Paths
|
||||
class ConcreteRootPlugin : Plugin<Project> {
|
||||
override fun apply(project: Project) {
|
||||
project.apply(plugin = "base")
|
||||
project.extensions.create<ConcreteExtension>("concrete")
|
||||
project.extensions.create<ConcreteRootExtension>("concreteRoot")
|
||||
val setupPaperServer = project.tasks.create<SetupPaperServer>("setupPaperServer")
|
||||
val runPaperServer = project.tasks.create<RunPaperServer>("runPaperServer")
|
||||
runPaperServer.dependsOn(setupPaperServer)
|
||||
|
@ -0,0 +1,55 @@
|
||||
package gay.pizza.foundation.concrete
|
||||
|
||||
/**
|
||||
* The extensible update manifest format.
|
||||
*/
|
||||
data class ExtensibleManifest(
|
||||
/**
|
||||
* The items the manifest describes.
|
||||
*/
|
||||
val items: List<ExtensibleManifestItem>
|
||||
)
|
||||
|
||||
/**
|
||||
* An item in the update manifest.
|
||||
*/
|
||||
data class ExtensibleManifestItem(
|
||||
/**
|
||||
* The name of the item.
|
||||
*/
|
||||
val name: String,
|
||||
/**
|
||||
* The type of item.
|
||||
*/
|
||||
val type: String,
|
||||
/**
|
||||
* The version of the item.
|
||||
*/
|
||||
val version: String,
|
||||
/**
|
||||
* The dependencies of the item.
|
||||
*/
|
||||
val dependencies: List<String>,
|
||||
/**
|
||||
* The files that are required to install the item.
|
||||
*/
|
||||
val files: List<ExtensibleManifestItemFile>
|
||||
)
|
||||
|
||||
/**
|
||||
* A file built from the item.
|
||||
*/
|
||||
data class ExtensibleManifestItemFile(
|
||||
/**
|
||||
* The name of the file.
|
||||
*/
|
||||
val name: String,
|
||||
/**
|
||||
* A type of file.
|
||||
*/
|
||||
val type: String,
|
||||
/**
|
||||
* The relative path to download the file.
|
||||
*/
|
||||
val path: String
|
||||
)
|
@ -1,7 +1,9 @@
|
||||
package gay.pizza.foundation.concrete
|
||||
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.GsonBuilder
|
||||
|
||||
object Globals {
|
||||
val gson = Gson()
|
||||
val gsonPretty: Gson = GsonBuilder().setPrettyPrinting().create()
|
||||
val gson: Gson = Gson()
|
||||
}
|
||||
|
@ -11,7 +11,7 @@ open class RunPaperServer : RunMinecraftServer() {
|
||||
|
||||
@Internal
|
||||
override fun getServerDirectory(): File {
|
||||
val concrete = project.extensions.getByType<ConcreteExtension>()
|
||||
val concrete = project.extensions.getByType<ConcreteRootExtension>()
|
||||
return project.file(concrete.minecraftServerPath.get())
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@ abstract class SetupMinecraftServer : DefaultTask() {
|
||||
Files.createSymbolicLink(pluginLinkFile.toPath(), pluginJarFile.toPath())
|
||||
}
|
||||
|
||||
val concrete = project.extensions.getByType<ConcreteExtension>()
|
||||
val concrete = project.extensions.getByType<ConcreteRootExtension>()
|
||||
if (concrete.acceptServerEula.isPresent && concrete.acceptServerEula.get()) {
|
||||
val writer = minecraftServerDirectory.resolve("eula.txt").bufferedWriter()
|
||||
val properties = Properties()
|
||||
|
@ -18,7 +18,7 @@ open class SetupPaperServer : SetupMinecraftServer() {
|
||||
|
||||
@TaskAction
|
||||
fun setupPaperServer() {
|
||||
val concrete = project.extensions.getByType<ConcreteExtension>()
|
||||
val concrete = project.extensions.getByType<ConcreteRootExtension>()
|
||||
val minecraftServerDirectory = getServerDirectory()
|
||||
val paperJarFile = project.file("${minecraftServerDirectory}/paper.jar")
|
||||
if (!paperJarFile.exists() || shouldUpdatePaperServer) {
|
||||
@ -50,7 +50,7 @@ open class SetupPaperServer : SetupMinecraftServer() {
|
||||
|
||||
@Internal
|
||||
override fun getServerDirectory(): File {
|
||||
val concrete = project.extensions.getByType<ConcreteExtension>()
|
||||
val concrete = project.extensions.getByType<ConcreteRootExtension>()
|
||||
return project.file(concrete.minecraftServerPath.get())
|
||||
}
|
||||
}
|
||||
|
@ -1,9 +1,13 @@
|
||||
package gay.pizza.foundation.concrete
|
||||
|
||||
import java.net.URI
|
||||
import java.nio.file.Files
|
||||
import java.net.http.HttpClient
|
||||
import java.net.http.HttpRequest
|
||||
import java.net.http.HttpResponse.BodyHandlers
|
||||
import java.nio.file.Path
|
||||
import java.security.MessageDigest
|
||||
import kotlin.io.path.exists
|
||||
import kotlin.io.path.inputStream
|
||||
|
||||
class SmartDownloader(
|
||||
private val localFilePath: Path,
|
||||
@ -20,23 +24,25 @@ class SmartDownloader(
|
||||
}
|
||||
|
||||
private fun downloadRemoteFile() {
|
||||
val url = remoteDownloadUrl.toURL()
|
||||
val remoteFileStream = url.openStream()
|
||||
val localFileStream = Files.newOutputStream(localFilePath)
|
||||
remoteFileStream.transferTo(localFileStream)
|
||||
val httpClient = HttpClient.newHttpClient()
|
||||
val request = HttpRequest.newBuilder()
|
||||
.GET()
|
||||
.uri(remoteDownloadUrl)
|
||||
.build()
|
||||
httpClient.send(request, BodyHandlers.ofFile(localFilePath))
|
||||
val hashResult = checkLocalFileHash()
|
||||
if (hashResult != HashResult.ValidHash) {
|
||||
throw RuntimeException("Download of $remoteDownloadUrl did not result in valid hash.")
|
||||
throw RuntimeException("Download of $remoteDownloadUrl did not result in a valid hash.")
|
||||
}
|
||||
}
|
||||
|
||||
private fun checkLocalFileHash(): HashResult {
|
||||
if (!Files.exists(localFilePath)) {
|
||||
if (!localFilePath.exists()) {
|
||||
return HashResult.DoesNotExist
|
||||
}
|
||||
|
||||
val digest = MessageDigest.getInstance("SHA-256")
|
||||
val localFileStream = Files.newInputStream(localFilePath)
|
||||
val localFileStream = localFilePath.inputStream()
|
||||
val buffer = ByteArray(16 * 1024)
|
||||
|
||||
while (true) {
|
||||
|
@ -4,15 +4,22 @@ import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.tasks.TaskAction
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import kotlin.io.path.name
|
||||
import kotlin.io.path.relativeTo
|
||||
|
||||
open class UpdateManifestTask : DefaultTask() {
|
||||
@TaskAction
|
||||
fun update() {
|
||||
val manifestsDir = ensureManifestsDirectory()
|
||||
val updateFile = manifestsDir.resolve("update.json")
|
||||
val rootPath = project.rootProject.rootDir.toPath()
|
||||
val updateManifest = project.findPluginProjects().mapNotNull { project ->
|
||||
val paths = project.shadowJarOutputs!!.allFilesRelativeToPath(rootPath)
|
||||
val rootExtension = project.concreteRootExtension
|
||||
val rootPath = if (rootExtension.expansiveItemInclusion.orNull == true) {
|
||||
project.rootProject.rootDir
|
||||
} else {
|
||||
project.rootDir
|
||||
}
|
||||
val legacyUpdateManifest = project.findPluginProjects().mapNotNull { project ->
|
||||
val paths = project.shadowJarOutputs!!.files.allFilesRelativeToPath(rootPath.toPath())
|
||||
|
||||
if (paths.isNotEmpty()) {
|
||||
project.name to mapOf(
|
||||
"version" to project.version,
|
||||
@ -21,7 +28,40 @@ open class UpdateManifestTask : DefaultTask() {
|
||||
} else null
|
||||
}.toMap()
|
||||
|
||||
Files.writeString(updateFile, Globals.gson.toJson(updateManifest))
|
||||
val legacyUpdateFile = manifestsDir.resolve("update.json")
|
||||
Files.writeString(legacyUpdateFile, Globals.gson.toJson(legacyUpdateManifest))
|
||||
|
||||
val extensibleUpdateManifestItems = project.findItemProjects().map { project ->
|
||||
val concreteItemExtension = project.concreteItemExtension!!
|
||||
val pathInclusion = concreteItemExtension.fileInclusion.orNull ?: {
|
||||
project.shadowJarOutputs!!.files.associateWith { "plugin-jar" }
|
||||
}
|
||||
val paths = pathInclusion()
|
||||
|
||||
val dependencies = concreteItemExtension.dependencies.map { it.name }
|
||||
|
||||
ExtensibleManifestItem(
|
||||
name = project.name,
|
||||
type = concreteItemExtension.type.orNull ?: "bukkit-plugin",
|
||||
version = concreteItemExtension.version.orNull ?: project.version.toString(),
|
||||
dependencies = dependencies,
|
||||
files = paths.map { (path, type) ->
|
||||
ExtensibleManifestItemFile(
|
||||
name = path.name,
|
||||
type = type,
|
||||
path = path.toPath().relativeTo(rootPath.toPath()).toUnixString()
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
val extensibleUpdateManifest = ExtensibleManifest(
|
||||
items = extensibleUpdateManifestItems
|
||||
)
|
||||
|
||||
val extensibleUpdateManifestFile = manifestsDir.resolve("manifest.json")
|
||||
Files.writeString(
|
||||
extensibleUpdateManifestFile, Globals.gsonPretty.toJson(extensibleUpdateManifest) + "\n")
|
||||
}
|
||||
|
||||
private fun ensureManifestsDirectory(): Path {
|
||||
|
@ -4,6 +4,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.tasks.TaskContainer
|
||||
import org.gradle.api.tasks.TaskOutputs
|
||||
import java.io.File
|
||||
import java.nio.file.FileSystems
|
||||
import java.nio.file.Path
|
||||
|
||||
@ -12,11 +13,30 @@ import java.nio.file.Path
|
||||
*/
|
||||
internal fun Project.isPluginProject() = plugins.hasPlugin(ConcretePluginPlugin::class.java)
|
||||
|
||||
/**
|
||||
* Checks if the project has the [ConcreteBasePlugin] applied and is opting into item behavior.
|
||||
*/
|
||||
internal fun Project.isConcreteItem() =
|
||||
isPluginProject() || concreteItemExtension?.type?.orNull != null
|
||||
|
||||
/**
|
||||
* Finds all projects in the project's hierarchy that are plugins.
|
||||
*/
|
||||
internal fun Project.findPluginProjects() = allprojects.filter { project -> project.isPluginProject() }
|
||||
|
||||
/**
|
||||
* Finds all projects in the project's hierarchy that are items.
|
||||
*/
|
||||
internal fun Project.findItemProjects(): List<Project> {
|
||||
val optInExpansion = concreteRootExtension.expansiveItemInclusion.orNull ?: false
|
||||
val searchScope = if (optInExpansion) {
|
||||
project.rootProject.allprojects
|
||||
} else {
|
||||
allprojects
|
||||
}
|
||||
return searchScope.filter { project -> project.isConcreteItem() }
|
||||
}
|
||||
|
||||
internal fun TaskContainer.addTaskDependency(dependent: String, dependency: String) {
|
||||
getByName(dependent).dependsOn(getByName(dependency))
|
||||
}
|
||||
@ -30,20 +50,23 @@ internal val Project.shadowJarTask: ShadowJar?
|
||||
internal val Project.shadowJarOutputs: TaskOutputs?
|
||||
get() = shadowJarTask?.outputs
|
||||
|
||||
internal val Project.concreteRootExtension: ConcreteExtension
|
||||
internal val Project.concreteRootExtension: ConcreteRootExtension
|
||||
get() = findTargetParent(
|
||||
valid = { extensions.findByType(ConcreteExtension::class.java) != null },
|
||||
extract = { extensions.findByType(ConcreteExtension::class.java)!! },
|
||||
valid = { extensions.findByType(ConcreteRootExtension::class.java) != null },
|
||||
extract = { extensions.findByType(ConcreteRootExtension::class.java)!! },
|
||||
error = { "Failed to find concrete root. Did you apply the concrete root plugin?" }
|
||||
)
|
||||
|
||||
internal val Project.concreteItemExtension: ConcreteItemExtension?
|
||||
get() = extensions.findByType(ConcreteItemExtension::class.java)
|
||||
|
||||
/**
|
||||
* Finds the concrete root project, which is the first project in the project hierarchy
|
||||
* that has the concrete extension.
|
||||
*/
|
||||
internal val Project.concreteRootProject: Project
|
||||
get() = findTargetParent(
|
||||
valid = { extensions.findByType(ConcreteExtension::class.java) != null },
|
||||
valid = { extensions.findByType(ConcreteRootExtension::class.java) != null },
|
||||
extract = { this },
|
||||
error = { "Failed to find concrete root. Did you apply the concrete root plugin?" }
|
||||
)
|
||||
@ -65,6 +88,6 @@ internal fun <T> Project.findTargetParent(valid: Project.() -> Boolean, extract:
|
||||
throw RuntimeException(error())
|
||||
}
|
||||
|
||||
internal fun TaskOutputs.allFilesRelativeToPath(root: Path): List<Path> = files.map { root.relativize(it.toPath()) }
|
||||
internal fun Iterable<File>.allFilesRelativeToPath(root: Path): List<Path> = map { root.relativize(it.toPath()) }
|
||||
|
||||
internal fun Path.toUnixString() = toString().replace(FileSystems.getDefault().separator, "/")
|
||||
|
9
tools/build-samples.sh
Executable file
9
tools/build-samples.sh
Executable file
@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
cd "$(dirname "${0}")/.."
|
||||
for SAMPLE_PATH in samples/*
|
||||
do
|
||||
pushd "${SAMPLE_PATH}" > /dev/null
|
||||
./gradlew -q build
|
||||
popd > /dev/null
|
||||
done
|
Reference in New Issue
Block a user