From 261b9cc00c8720b5550844888896c56337f3e4b8 Mon Sep 17 00:00:00 2001 From: William Date: Tue, 12 Jul 2022 23:04:26 +0100 Subject: [PATCH] MPDBConverter over jitpack --- .github/workflows/java_ci.yml | 2 -- .scripts/install-mpdb-converter | 6 ------ README.md | 5 +---- bukkit/build.gradle | 2 +- jitpack.yml | 6 +----- 5 files changed, 3 insertions(+), 18 deletions(-) delete mode 100755 .scripts/install-mpdb-converter diff --git a/.github/workflows/java_ci.yml b/.github/workflows/java_ci.yml index 9de02859..ac303370 100644 --- a/.github/workflows/java_ci.yml +++ b/.github/workflows/java_ci.yml @@ -26,8 +26,6 @@ jobs: with: java-version: '16' distribution: 'temurin' - - name: Install MPDB Converter - run: "${GITHUB_WORKSPACE}/.scripts/install-mpdb-converter" - name: Build with Gradle uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 with: diff --git a/.scripts/install-mpdb-converter b/.scripts/install-mpdb-converter deleted file mode 100755 index 9e6ba8ac..00000000 --- a/.scripts/install-mpdb-converter +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -echo "mvn-installing mpdbdataconverter..." -curl "-L" "-O" "https://github.com/WiIIiam278/MPDBDataConverter/releases/download/1.0/mpdbdataconverter-1.0.jar" -mvn "install:install-file" "-Dfile=mpdbdataconverter-1.0.jar" "-DgroupId=net.william278" "-DartifactId=mpdbdataconverter" "-Dversion=1.0" "-Dpackaging=jar" "-DgeneratePom=true" "-e" -rm "mpdbdataconverter-1.0.jar" \ No newline at end of file diff --git a/README.md b/README.md index 70f9bfc3..cbddf1b3 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,7 @@ 4. Start every server again and synchronistaion will begin. ## Building -To build HuskSync, you'll first need to get the [MPDBConverter](https://github.com/WiIIiam278/MPDBDataConverter) library, by downloading and running `mvn install-file` to publish it to your local maven repository. - -Then simply run the following in the root of the repository: - +To build HuskSync, simply run the following in the root of the repository: ``` ./gradlew clean build ``` diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 216bfacf..8ee4277c 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,7 +1,7 @@ dependencies { implementation project(path: ':common') implementation 'org.bstats:bstats-bukkit:3.0.0' - implementation 'net.william278:mpdbdataconverter:1.0' + implementation 'net.william278:mpdbdataconverter:1.0.1' implementation 'net.william278:hsldataconverter:1.0' compileOnly 'redis.clients:jedis:4.2.3' diff --git a/jitpack.yml b/jitpack.yml index ef1378ae..3cabe06f 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -6,11 +6,7 @@ before_install: - 'chmod +x gradlew' - 'chmod +x ./.scripts/ensure-java-16' - 'bash ./.scripts/ensure-java-16 install' - - 'bash ./.scripts/install-mpdb-converter' install: - 'if ! ./.scripts/ensure-java-16 use; then source ~/.sdkman/bin/sdkman-init.sh; fi' - 'java -version' - - './gradlew publishToMavenLocal' - - 'rm -rf ~/.m2/repository/net/william278/mpdbdataconverter' - - 'mkdir -p ~/.m2/repository/net/william278/mpdbdataconverter/1.0/' - - 'find ~/.m2/repository/net/william278/husksync/ -type f -print0 | xargs -0 mv -t ~/.m2/repository/net/william278/mpdbdataconverter/1.0/' \ No newline at end of file + - './gradlew publishToMavenLocal' \ No newline at end of file