Skip to content

Commit

Permalink
Update buildscript with licenser v2 plugin.
Browse files Browse the repository at this point in the history
  • Loading branch information
LambdAurora committed Oct 26, 2024
1 parent b7be291 commit ba11a9a
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 0
- name: "Set up Java"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# LambdAurora's ignore file
#
# v0.22
# v0.23

# JetBrains
.idea/
Expand Down Expand Up @@ -83,6 +83,7 @@ bin/
build/
dist/
lib/
!/lib/
!src/lib/
!src/**/lib/
obj/
Expand Down
1 change: 1 addition & 0 deletions build_logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ plugins {
val javaVersion = 17

repositories {
mavenLocal()
gradlePluginPortal()
}

Expand Down
4 changes: 1 addition & 3 deletions build_logic/src/main/kotlin/yumi-commons-base.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.gradle.configurationcache.extensions.capitalized

plugins {
`maven-publish`
signing
Expand Down Expand Up @@ -71,6 +69,6 @@ signing {
sign(publishing.publications[Constants.PUBLICATION_NAME])

afterEvaluate {
tasks["sign${Constants.PUBLICATION_NAME.capitalized()}Publication"].group = "publishing"
tasks["sign${Constants.PUBLICATION_NAME.replaceFirstChar(Char::titlecase)}Publication"].group = "publishing"
}
}
6 changes: 4 additions & 2 deletions build_logic/src/main/kotlin/yumi-commons-library.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
}

base.archivesName = "yumi-commons-" + project.name
val fullName = "${Constants.PROJECT_NAME}: ${project.name}"

java {
toolchain {
Expand Down Expand Up @@ -34,8 +35,9 @@ tasks.withType<Javadoc>().configureEach {
}

tasks.jar {
val archivesName = base.archivesName.get()
from(rootProject.file("LICENSE")) {
rename { "${it}_${base.archivesName.get()}" }
rename { "${it}_${archivesName}" }
}
}

Expand All @@ -56,6 +58,6 @@ publishing.publications.getByName<MavenPublication>(Constants.PUBLICATION_NAME)
from(components["java"])

pom {
name = Constants.PROJECT_NAME + ": " + project.name.capitalized()
name = fullName
}
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
licenser = "1.1.+"
licenser = "2.0.+"
jetbrains-annotations = "24.0.1"
junit-jupiter = "5.10.0"
junit-launcher = "1.10.0"
slf4j = "2.0.9"
asm = "9.6"
nexus-publish = "1.3.0"
nexus-publish = "2.0.0"

[libraries]
licenser = { module = "dev.yumi:yumi-gradle-licenser", version.ref = "licenser" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 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,8 @@ 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
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
22 changes: 12 additions & 10 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 Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit ba11a9a

Please sign in to comment.