Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -508,3 +508,13 @@ ij_html_text_wrap = normal
indent_size = 2
ij_yaml_keep_indents_on_empty_lines = false
ij_yaml_keep_line_breaks = true

[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
charset = utf-8
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

end_of_line = lf
max_line_length = 100
2 changes: 1 addition & 1 deletion .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
with:
app-id: app-KhIVw
node-version: "20"
pnpm-version: "9"
pnpm-version: "10"
ui-path: "ui"
artifacts-path: 'app/build/libs'
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v3
with:
node-version: "20"
pnpm-version: "9"
pnpm-version: "10"
ui-path: "ui"
artifacts-path: 'app/build/libs'
31 changes: 17 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ logs/
!gradle/wrapper/gradle-wrapper.jar
bin/

### STS ###
### Node
node_modules/

### STS
.apt_generated
.classpath
.factorypath
Expand All @@ -19,14 +22,14 @@ bin/
.springBeans
.sts4-cache

### IntelliJ IDEA ###
### IntelliJ IDEA
.idea
*.iws
*.iml
*.ipr
log/

### NetBeans ###
### NetBeans
nbproject/private/
build/
nbbuild/
Expand All @@ -38,22 +41,27 @@ nbdist/
.DS_Store
*/.DS_Store

### VS Code ###
### VSCode
*.project
*.factorypath
.vscode
!.vscode/extensions.json

### Compiled class file
*.class

### Log file
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

### BlueJ files
*.ctxt

### Mobile Tools for Java (J2ME)
.mtj.tmp/

### Package Files
*.war
*.nar
Expand All @@ -62,15 +70,10 @@ nbdist/
*.tar.gz
*.rar

### VSCode
.vscode

### Local file
application-local.yml
application-local.yaml
application-local.properties

/workplace/
*/workplace/
/ui/node_modules/
/app/src/main/resources/console/
app/src/main/resources/console/
workplace/
16 changes: 9 additions & 7 deletions api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
plugins {
id 'java-library'
id 'maven-publish'
id "io.freefair.lombok" version "8.0.0-rc2"
id "io.freefair.lombok" version "8.14"
}

group = 'run.halo.feed'
version = rootProject.version

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
withSourcesJar()
}

compileJava.options.encoding = "UTF-8"
compileTestJava.options.encoding = "UTF-8"
javadoc.options.encoding = "UTF-8"
tasks.withType(JavaCompile).configureEach {
options.release = 21
options.encoding = 'UTF-8'
}

dependencies {
api platform('run.halo.tools.platform:plugin:2.20.11')
api platform('run.halo.tools.platform:plugin:2.21.0')
compileOnly 'run.halo.app:api'
}

Expand Down
27 changes: 20 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
plugins {
id 'java'
id "io.freefair.lombok" version "8.0.0-rc2"
id "run.halo.plugin.devtools" version "0.4.1"
id "io.freefair.lombok" version "8.14"
id "run.halo.plugin.devtools" version "0.6.1"
}

group = 'run.halo.feed'
version = rootProject.version

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

tasks.withType(JavaCompile).configureEach {
options.release = 21
options.encoding = 'UTF-8'
}

jar {
archiveBaseName.set("plugin-feed")
dependsOn(":api:jar")
Expand All @@ -24,23 +35,25 @@ dependencies {
testImplementation 'run.halo.app:api'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.projectreactor:reactor-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

tasks.register('copyUI', Copy) {
dependsOn ':ui:build'
tasks.register('processUiResources', Copy) {
from project(':ui').layout.buildDirectory.dir('dist')
into layout.buildDirectory.dir('resources/main/console')
dependsOn project(':ui').tasks.named('assemble')
shouldRunAfter tasks.named('processResources')
}

tasks.named('processResources') {
dependsOn('copyUI')
tasks.named('classes') {
dependsOn tasks.named('processUiResources')
}

test {
useJUnitPlatform()
}

halo {
version = '2.20.11'
version = '2.21.3'
debug = true
}
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ plugins {
allprojects {
repositories {
mavenCentral()
maven { url 'https://s01.oss.sonatype.org/content/repositories/releases' }
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
maven { url 'https://repo.spring.io/milestone' }
}
}
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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
10 changes: 6 additions & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
pluginManagement {
repositories {
mavenCentral()
gradlePluginPortal()
}
}
rootProject.name = 'plugin-feed'

include 'api'
include 'app'
include 'ui'
include 'api', 'app', 'ui'
12 changes: 0 additions & 12 deletions ui/.editorconfig

This file was deleted.

23 changes: 0 additions & 23 deletions ui/.eslintrc.cjs

This file was deleted.

30 changes: 0 additions & 30 deletions ui/.gitignore

This file was deleted.

Loading