Skip to content

Commit 0fd7f6e

Browse files
authored
chore: bump halo plugin devtools version (halo-dev#35)
- 提升 `run.halo.plugin.devtools` 插件的版本 - 升级 Gradle 的版本至 8.0 /kind improvement ```release-note None ```
1 parent a9c80b6 commit 0fd7f6e

File tree

8 files changed

+35
-34
lines changed

8 files changed

+35
-34
lines changed

build.gradle

+9-21
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
11
plugins {
2-
id "com.github.node-gradle.node" version "3.3.0"
3-
id "io.github.guqing.plugin-development" version "0.0.6-SNAPSHOT"
42
id 'java'
3+
id "io.freefair.lombok" version "8.0.1"
4+
id "com.github.node-gradle.node" version "3.3.0"
5+
id "run.halo.plugin.devtools" version "0.0.4"
56
}
67

78
group 'run.halo.comment.widget'
89
sourceCompatibility = JavaVersion.VERSION_17
910

1011
repositories {
12+
mavenCentral()
1113
maven { url 'https://s01.oss.sonatype.org/content/repositories/releases' }
14+
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
1215
maven { url 'https://repo.spring.io/milestone' }
13-
mavenCentral()
14-
}
15-
16-
jar {
17-
enabled = true
18-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
19-
manifest.attributes('Plugin-Version': "${project.version}",)
20-
from {
21-
configurations.runtimeClasspath.collect {
22-
it.isDirectory() ? it : zipTree(it)
23-
}
24-
}
2516
}
2617

2718
dependencies {
28-
compileOnly platform("run.halo.dependencies:halo-dependencies:1.0.0")
29-
30-
compileOnly files("lib/halo-2.0.0-SNAPSHOT-plain.jar")
31-
compileOnly 'org.projectlombok:lombok:1.18.22'
32-
annotationProcessor 'org.projectlombok:lombok:1.18.22'
19+
implementation platform('run.halo.tools.platform:plugin:2.5.0-SNAPSHOT')
20+
compileOnly 'run.halo.app:api'
3321

34-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
35-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
22+
testImplementation 'run.halo.app:api'
23+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3624
}
3725

3826
test {

gradle/wrapper/gradle-wrapper.jar

1.75 KB
Binary file not shown.
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

+14-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac
@@ -205,6 +209,12 @@ set -- \
205209
org.gradle.wrapper.GradleWrapperMain \
206210
"$@"
207211

212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
216+
fi
217+
208218
# Use "xargs" to parse quoted args.
209219
#
210220
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

lib/halo-2.0.0-SNAPSHOT-plain.jar

-1.19 MB
Binary file not shown.

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginManagement {
22
repositories {
3-
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
3+
maven { url 'https://s01.oss.sonatype.org/content/repositories/releases' }
44
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
55
maven { url 'https://maven.aliyun.com/repository/spring-plugin' }
66
maven { url 'https://repo.spring.io/milestone' }

src/main/resources/plugin.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
name: PluginCommentWidget
55
spec:
66
enabled: true
7-
version: "1.5.0"
87
requires: ">=2.6.0"
98
author:
109
name: Halo OSS Team

0 commit comments

Comments
 (0)