diff --git a/plugins/banstick-paper/.github/workflows/build.yml b/plugins/banstick-paper/.github/workflows/build.yml new file mode 100644 index 000000000..8a5b08ede --- /dev/null +++ b/plugins/banstick-paper/.github/workflows/build.yml @@ -0,0 +1,24 @@ +name: Build + +on: + push: + branches: + - '*' + pull_request: + types: [opened, synchronize, reopened] + +jobs: + build: + name: Build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + + - uses: gradle/gradle-build-action@v2 + with: + arguments: build diff --git a/plugins/banstick-paper/.github/workflows/publish.yml b/plugins/banstick-paper/.github/workflows/publish.yml new file mode 100644 index 000000000..a7f7fbf3d --- /dev/null +++ b/plugins/banstick-paper/.github/workflows/publish.yml @@ -0,0 +1,25 @@ +name: Publish + +on: + push: + tags: + - 'v*.*.*' + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + + - uses: gradle/gradle-build-action@v2 + with: + arguments: publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CIVMC_NEXUS_USER: ${{ secrets.CIVMC_NEXUS_USER }} + CIVMC_NEXUS_PASSWORD: ${{ secrets.CIVMC_NEXUS_PASSWORD }} diff --git a/plugins/banstick-paper/.github/workflows/pull_request.yml b/plugins/banstick-paper/.github/workflows/pull_request.yml deleted file mode 100644 index 042464808..000000000 --- a/plugins/banstick-paper/.github/workflows/pull_request.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Build -on: - pull_request: - -jobs: - call_build: - uses: CivMC/.github/.github/workflows/gradle_build.yml@master diff --git a/plugins/banstick-paper/.github/workflows/release_created.yml b/plugins/banstick-paper/.github/workflows/release_created.yml deleted file mode 100644 index 5bbdc60db..000000000 --- a/plugins/banstick-paper/.github/workflows/release_created.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Publish -on: - release: - types: [created] - -jobs: - call_publish: - uses: CivMC/.github/.github/workflows/gradle_publish.yml@master diff --git a/plugins/banstick-paper/build.gradle.kts b/plugins/banstick-paper/build.gradle.kts index a035ca6b2..24598244c 100644 --- a/plugins/banstick-paper/build.gradle.kts +++ b/plugins/banstick-paper/build.gradle.kts @@ -1,60 +1,21 @@ -import net.civmc.civgradle.common.util.civRepo +import net.civmc.civgradle.CivGradleExtension plugins { - `java-library` - `maven-publish` - id("net.civmc.civgradle.plugin") version "1.0.0-SNAPSHOT" -} - -// Temporary hack: -// Remove the root build directory -gradle.buildFinished { - project.buildDir.deleteRecursively() -} - -allprojects { - group = "net.civmc.banstick" - version = "2.0.0-SNAPSHOT" - description = "BanStick" -} - -repositories { - mavenCentral() - + id("net.civmc.civgradle") version "2.+" apply false } subprojects { - apply(plugin = "net.civmc.civgradle.plugin") + apply(plugin = "net.civmc.civgradle") apply(plugin = "java-library") apply(plugin = "maven-publish") - java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } + configure { + pluginName = project.property("pluginName") as String } repositories { mavenCentral() - civRepo("CivMC/CivModCore") - civRepo("CivMC/NameLayer") - } - - publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/CivMC/BanStick") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - publications { - register("gpr") { - from(components["java"]) - } - } + maven("https://repo.civmc.net/repository/maven-public") + maven("https://jitpack.io") } } diff --git a/plugins/banstick-paper/gradle.properties b/plugins/banstick-paper/gradle.properties new file mode 100644 index 000000000..1d3c5a36a --- /dev/null +++ b/plugins/banstick-paper/gradle.properties @@ -0,0 +1,7 @@ +# Gradle properties +group = net.civmc.banstick +version = 2.0.1 +description = BanStick + +# Custom Properties +pluginName = BanStick diff --git a/plugins/banstick-paper/paper/build.gradle.kts b/plugins/banstick-paper/paper/build.gradle.kts index e3321a421..57033e003 100644 --- a/plugins/banstick-paper/paper/build.gradle.kts +++ b/plugins/banstick-paper/paper/build.gradle.kts @@ -1,21 +1,13 @@ plugins { - `java-library` - id("net.civmc.civgradle.plugin") - id("io.papermc.paperweight.userdev") version "1.3.1" - id("com.github.johnrengelman.shadow") version "7.1.0" -} - -civGradle { - paper { - pluginName = "BanStick" - } + id("io.papermc.paperweight.userdev") + id("com.github.johnrengelman.shadow") } dependencies { - paperDevBundle("1.18.1-R0.1-SNAPSHOT") + paperDevBundle("1.18.2-R0.1-SNAPSHOT") - compileOnly("net.civmc.civmodcore:paper:2.0.0-SNAPSHOT:dev-all") - compileOnly("net.civmc.namelayer:paper:3.0.0-SNAPSHOT:dev") + compileOnly("net.civmc.civmodcore:civmodcore-paper:2.3.5:dev-all") + compileOnly("net.civmc.namelayer:namelayer-paper:3.0.3:dev") implementation("com.github.seancfoley:ipaddress:2.0.2") implementation("org.jsoup:jsoup:1.13.1") diff --git a/plugins/banstick-paper/settings.gradle.kts b/plugins/banstick-paper/settings.gradle.kts index cb527e086..6fccaf901 100644 --- a/plugins/banstick-paper/settings.gradle.kts +++ b/plugins/banstick-paper/settings.gradle.kts @@ -1,17 +1,12 @@ -rootProject.name = "banstick" - pluginManagement { repositories { gradlePluginPortal() + maven("https://repo.civmc.net/repository/maven-public/") maven("https://papermc.io/repo/repository/maven-public/") - maven { - url = uri("https://maven.pkg.github.com/CivMC/CivGradle") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } } } +rootProject.name = "banstick" + include(":paper") +project(":paper").name = rootProject.name + "-paper"