Upgrade to Halo 2.0.0 (#2)

* Upgrade to Halo 2.0.0
halo-dev · Dec 1, 2022 · 51fafec · 51fafec
1 parent 83739c7
commit 51fafec
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           name: plugin-sitemap
           path: |
-            build/libs/*-plain.jar
+            build/libs/*.jar
           retention-days: 1
 
   github-release:

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,4 @@
 plugins {
-    id 'org.springframework.boot' version '3.0.0'
-    id 'io.spring.dependency-management' version '1.1.0'
     id "io.github.guqing.plugin-development" version "0.0.5-SNAPSHOT"
     id 'java'
 }
@@ -14,10 +12,6 @@ repositories {
     mavenCentral()
 }
 
-bootJar {
-    enabled = false
-}
-
 jar {
     enabled = true
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -31,28 +25,20 @@ jar {
     }
 }
 
-ext {
-    guava = "31.1-jre"
-}
 dependencies {
-    compileOnly "io.swagger.core.v3:swagger-core-jakarta:2.2.0"
-    compileOnly 'org.springframework.boot:spring-boot-starter-webflux'
-    compileOnly "com.google.guava:guava:$guava"
+    compileOnly platform('run.halo.dependencies:halo-dependencies:1.0.0')
 
-    compileOnly 'org.pf4j:pf4j:3.8.0'
-    compileOnly files("lib/halo-2.0.0-SNAPSHOT-plain.jar")
+    compileOnly files("lib/halo-2.0.0-plain.jar")
 
     compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok:1.18.22'
 
-    testImplementation "com.google.guava:guava:$guava"
-    testImplementation 'org.apache.commons:commons-lang3:3.12.0'
+    testImplementation "com.google.guava:guava"
+    testImplementation 'org.apache.commons:commons-lang3'
     testImplementation 'org.springframework.boot:spring-boot-starter-webflux'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.projectreactor:reactor-test'
-    testImplementation files("lib/halo-2.0.0-SNAPSHOT-plain.jar")
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+    testImplementation files("lib/halo-2.0.0-plain.jar")
 }
 
 test {

diff --git a/lib/halo-2.0.0-SNAPSHOT-plain.jar b/lib/halo-2.0.0-SNAPSHOT-plain.jar
diff --git a/lib/halo-2.0.0-plain.jar b/lib/halo-2.0.0-plain.jar
diff --git a/src/main/java/run/halo/sitemap/DefaultSitemapEntryLister.java b/src/main/java/run/halo/sitemap/DefaultSitemapEntryLister.java
@@ -10,10 +10,10 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
-import run.halo.app.core.extension.Category;
-import run.halo.app.core.extension.Post;
-import run.halo.app.core.extension.SinglePage;
-import run.halo.app.core.extension.Tag;
+import run.halo.app.core.extension.content.Category;
+import run.halo.app.core.extension.content.Post;
+import run.halo.app.core.extension.content.SinglePage;
+import run.halo.app.core.extension.content.Tag;
 import run.halo.app.extension.ConfigMap;
 import run.halo.app.extension.ExtensionOperator;
 import run.halo.app.extension.ReactiveExtensionClient;

diff --git a/src/main/resources/plugin.yaml b/src/main/resources/plugin.yaml
@@ -4,8 +4,8 @@ metadata:
   name: PluginSitemap
 spec:
   enabled: true
-  version: 1.0.0-alpha.3
-  requires: ">=2.0.0-beta.2"
+  version: 1.0.0
+  requires: ">=2.0.0"
   author:
     name: Halo OSS Team
     website: https://github.com/halo-dev