[ci skip] Update blossom
This commit is contained in:
parent
4b7998b4ea
commit
f50751ed48
|
@ -3,9 +3,15 @@ plugins {
|
||||||
id("via.shadow-conventions")
|
id("via.shadow-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
blossom {
|
sourceSets {
|
||||||
replaceToken("\$VERSION", project.version)
|
main {
|
||||||
replaceToken("\$IMPL_VERSION", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}")
|
blossom {
|
||||||
|
javaSources {
|
||||||
|
property("version", project.version.toString())
|
||||||
|
property("impl_version", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -31,9 +31,14 @@ public final class VersionInfo {
|
||||||
*
|
*
|
||||||
* @see ViaPlatform#getPluginVersion()
|
* @see ViaPlatform#getPluginVersion()
|
||||||
*/
|
*/
|
||||||
public static final String VERSION = "$VERSION";
|
public static final String VERSION = "{{ version }}";
|
||||||
|
private static final String IMPLEMENTATION_VERSION = "{{ impl_version }}";
|
||||||
|
|
||||||
public static String getVersion() {
|
public static String getVersion() {
|
||||||
return VERSION;
|
return VERSION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getImplementationVersion() {
|
||||||
|
return IMPLEMENTATION_VERSION;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -2,11 +2,6 @@ plugins {
|
||||||
id("net.kyori.blossom")
|
id("net.kyori.blossom")
|
||||||
}
|
}
|
||||||
|
|
||||||
blossom {
|
|
||||||
replaceToken("\$VERSION", project.version)
|
|
||||||
replaceToken("\$IMPL_VERSION", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}")
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(projects.viaversionApi)
|
api(projects.viaversionApi)
|
||||||
api(projects.viaversionApiLegacy)
|
api(projects.viaversionApiLegacy)
|
||||||
|
|
|
@ -62,7 +62,7 @@ public final class DumpUtil {
|
||||||
Via.getPlatform().getPlatformName(),
|
Via.getPlatform().getPlatformName(),
|
||||||
Via.getPlatform().getPlatformVersion(),
|
Via.getPlatform().getPlatformVersion(),
|
||||||
Via.getPlatform().getPluginVersion(),
|
Via.getPlatform().getPluginVersion(),
|
||||||
"$IMPL_VERSION",
|
com.viaversion.viaversion.util.VersionInfo.getImplementationVersion(),
|
||||||
Via.getManager().getSubPlatforms()
|
Via.getManager().getSubPlatforms()
|
||||||
);
|
);
|
||||||
final Map<String, Object> configuration = Via.getPlatform().getConfigurationProvider().getValues();
|
final Map<String, Object> configuration = Via.getPlatform().getConfigurationProvider().getValues();
|
||||||
|
|
|
@ -17,7 +17,7 @@ dependencyResolutionManagement {
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
// default plugin versions
|
// default plugin versions
|
||||||
plugins {
|
plugins {
|
||||||
id("net.kyori.blossom") version "1.3.1"
|
id("net.kyori.blossom") version "2.0.1"
|
||||||
id("com.github.johnrengelman.shadow") version "8.1.1"
|
id("com.github.johnrengelman.shadow") version "8.1.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue