From 1dd7059b9cf9481d404212ca47c7bb7a4cb713ef Mon Sep 17 00:00:00 2001 From: Natty <31473117+493msi@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:29:35 +0200 Subject: [PATCH] Fixed Maven and version bump --- NEXT_RELEASE_DRAFT.md | 4 ++-- UPDATE_NOTES.md | 4 ++++ build.gradle.kts | 9 +++++++-- buildSrc/src/main/kotlin/org/plutoengine/Versions.kt | 6 +++--- engine-core/build.gradle.kts | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/NEXT_RELEASE_DRAFT.md b/NEXT_RELEASE_DRAFT.md index 0ec0753..f466cf4 100755 --- a/NEXT_RELEASE_DRAFT.md +++ b/NEXT_RELEASE_DRAFT.md @@ -1,4 +1,4 @@ -## Features targeted for 22.0.1.0-alpha.0 +## Features targeted for 22.0.0.0-alpha.1 * `[PlutoGUI]` Initial implementation of the new font renderer * Full rewrite * High quality font rendering @@ -7,7 +7,7 @@ * Improve upon the support of thread-local Pluto instances * The long term goal is to allow an unlimited amount of Pluto applications at any given time -## Features targeted for 22.0.1.0-alpha.1 +## Features targeted for 22.0.0.0-alpha.2 * The stage subsystem * A "stage", in this context, is a set of assets bound together by programming logic, not necessarily a game level. diff --git a/UPDATE_NOTES.md b/UPDATE_NOTES.md index 7ed44fb..244abd2 100755 --- a/UPDATE_NOTES.md +++ b/UPDATE_NOTES.md @@ -1,3 +1,7 @@ +## 22.2.0.0-alpha.0 +* Version bumped to 2022 +* `[SDK]` Maven version is now properly set again + ## 20.2.0.0-alpha.3 * `[SDK]` Restructured the repository * All build scripts are now written in Kotlin diff --git a/build.gradle.kts b/build.gradle.kts index 54af541..73017a7 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,16 @@ +import org.plutoengine.Versions + tasks.withType { distributionType = Wrapper.DistributionType.ALL gradleVersion = "7.4.2" } -subprojects { - group = "cz.tefek" +allprojects { + group = "org.plutoengine" + version = Versions.versionFull +} +subprojects { tasks.withType { options.encoding = "UTF-8" } diff --git a/buildSrc/src/main/kotlin/org/plutoengine/Versions.kt b/buildSrc/src/main/kotlin/org/plutoengine/Versions.kt index 71ada52..aaf7038 100755 --- a/buildSrc/src/main/kotlin/org/plutoengine/Versions.kt +++ b/buildSrc/src/main/kotlin/org/plutoengine/Versions.kt @@ -15,14 +15,14 @@ object Versions { const val steamworks4jVersion = "1.8.0" const val steamworks4jServerVersion = "1.8.0" - const val versionYear = 20 - const val versionMajor = 2 + const val versionYear = 22 + const val versionMajor = 0 const val versionMinor = 0 const val versionPatch = 0 const val isPrerelease = true const val prereleaseName = "alpha" - const val prerealeaseUpdate = 3 + const val prerealeaseUpdate = 0 val versionFull = if (isPrerelease) diff --git a/engine-core/build.gradle.kts b/engine-core/build.gradle.kts index 7f43821..2a8bfd0 100755 --- a/engine-core/build.gradle.kts +++ b/engine-core/build.gradle.kts @@ -16,6 +16,7 @@ task("publish") { dependsOn(":plutoengine:plutocore:publish") } + subprojects { apply(plugin = "java") apply(plugin = "java-library")