Skip to content

Commit

Permalink
build: update wrapper, fix maven publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
Misat11 committed Dec 23, 2024
1 parent 4dac7f0 commit 9bb4248
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ subprojects {
if (project.name != "BedWars-common") {
configureSourceJarTasks()
val buildJavadoc = !version.toString().endsWith("-SNAPSHOT") && project.name == "BedWars-API"
setupMavenPublishing(addSourceJar=true, addJavadocJar=buildJavadoc)
if (buildJavadoc) {
configureJavadocTasks()
}
setupMavenPublishing(addSourceJar=(project.name == "BedWars-API" || project.name == "BedWars-protocol"), addJavadocJar=buildJavadoc)
setupMavenRepositoriesFromProperties()
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
5 changes: 4 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ rootProject.name = "BedWars-parent"
include(":BedWars-API")
project(":BedWars-API").projectDir = file("api")
include(":BedWars")
project(":BedWars").projectDir = file("plugin/universal")
project(":BedWars").let {
it.projectDir = file("plugin/universal")
it.projectDir.mkdirs()
}
include(":BedWars-protocol")
project(":BedWars-protocol").projectDir = file("protocol")
include(":BedWars-common")
Expand Down

0 comments on commit 9bb4248

Please sign in to comment.