mirror of
https://github.com/GayPizzaSpecifications/concrete.git
synced 2025-08-03 13:11:33 +00:00
Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
2a9648c014 | |||
f91316fef3 | |||
d228685b59 | |||
610ba483ca | |||
61b1abd335 | |||
1a968a6489
|
|||
aa2750bdc0
|
|||
075cd169bb
|
|||
d561146024
|
|||
900b430e58
|
|||
4cec9a74a9
|
|||
bb3d3cb6bc
|
|||
3042512a92
|
|||
6d6a71b4f8
|
|||
2a38525180
|
14
.github/workflows/plugin.yml
vendored
14
.github/workflows/plugin.yml
vendored
@ -5,13 +5,13 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
|
||||
- name: Build with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: build
|
||||
run: ./gradlew build
|
||||
|
14
.github/workflows/portal.yml
vendored
14
.github/workflows/portal.yml
vendored
@ -8,13 +8,13 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
|
||||
- name: Publish with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: "publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PLUGIN_PUBLISHING_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PLUGIN_PUBLISHING_SECRET }}"
|
||||
run: "./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PLUGIN_PUBLISHING_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PLUGIN_PUBLISHING_SECRET }}"
|
||||
|
16
.github/workflows/publish.yml
vendored
16
.github/workflows/publish.yml
vendored
@ -8,16 +8,16 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
- name: Publish with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: publishAllPublicationsToGitHubPackagesRepository publishAllPublicationsToGitLabRepository
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew publishAllPublicationsToGitHubPackagesRepository publishAllPublicationsToGitLabRepository
|
||||
env:
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
GITLAB_TOKEN: "${{ secrets.GITLAB_TOKEN }}"
|
||||
|
16
.github/workflows/qodona.yml
vendored
16
.github/workflows/qodona.yml
vendored
@ -1,16 +0,0 @@
|
||||
name: Qodona
|
||||
on: [push]
|
||||
jobs:
|
||||
scan:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Qodana Scan
|
||||
uses: JetBrains/qodana-action@main
|
||||
env:
|
||||
QODANA_TOKEN: "${{ secrets.QODANA_TOKEN }}"
|
||||
- name: Upload CodeQL SARIF
|
||||
uses: github/codeql-action/upload-sarif@v2
|
||||
with:
|
||||
sarif_file: "${{ runner.temp }}/qodana/results/qodana.sarif.json"
|
22
.github/workflows/samples.yml
vendored
22
.github/workflows/samples.yml
vendored
@ -5,21 +5,17 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
|
||||
- name: Build mixed sample with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: -p samples/mixed build
|
||||
run: ./gradlew -p samples/mixed build
|
||||
- name: Build shared sample with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: -p samples/shared build
|
||||
run: ./gradlew -p samples/shared build
|
||||
- name: Build simple sample with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: -p samples/simple build
|
||||
run: ./gradlew -p samples/simple build
|
||||
|
@ -1,15 +1,16 @@
|
||||
@file:Suppress("UnstableApiUsage")
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
|
||||
plugins {
|
||||
`kotlin-dsl`
|
||||
|
||||
`maven-publish`
|
||||
`java-gradle-plugin`
|
||||
|
||||
id("com.gradle.plugin-publish") version "1.1.0"
|
||||
id("com.gradle.plugin-publish") version "1.3.1"
|
||||
}
|
||||
|
||||
group = "gay.pizza.foundation"
|
||||
version = "0.13.0"
|
||||
version = "0.17.0"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
@ -17,13 +18,13 @@ 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("com.google.code.gson:gson:2.10.1")
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
|
||||
implementation("org.jetbrains.kotlin:kotlin-serialization:2.1.20")
|
||||
implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.6")
|
||||
implementation("com.google.code.gson:gson:2.12.1")
|
||||
|
||||
// Implementation of crypto used in smart downloader.
|
||||
implementation("org.bouncycastle:bcprov-jdk15on:1.70")
|
||||
implementation("org.bouncycastle:bcprov-jdk18on:1.80")
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
@ -78,14 +79,14 @@ if (gradlePublishingKey != null && gradlePublishingSecret != null) {
|
||||
}
|
||||
|
||||
java {
|
||||
val version = JavaVersion.toVersion("17")
|
||||
val version = JavaVersion.toVersion("21")
|
||||
sourceCompatibility = version
|
||||
targetCompatibility = version
|
||||
}
|
||||
|
||||
tasks.compileKotlin {
|
||||
kotlinOptions {
|
||||
jvmTarget = "17"
|
||||
compilerOptions {
|
||||
jvmTarget.value(JvmTarget.JVM_21)
|
||||
}
|
||||
}
|
||||
|
||||
@ -128,7 +129,7 @@ publishing {
|
||||
}
|
||||
|
||||
tasks.withType<Wrapper> {
|
||||
gradleVersion = "8.0"
|
||||
gradleVersion = "8.13"
|
||||
}
|
||||
|
||||
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-8.0.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
7
gradlew
vendored
7
gradlew
vendored
@ -85,9 +85,6 @@ done
|
||||
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"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# 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"'
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
|
@ -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")
|
||||
paperServerVersionGroup.set("1.21")
|
||||
paperApiVersion.set("1.21.4-R0.1-SNAPSHOT")
|
||||
acceptServerEula.set(true)
|
||||
expansiveItemInclusion.set(true)
|
||||
}
|
||||
|
@ -7,6 +7,6 @@ dependencies {
|
||||
implementation(project(":bukkit-plugins:common-library"))
|
||||
}
|
||||
|
||||
plugin {
|
||||
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,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
33
samples/mixed/gradlew
vendored
33
samples/mixed/gradlew
vendored
@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -83,10 +85,8 @@ done
|
||||
# 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"'
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@ -133,10 +133,13 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
@ -144,7 +147,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=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@ -152,7 +155,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=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@ -197,11 +200,15 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
# 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"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
|
22
samples/mixed/gradlew.bat
vendored
22
samples/mixed/gradlew.bat
vendored
@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
@ -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,9 +3,9 @@ plugins {
|
||||
id("gay.pizza.foundation.concrete-plugin")
|
||||
}
|
||||
|
||||
concrete {
|
||||
concreteRoot {
|
||||
minecraftServerPath.set("server")
|
||||
paperServerVersionGroup.set("1.19")
|
||||
paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")
|
||||
paperServerVersionGroup.set("1.21")
|
||||
paperApiVersion.set("1.21.4-R0.1-SNAPSHOT")
|
||||
acceptServerEula.set(true)
|
||||
}
|
||||
|
BIN
samples/shared/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
samples/shared/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
33
samples/shared/gradlew
vendored
33
samples/shared/gradlew
vendored
@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -83,10 +85,8 @@ done
|
||||
# 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"'
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@ -133,10 +133,13 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
@ -144,7 +147,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=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@ -152,7 +155,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=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@ -197,11 +200,15 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
# 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"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
|
22
samples/shared/gradlew.bat
vendored
22
samples/shared/gradlew.bat
vendored
@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
@ -2,9 +2,9 @@ plugins {
|
||||
id("gay.pizza.foundation.concrete-root")
|
||||
}
|
||||
|
||||
concrete {
|
||||
concreteRoot {
|
||||
minecraftServerPath.set("server")
|
||||
paperServerVersionGroup.set("1.19")
|
||||
paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")
|
||||
paperServerVersionGroup.set("1.21")
|
||||
paperApiVersion.set("1.21.4-R0.1-SNAPSHOT")
|
||||
acceptServerEula.set(true)
|
||||
}
|
||||
|
BIN
samples/simple/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
samples/simple/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
33
samples/simple/gradlew
vendored
33
samples/simple/gradlew
vendored
@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -83,10 +85,8 @@ done
|
||||
# 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"'
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@ -133,10 +133,13 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
@ -144,7 +147,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=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@ -152,7 +155,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=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@ -197,11 +200,15 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
# 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"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
|
22
samples/simple/gradlew.bat
vendored
22
samples/simple/gradlew.bat
vendored
@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
@ -11,7 +11,7 @@ open class ConcreteBaseBukkitPlugin : ConcreteBasePlugin() {
|
||||
project.repositories {
|
||||
maven {
|
||||
name = "papermc"
|
||||
url = URI.create("https://papermc.io/repo/repository/maven-public/")
|
||||
url = URI.create("https://repo.papermc.io/repository/maven-public/")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4,8 +4,10 @@ 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.dsl.JvmTarget
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
open class ConcreteBasePlugin : Plugin<Project> {
|
||||
@ -28,17 +30,19 @@ open class ConcreteBasePlugin : Plugin<Project> {
|
||||
project.plugins.apply("org.jetbrains.kotlin.plugin.serialization")
|
||||
|
||||
project.extensions.getByType<JavaPluginExtension>().apply {
|
||||
val javaVersion = JavaVersion.toVersion(17)
|
||||
val javaVersion = JavaVersion.toVersion(21)
|
||||
sourceCompatibility = javaVersion
|
||||
targetCompatibility = javaVersion
|
||||
}
|
||||
|
||||
project.tasks.withType<KotlinCompile>().forEach {
|
||||
it.apply {
|
||||
kotlinOptions.apply {
|
||||
jvmTarget = "17"
|
||||
compilerOptions {
|
||||
jvmTarget.value(JvmTarget.JVM_21)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
package gay.pizza.foundation.concrete
|
||||
|
||||
import org.gradle.api.DomainObjectSet
|
||||
import org.gradle.api.Project
|
||||
|
||||
interface ConcretePluginExtension {
|
||||
val dependencies: DomainObjectSet<Project>
|
||||
|
||||
fun dependency(project: Project) {
|
||||
dependencies.add(project)
|
||||
}
|
||||
}
|
@ -4,14 +4,11 @@ import org.gradle.api.Project
|
||||
import org.gradle.kotlin.dsl.get
|
||||
import org.gradle.language.jvm.tasks.ProcessResources
|
||||
|
||||
@Suppress("UnstableApiUsage")
|
||||
class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() {
|
||||
override fun apply(project: Project) {
|
||||
super.apply(project)
|
||||
|
||||
project.extensions.create("plugin", ConcretePluginExtension::class.java)
|
||||
|
||||
project.plugins.apply("com.github.johnrengelman.shadow")
|
||||
project.plugins.apply("com.gradleup.shadow")
|
||||
|
||||
// During IDEA project import, if this code is active, it will print warnings.
|
||||
// This will make the VERSION field unexpanded if you run using the IntelliJ build system.
|
||||
|
@ -7,4 +7,5 @@ interface ConcreteRootExtension {
|
||||
val paperApiVersion: Property<String>
|
||||
val minecraftServerPath: Property<String>
|
||||
val acceptServerEula: Property<Boolean>
|
||||
val expansiveItemInclusion: Property<Boolean>
|
||||
}
|
||||
|
@ -4,14 +4,15 @@ import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.kotlin.dsl.apply
|
||||
import org.gradle.kotlin.dsl.create
|
||||
import org.gradle.kotlin.dsl.register
|
||||
import java.nio.file.Paths
|
||||
|
||||
class ConcreteRootPlugin : Plugin<Project> {
|
||||
override fun apply(project: Project) {
|
||||
project.apply(plugin = "base")
|
||||
project.extensions.create<ConcreteRootExtension>("concrete")
|
||||
val setupPaperServer = project.tasks.create<SetupPaperServer>("setupPaperServer")
|
||||
val runPaperServer = project.tasks.create<RunPaperServer>("runPaperServer")
|
||||
project.extensions.create<ConcreteRootExtension>("concreteRoot")
|
||||
val setupPaperServer = project.tasks.register<SetupPaperServer>("setupPaperServer").get()
|
||||
val runPaperServer = project.tasks.register<RunPaperServer>("runPaperServer").get()
|
||||
runPaperServer.dependsOn(setupPaperServer)
|
||||
|
||||
val maybeLocalServerPathString = project.properties["localMinecraftServerPath"]?.toString()
|
||||
@ -20,8 +21,8 @@ class ConcreteRootPlugin : Plugin<Project> {
|
||||
val localServerJarFileName = project.properties["localMinecraftServerJarFileName"]?.toString() ?: "server.jar"
|
||||
val currentWorkingDirectory = System.getProperty("user.dir")
|
||||
val localServerDirectory = Paths.get(currentWorkingDirectory).resolve(maybeLocalServerPathString).toFile()
|
||||
val setupLocalMinecraftServer = project.tasks.create<SetupLocalMinecraftServer>("setupLocalMinecraftServer")
|
||||
val runLocalMinecraftServer = project.tasks.create<RunLocalMinecraftServer>("runLocalMinecraftServer")
|
||||
val setupLocalMinecraftServer = project.tasks.register<SetupLocalMinecraftServer>("setupLocalMinecraftServer").get()
|
||||
val runLocalMinecraftServer = project.tasks.register<RunLocalMinecraftServer>("runLocalMinecraftServer").get()
|
||||
runLocalMinecraftServer.dependsOn(setupLocalMinecraftServer)
|
||||
|
||||
setupLocalMinecraftServer.minecraftServerDirectory = localServerDirectory
|
||||
@ -29,7 +30,7 @@ class ConcreteRootPlugin : Plugin<Project> {
|
||||
runLocalMinecraftServer.serverJarFileName = localServerJarFileName
|
||||
}
|
||||
|
||||
val updateManifests = project.tasks.create<UpdateManifestTask>("updateManifests")
|
||||
val updateManifests = project.tasks.register<UpdateManifestTask>("updateManifests")
|
||||
project.tasks.getByName("assemble").dependsOn(updateManifests)
|
||||
}
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ data class ExtensibleManifestItem(
|
||||
*/
|
||||
val name: String,
|
||||
/**
|
||||
* The type of item, for example "bukkit-plugin"
|
||||
* The type of item.
|
||||
*/
|
||||
val type: String,
|
||||
/**
|
||||
@ -33,7 +33,7 @@ data class ExtensibleManifestItem(
|
||||
/**
|
||||
* 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,
|
||||
/**
|
||||
* A type of file. For example: "plugin-jar".
|
||||
* A type of file.
|
||||
*/
|
||||
val type: String,
|
||||
/**
|
||||
|
@ -10,7 +10,7 @@ class PaperVersionClient(
|
||||
private val client: HttpClient = HttpClient.newHttpClient(),
|
||||
private val gson: Gson = Globals.gson
|
||||
) {
|
||||
private val apiBaseUrl = URI.create("https://papermc.io/api/v2/")
|
||||
private val apiBaseUrl = URI.create("https://api.papermc.io/v2/")
|
||||
|
||||
fun getVersionBuilds(group: String): List<PaperBuild> {
|
||||
val response = client.send(
|
||||
|
@ -1,9 +1,11 @@
|
||||
package gay.pizza.foundation.concrete
|
||||
|
||||
import org.gradle.api.tasks.Internal
|
||||
import org.gradle.process.ExecOperations
|
||||
import java.io.File
|
||||
import javax.inject.Inject
|
||||
|
||||
open class RunLocalMinecraftServer : RunMinecraftServer() {
|
||||
open class RunLocalMinecraftServer @Inject constructor(execOperations: ExecOperations) : RunMinecraftServer(execOperations) {
|
||||
@Internal
|
||||
lateinit var minecraftServerDirectory: File
|
||||
|
||||
|
@ -4,10 +4,12 @@ import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.tasks.Input
|
||||
import org.gradle.api.tasks.Internal
|
||||
import org.gradle.api.tasks.TaskAction
|
||||
import org.gradle.process.ExecOperations
|
||||
import java.io.File
|
||||
import java.util.jar.JarFile
|
||||
import javax.inject.Inject
|
||||
|
||||
abstract class RunMinecraftServer : DefaultTask() {
|
||||
abstract class RunMinecraftServer @Inject constructor(private var execOperations: ExecOperations) : DefaultTask() {
|
||||
init {
|
||||
outputs.upToDateWhen { false }
|
||||
}
|
||||
@ -24,7 +26,7 @@ abstract class RunMinecraftServer : DefaultTask() {
|
||||
val serverJarFile = minecraftServerDirectory.resolve(getServerJarName())
|
||||
val mainClassName = readMainClass(serverJarFile)
|
||||
|
||||
project.javaexec {
|
||||
execOperations.javaexec {
|
||||
classpath(serverJarFile.absolutePath)
|
||||
workingDir(minecraftServerDirectory)
|
||||
|
||||
|
@ -2,9 +2,11 @@ package gay.pizza.foundation.concrete
|
||||
|
||||
import org.gradle.api.tasks.Internal
|
||||
import org.gradle.kotlin.dsl.getByType
|
||||
import org.gradle.process.ExecOperations
|
||||
import java.io.File
|
||||
import javax.inject.Inject
|
||||
|
||||
open class RunPaperServer : RunMinecraftServer() {
|
||||
open class RunPaperServer @Inject constructor(execOperations: ExecOperations) : RunMinecraftServer(execOperations) {
|
||||
init {
|
||||
outputs.upToDateWhen { false }
|
||||
}
|
||||
|
@ -20,6 +20,7 @@ open class SetupPaperServer : SetupMinecraftServer() {
|
||||
fun setupPaperServer() {
|
||||
val concrete = project.extensions.getByType<ConcreteRootExtension>()
|
||||
val minecraftServerDirectory = getServerDirectory()
|
||||
minecraftServerDirectory.mkdirs()
|
||||
val paperJarFile = project.file("${minecraftServerDirectory}/paper.jar")
|
||||
if (!paperJarFile.exists() || shouldUpdatePaperServer) {
|
||||
downloadLatestBuild(concrete.paperServerVersionGroup.get(), paperJarFile)
|
||||
|
@ -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) {
|
||||
|
@ -2,16 +2,22 @@ package gay.pizza.foundation.concrete
|
||||
|
||||
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.relativeTo
|
||||
import kotlin.io.path.writeText
|
||||
|
||||
open class UpdateManifestTask : DefaultTask() {
|
||||
@TaskAction
|
||||
fun update() {
|
||||
val manifestsDir = ensureManifestsDirectory()
|
||||
val rootPath = project.projectDir.toPath()
|
||||
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!!.allFilesRelativeToPath(rootPath)
|
||||
val paths = project.shadowJarOutputs!!.files.allFilesRelativeToPath(rootPath.toPath())
|
||||
|
||||
if (paths.isNotEmpty()) {
|
||||
project.name to mapOf(
|
||||
@ -22,18 +28,29 @@ open class UpdateManifestTask : DefaultTask() {
|
||||
}.toMap()
|
||||
|
||||
val legacyUpdateFile = manifestsDir.resolve("update.json")
|
||||
Files.writeString(legacyUpdateFile, Globals.gson.toJson(legacyUpdateManifest))
|
||||
legacyUpdateFile.writeText(Globals.gson.toJson(legacyUpdateManifest))
|
||||
|
||||
val extensibleUpdateManifestItems = project.findPluginProjects().mapNotNull { project ->
|
||||
val paths = project.shadowJarOutputs!!.allFilesRelativeToPath(rootPath)
|
||||
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 }
|
||||
|
||||
val dependencies = project.concretePluginExtension.dependencies.map { it.name }
|
||||
ExtensibleManifestItem(
|
||||
name = project.name,
|
||||
type = "bukkit-plugin",
|
||||
version = project.version.toString(),
|
||||
type = concreteItemExtension.type.orNull ?: "bukkit-plugin",
|
||||
version = concreteItemExtension.version.orNull ?: project.version.toString(),
|
||||
dependencies = dependencies,
|
||||
files = paths.map { it.toUnixString() }
|
||||
files = paths.map { (path, type) ->
|
||||
ExtensibleManifestItemFile(
|
||||
name = path.name,
|
||||
type = type,
|
||||
path = path.toPath().relativeTo(rootPath.toPath()).toUnixString()
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@ -42,12 +59,11 @@ open class UpdateManifestTask : DefaultTask() {
|
||||
)
|
||||
|
||||
val extensibleUpdateManifestFile = manifestsDir.resolve("manifest.json")
|
||||
Files.writeString(
|
||||
extensibleUpdateManifestFile, Globals.gsonPretty.toJson(extensibleUpdateManifest) + "\n")
|
||||
extensibleUpdateManifestFile.writeText(Globals.gson.toJson(extensibleUpdateManifest) + "\n")
|
||||
}
|
||||
|
||||
private fun ensureManifestsDirectory(): Path {
|
||||
val manifestsDir = project.buildDir.resolve("manifests")
|
||||
val manifestsDir = project.layout.buildDirectory.asFile.get().resolve("manifests")
|
||||
manifestsDir.mkdirs()
|
||||
return manifestsDir.toPath()
|
||||
}
|
||||
|
@ -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))
|
||||
}
|
||||
@ -37,8 +57,8 @@ internal val Project.concreteRootExtension: ConcreteRootExtension
|
||||
error = { "Failed to find concrete root. Did you apply the concrete root plugin?" }
|
||||
)
|
||||
|
||||
internal val Project.concretePluginExtension: ConcretePluginExtension
|
||||
get() = extensions.getByType(ConcretePluginExtension::class.java)
|
||||
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
|
||||
@ -68,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