diff --git a/.gradle/4.4.1/fileHashes/fileHashes.lock b/.gradle/4.4.1/fileHashes/fileHashes.lock deleted file mode 100644 index 19f835234..000000000 Binary files a/.gradle/4.4.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin deleted file mode 100644 index 310ba1d6d..000000000 Binary files a/.gradle/4.4.1/taskHistory/taskHistory.bin and /dev/null differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.lock b/.gradle/4.4.1/taskHistory/taskHistory.lock deleted file mode 100644 index ebf7c5351..000000000 Binary files a/.gradle/4.4.1/taskHistory/taskHistory.lock and /dev/null differ diff --git a/.gradle/5.6.2/executionHistory/executionHistory.lock b/.gradle/5.6.2/executionHistory/executionHistory.lock deleted file mode 100644 index 023f09031..000000000 Binary files a/.gradle/5.6.2/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/5.6.2/fileChanges/last-build.bin b/.gradle/5.6.2/fileChanges/last-build.bin deleted file mode 100644 index f76dd238a..000000000 Binary files a/.gradle/5.6.2/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/5.6.2/fileContent/fileContent.lock b/.gradle/5.6.2/fileContent/fileContent.lock deleted file mode 100644 index 4d4982baf..000000000 Binary files a/.gradle/5.6.2/fileContent/fileContent.lock and /dev/null differ diff --git a/.gradle/5.6.2/fileHashes/fileHashes.bin b/.gradle/5.6.2/fileHashes/fileHashes.bin deleted file mode 100644 index 3a8b0e767..000000000 Binary files a/.gradle/5.6.2/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/5.6.2/fileHashes/fileHashes.lock b/.gradle/5.6.2/fileHashes/fileHashes.lock deleted file mode 100644 index 01f6ac731..000000000 Binary files a/.gradle/5.6.2/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/5.6.2/executionHistory/executionHistory.bin b/.gradle/6.2.2/executionHistory/executionHistory.bin similarity index 92% rename from .gradle/5.6.2/executionHistory/executionHistory.bin rename to .gradle/6.2.2/executionHistory/executionHistory.bin index 816cc1b81..7c2e6cd73 100644 Binary files a/.gradle/5.6.2/executionHistory/executionHistory.bin and b/.gradle/6.2.2/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.2.2/executionHistory/executionHistory.lock b/.gradle/6.2.2/executionHistory/executionHistory.lock new file mode 100644 index 000000000..78eb4dc14 Binary files /dev/null and b/.gradle/6.2.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/4.4.1/fileChanges/last-build.bin b/.gradle/6.2.2/fileChanges/last-build.bin similarity index 100% rename from .gradle/4.4.1/fileChanges/last-build.bin rename to .gradle/6.2.2/fileChanges/last-build.bin diff --git a/.gradle/6.2.2/fileContent/fileContent.lock b/.gradle/6.2.2/fileContent/fileContent.lock new file mode 100644 index 000000000..c232dcf05 Binary files /dev/null and b/.gradle/6.2.2/fileContent/fileContent.lock differ diff --git a/.gradle/6.2.2/fileHashes/fileHashes.lock b/.gradle/6.2.2/fileHashes/fileHashes.lock new file mode 100644 index 000000000..76bca900f Binary files /dev/null and b/.gradle/6.2.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/5.6.2/gc.properties b/.gradle/6.2.2/gc.properties similarity index 100% rename from .gradle/5.6.2/gc.properties rename to .gradle/6.2.2/gc.properties diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 451ba4b44..920ecad05 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 6b52abd9f..ee5484781 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Fri Mar 06 14:06:17 MST 2020 -gradle.version=5.6.2 +#Sat Mar 28 16:11:26 MST 2020 +gradle.version=6.2.2 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index eea215a18..7c2e6cd73 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock new file mode 100644 index 000000000..a4f8f7ea7 Binary files /dev/null and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/4.4.1/fileHashes/fileHashes.bin b/.gradle/checksums/md5-checksums.bin similarity index 78% rename from .gradle/4.4.1/fileHashes/fileHashes.bin rename to .gradle/checksums/md5-checksums.bin index 19b90a5eb..b25f88d85 100644 Binary files a/.gradle/4.4.1/fileHashes/fileHashes.bin and b/.gradle/checksums/md5-checksums.bin differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin new file mode 100644 index 000000000..b86a85540 Binary files /dev/null and b/.gradle/checksums/sha1-checksums.bin differ diff --git a/scripts/build - Copy.sh b/scripts/build - Copy.sh deleted file mode 100755 index 4e9bebcd4..000000000 --- a/scripts/build - Copy.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -( -set -e -basedir="$(cd "$1" && pwd -P)" -workdir="$basedir/work" -paperbasedir="$basedir/work/Paper" -paperworkdir="$basedir/work/Paper/work" - -if [[ "$2" == "--setup" ]] || [[ "$3" == "--setup" ]] || [[ "$4" == "--setup" ]]; then - echo "[Akarin] Setup Paper.." - ( - if [[ "$2" == "--remote" ]] || [[ "$3" == "--remote" ]] || [[ "$4" == "--remote" ]]; then - cd "$paperworkdir" - if [[ -d "Minecraft" ]]; then - rm Minecraft/ -r - fi - git clone https://github.com/Akarin-project/Minecraft.git - fi - - #cd "$paperbasedir" - #./paper patch - ) -fi - -echo "[Akarin] Ready to build" -( - cd "$paperbasedir" - echo "[Akarin] Touch sources.." - - cd "$paperbasedir" - if [[ "$2" == "--fast" ]] || [[ "$3" == "--fast" ]] || [[ "$4" == "--fast" ]]; then - echo "[Akarin] Test and repatch has been skipped" - echo "$paperbasedir/if" - \cp -rf "$basedir/api/src/main" "$paperbasedir/Paper-API/src/" - \cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/" - \cp -rf "$basedir/src" "$paperbasedir/Paper-Server/" - \cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/" - mvn clean install -Dmaven.test.skip=true - else - echo "$paperbasedir/else" - rm -rf Paper-API/src - rm -rf Paper-Server/src - ./paper patch - \cp -rf "$basedir/api/src/main" "$paperbasedir/Paper-API/src/" - \cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/" - \cp -rf "$basedir/src" "$paperbasedir/Paper-Server/" - \cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/" - mvn clean install -Dmaven.test.skip=true - fi - - minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) - rawjar="$paperbasedir/Paper-Server/target/akarin-$minecraftversion.jar" - \cp -rf "$rawjar" "$basedir/akarin-$minecraftversion.jar" - rawapi="$paperbasedir/Paper-API/target/akarin-api-1.14.4-R0.1-SNAPSHOT.jar" - \cp -rf "$rawapi" "$basedir/akarin-api-1.14.4-R0.1-SNAPSHOT.jar" - - echo "" - echo "[Akarin] Build successful" - echo "[Akarin] Migrated the final jar to $basedir/" -) - -) diff --git a/scripts/gradlebuild.sh b/scripts/gradlebuild.sh new file mode 100644 index 000000000..799fa4ad0 --- /dev/null +++ b/scripts/gradlebuild.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +( +set -e +version="master" +basedir="$(cd "$1" && pwd -P)" +workdir="$basedir/work" +paperbasedir="$basedir/work/Paper" +paperworkdir="$basedir/work/Paper/work" + +# init +git submodule update --init --remote +cd "$basedir" + +echo "[Akarin] Setup Paper.." +cd "$paperworkdir" +if [[ -d "Minecraft" ]]; then + rm Minecraft/ -r +fi +git clone https://github.com/Akarin-project/Minecraft.git + +echo "[Akarin] Ready to build" + +cd "$paperbasedir" +echo "[Akarin] Touch sources.." + +rm -rf Paper-API/src +rm -rf Paper-Server/src +./paper patch +\cp -rf "$basedir/api/src/main" "$paperbasedir/Paper-API/src/" +\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/" +\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/" +\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/" + +cd "$basedir" +bash ./gradlew install + +minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) +rawjar="$paperbasedir/Paper-Server/target/akarin-$minecraftversion.jar" +\cp -rf "$rawjar" "$basedir/akarin-$minecraftversion.jar" +rawapi="$paperbasedir/Paper-API/target/akarin-api-1.14.4-R0.1-SNAPSHOT.jar" +\cp -rf "$rawapi" "$basedir/akarin-api-1.14.4-R0.1-SNAPSHOT.jar" + +echo "" +echo "[Akarin] Build successful" +echo "[Akarin] Migrated the final jar to $basedir/" + +)