Compare commits

..

No commits in common. "7e7b1e4f5354fa63e458fb86eb5abd4ec30f1051" and "ee3ab6ff9a1ad7e7875c0cef4643d1e2bcff69af" have entirely different histories.

16 changed files with 140 additions and 113 deletions

View File

@ -24,6 +24,7 @@ jobs:
with:
distribution: 'temurin'
java-version: |
11
16
17
cache: 'gradle'

View File

@ -2,12 +2,9 @@ name: Publish
on:
workflow_dispatch:
push:
tags:
- "**"
jobs:
build:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@ -19,11 +16,12 @@ jobs:
with:
distribution: 'temurin'
java-version: |
11
16
17
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew clean :BlueMapCore:publish :BlueMapCommon:publish
env:
BLUECOLORED_USERNAME: ${{ secrets.BLUECOLORED_USERNAME }}
BLUECOLORED_PASSWORD: ${{ secrets.BLUECOLORED_PASSWORD }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
run: ./gradlew publish

@ -1 +1 @@
Subproject commit b200d339f1a20c5d0def4e134237c756e6294c50
Subproject commit 6cad751ac59286a516007799bcad3f2868e0a802

View File

@ -9,9 +9,8 @@ plugins {
id ("com.github.node-gradle.node") version "3.5.0"
}
group = "de.bluecolored.bluemap"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val lastVersion = System.getProperty("bluemap.lastVersion") ?: "?" // set by BlueMapCore
group = "de.bluecolored.bluemap.common"
version = "0.0.0"
val javaTarget = 16
java {
@ -21,13 +20,17 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
dependencies {
api ("com.mojang:brigadier:1.0.17")
api ("de.bluecolored.bluemap:BlueMapCore")
api ("de.bluecolored.bluemap.core:BlueMapCore")
compileOnly ("org.jetbrains:annotations:16.0.2")
compileOnly ("org.projectlombok:lombok:1.18.30")
@ -99,20 +102,6 @@ tasks.processResources {
}
publishing {
repositories {
maven {
name = "bluecolored"
val releasesRepoUrl = "https://repo.bluecolored.de/releases"
val snapshotsRepoUrl = "https://repo.bluecolored.de/snapshots"
url = uri(if (version == lastVersion) releasesRepoUrl else snapshotsRepoUrl)
credentials {
username = project.findProperty("bluecoloredUsername") as String? ?: System.getenv("BLUECOLORED_USERNAME")
password = project.findProperty("bluecoloredPassword") as String? ?: System.getenv("BLUECOLORED_PASSWORD")
}
}
}
publications {
create<MavenPublication>("maven") {
groupId = project.group.toString()
@ -120,12 +109,6 @@ publishing {
version = project.version.toString()
from(components["java"])
versionMapping {
usage("java-api") {
fromResolutionOf("runtimeClasspath")
}
}
}
}
}

View File

@ -38,13 +38,12 @@ val lastVersion = if (lastTag.isEmpty()) "dev" else lastTag.substring(1) // remo
val commits = "git rev-list --count $lastTag..HEAD".runCommand()
println("Git hash: $gitHash" + if (clean) "" else " (dirty)")
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.core"
version = lastVersion +
(if (commits == "0") "" else "-$commits") +
(if (clean) "" else "-dirty")
System.setProperty("bluemap.version", version.toString())
System.setProperty("bluemap.lastVersion", lastVersion)
println("Version: $version")
val javaTarget = 16
@ -55,7 +54,9 @@ java {
repositories {
mavenCentral()
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://jitpack.io")
}
}
@Suppress("GradlePackageUpdate")
@ -65,12 +66,12 @@ dependencies {
api ("commons-io:commons-io:2.5")
api ("org.spongepowered:configurate-hocon:4.1.2")
api ("org.spongepowered:configurate-gson:4.1.2")
api ("de.bluecolored.bluenbt:BlueNBT:2.2.1")
api ("com.github.BlueMap-Minecraft:BlueNBT:v1.3.0")
api ("org.apache.commons:commons-dbcp2:2.9.0")
api ("io.airlift:aircompressor:0.24")
api ("org.lz4:lz4-java:1.8.0")
api ("de.bluecolored.bluemap:BlueMapAPI")
api ("de.bluecolored.bluemap.api:BlueMapAPI")
compileOnly ("org.jetbrains:annotations:23.0.0")
compileOnly ("org.projectlombok:lombok:1.18.30")
@ -151,20 +152,6 @@ tasks.processResources {
}
publishing {
repositories {
maven {
name = "bluecolored"
val releasesRepoUrl = "https://repo.bluecolored.de/releases"
val snapshotsRepoUrl = "https://repo.bluecolored.de/snapshots"
url = uri(if (version == lastVersion) releasesRepoUrl else snapshotsRepoUrl)
credentials {
username = project.findProperty("bluecoloredUsername") as String? ?: System.getenv("BLUECOLORED_USERNAME")
password = project.findProperty("bluecoloredPassword") as String? ?: System.getenv("BLUECOLORED_PASSWORD")
}
}
}
publications {
create<MavenPublication>("maven") {
groupId = project.group.toString()
@ -172,12 +159,6 @@ publishing {
version = project.version.toString()
from(components["java"])
versionMapping {
usage("java-api") {
fromResolutionOf("runtimeClasspath")
}
}
}
}
}

View File

@ -6,7 +6,7 @@ plugins {
id ("com.github.johnrengelman.shadow") version "7.1.2"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.cli"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 16
@ -17,12 +17,16 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
dependencies {
api ("de.bluecolored.bluemap:BlueMapCommon")
api ("de.bluecolored.bluemap.common:BlueMapCommon")
@Suppress("GradlePackageUpdate")
implementation ("commons-cli:commons-cli:1.5.0")

View File

@ -15,7 +15,7 @@ plugins {
id ("com.matthewprenger.cursegradle") version "1.4.0"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.fabric"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 17
@ -28,10 +28,18 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://maven.fabricmc.net/")
maven ("https://oss.sonatype.org/content/repositories/snapshots")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
maven {
setUrl("https://maven.fabricmc.net/")
}
maven {
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
}
}
val shadowInclude: Configuration by configurations.creating
@ -41,7 +49,7 @@ configurations {
}
dependencies {
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by fabric
exclude (group = "com.google.guava", module = "guava")
exclude (group = "com.google.code.gson", module = "gson")

View File

@ -15,7 +15,7 @@ plugins {
id ("com.matthewprenger.cursegradle") version "1.4.0"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.fabric"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 17
@ -28,10 +28,18 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://maven.fabricmc.net/")
maven ("https://oss.sonatype.org/content/repositories/snapshots")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
maven {
setUrl("https://maven.fabricmc.net/")
}
maven {
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
}
}
val shadowInclude: Configuration by configurations.creating
@ -41,7 +49,7 @@ configurations {
}
dependencies {
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by fabric
exclude (group = "com.google.guava", module = "guava")
exclude (group = "com.google.code.gson", module = "gson")

View File

@ -15,7 +15,7 @@ plugins {
id ("com.matthewprenger.cursegradle") version "1.4.0"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.fabric"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 17
@ -28,10 +28,18 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://maven.fabricmc.net/")
maven ("https://oss.sonatype.org/content/repositories/snapshots")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
maven {
setUrl("https://maven.fabricmc.net/")
}
maven {
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
}
}
val shadowInclude: Configuration by configurations.creating
@ -41,7 +49,7 @@ configurations {
}
dependencies {
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by fabric
exclude (group = "com.google.guava", module = "guava")
exclude (group = "com.google.code.gson", module = "gson")

View File

@ -21,7 +21,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.forge"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap'
@ -53,8 +53,12 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
mavenCentral()
maven { url = "https://libraries.minecraft.net" }
maven { url = "https://repo.bluecolored.de/releases" }
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
configurations {
@ -64,7 +68,7 @@ configurations {
dependencies {
minecraft 'net.minecraftforge:forge:1.18.1-39.0.19'
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by forge
exclude (group: "com.google.guava", module: "guava")
exclude (group: "com.google.code.gson", module: "gson")

View File

@ -21,7 +21,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.forge"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap'
@ -52,8 +52,12 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
mavenCentral()
maven { url = "https://libraries.minecraft.net" }
maven { url = "https://repo.bluecolored.de/releases" }
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
configurations {
@ -63,7 +67,7 @@ configurations {
dependencies {
minecraft 'net.minecraftforge:forge:1.19.4-45.0.1'
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by forge
exclude (group: "com.google.guava", module: "guava")
exclude (group: "com.google.code.gson", module: "gson")

View File

@ -21,7 +21,7 @@ plugins {
apply plugin: "net.minecraftforge.gradle"
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.forge"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
archivesBaseName = 'bluemap'
@ -52,8 +52,12 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
mavenCentral()
maven { url = "https://libraries.minecraft.net" }
maven { url = "https://repo.bluecolored.de/releases" }
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
configurations {
@ -63,7 +67,7 @@ configurations {
dependencies {
minecraft 'net.minecraftforge:forge:1.20-46.0.1'
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by forge
exclude (group: "com.google.guava", module: "guava")
exclude (group: "com.google.code.gson", module: "gson")

View File

@ -9,13 +9,18 @@ plugins {
id "com.github.johnrengelman.shadow" version "7.1.2"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.forge"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
repositories {
mavenLocal()
mavenCentral()
maven { url = "https://libraries.minecraft.net" }
maven { url = "https://repo.bluecolored.de/releases" }
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
base {
@ -32,7 +37,7 @@ configurations {
dependencies {
implementation "net.neoforged:neoforge:20.2.86"
shadowInclude ("de.bluecolored.bluemap:BlueMapCommon") {
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by forge
exclude (group: "com.google.guava", module: "guava")
exclude (group: "com.google.code.gson", module: "gson")

View File

@ -8,7 +8,7 @@ plugins {
id ("io.papermc.hangar-publish-plugin") version "0.1.0"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.bukkit"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 17
@ -19,14 +19,22 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://repo.papermc.io/repository/maven-public/")
maven ("https://oss.sonatype.org/content/repositories/snapshots")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
maven {
setUrl("https://repo.papermc.io/repository/maven-public/")
}
maven {
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
}
}
dependencies {
api ("de.bluecolored.bluemap:BlueMapCommon") {
api ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by bukkit
exclude( group = "com.google.guava", module = "guava" )
exclude( group = "com.google.code.gson", module = "gson" )

View File

@ -7,7 +7,7 @@ plugins {
id ("com.modrinth.minotaur") version "2.+"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.bukkit"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 16
@ -18,18 +18,25 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
maven {
setUrl("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
content {
includeGroup ("org.spigotmc")
}
}
maven ("https://oss.sonatype.org/content/repositories/snapshots")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
}
}
dependencies {
api ("de.bluecolored.bluemap:BlueMapCommon") {
api ("de.bluecolored.bluemap.common:BlueMapCommon") {
//exclude dependencies provided by bukkit
exclude( group = "com.google.guava", module = "guava" )
exclude( group = "com.google.code.gson", module = "gson" )

View File

@ -11,7 +11,7 @@ plugins {
id("org.spongepowered.gradle.ore") version "2.2.0"
}
group = "de.bluecolored.bluemap"
group = "de.bluecolored.bluemap.bukkit"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 16
@ -22,12 +22,16 @@ java {
repositories {
mavenCentral()
maven ("https://libraries.minecraft.net")
maven ("https://repo.bluecolored.de/releases")
maven {
setUrl("https://libraries.minecraft.net")
}
maven {
setUrl("https://jitpack.io")
}
}
dependencies {
api ("de.bluecolored.bluemap:BlueMapCommon"){
api ("de.bluecolored.bluemap.common:BlueMapCommon"){
//exclude dependencies provided by sponge
exclude( group = "com.google.guava", module = "guava" )
exclude( group = "com.google.code.gson", module = "gson" )