9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00

[ci skip] Update API publish work

This commit is contained in:
Dreeam
2024-05-07 09:04:40 -04:00
parent b81d95630e
commit 28d9a1f3a8
5 changed files with 17 additions and 18 deletions

View File

@@ -36,15 +36,14 @@ jobs:
mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.20.6-mojmap.jar mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.20.6-mojmap.jar
mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.6-reobf.jar mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.6-reobf.jar
- name: Publish API # - name: Publish API
if: github.event_name != 'pull_request' # if: github.event_name != 'pull_request'
run: | # run: |
echo "GITHUB_USERNAME=Leaf" >> $GITHUB_ENV # ./gradlew :leaf-api:publish
export GITHUB_USERNAME=Leaf # ./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true
echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV # env:
export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} # ORG_GRADLE_PROJECT_leafUsername: ${{ secrets.REPO_USER }}
./gradlew :leaf-api:publish # ORG_GRADLE_PROJECT_leafPassword: ${{ secrets.REPO_PASSWORD }}
./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true
- name: Upload Leaf - name: Upload Leaf
uses: actions/upload-artifact@main uses: actions/upload-artifact@main

View File

@@ -47,7 +47,7 @@ Building a Paperclip JAR for distribution:
### Maven ### Maven
```xml ```xml
<dependency> <dependency>
<groupId>org.dreeam.leaf</groupId> <groupId>cn.dreeam.leaf</groupId>
<artifactId>leaf-api</artifactId> <artifactId>leaf-api</artifactId>
<version>1.20.6-R0.1-SNAPSHOT</version> <version>1.20.6-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
@@ -56,7 +56,7 @@ Building a Paperclip JAR for distribution:
### Gradle ### Gradle
```kotlin ```kotlin
dependencies { dependencies {
compileOnly("org.dreeam.leaf:leaf-api:1.20.6-R0.1-SNAPSHOT") compileOnly("cn.dreeam.leaf:leaf-api:1.20.6-R0.1-SNAPSHOT")
} }
``` ```

View File

@@ -86,7 +86,7 @@ paperweight {
} }
tasks.generateDevelopmentBundle { tasks.generateDevelopmentBundle {
apiCoordinates = "org.dreeam.leaf:leaf-api" apiCoordinates = "cn.dreeam.leaf:leaf-api"
mojangApiCoordinates = "io.papermc.paper:paper-mojangapi" mojangApiCoordinates = "io.papermc.paper:paper-mojangapi"
libraryRepositories.set( libraryRepositories.set(
listOf( listOf(
@@ -113,8 +113,8 @@ allprojects {
name = "leaf" name = "leaf"
url = uri("https://maven.pkg.github.com/Winds-Studio/Leaf") url = uri("https://maven.pkg.github.com/Winds-Studio/Leaf")
credentials.username = System.getenv("GITHUB_USERNAME") credentials.username = System.getenv("REPO_PASSWORD")
credentials.password = System.getenv("GITHUB_TOKEN") credentials.password = System.getenv("REPO_USER")
} }
publications { publications {

View File

@@ -1,4 +1,4 @@
group = org.dreeam.leaf group = cn.dreeam.leaf
version = 1.20.6-R0.1-SNAPSHOT version = 1.20.6-R0.1-SNAPSHOT
galeCommit = 593d73f96816716e0ef7c017140b914bf0c93279 galeCommit = 593d73f96816716e0ef7c017140b914bf0c93279

View File

@@ -101,7 +101,7 @@ index a77d650fd3b58cc883f284e1d2e41459ae0a77cd..ff4603d4749afdd3ff388c4b5d02ae66
while (this.getRunningThread().isAlive()) { while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop(); this.getRunningThread().stop();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e1c8b5a9f8d8056ff687b65fa2e571579bd6beb4..1231a1e2106a75417d1da9dc3e1488704b91a3f1 100644 index 4a9e867bb2589fd48940dee89c5ddc9abb58be55..5f9cc88fbb05e587e022160b392e58a88b7d6fea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -271,7 +271,7 @@ import javax.annotation.Nullable; // Paper @@ -271,7 +271,7 @@ import javax.annotation.Nullable; // Paper
@@ -127,7 +127,7 @@ index 79192e3a0f27d48f35c0378b58e587212ed2c305..006adb2adb27c497ede69f87e78bc3e3
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 0b5979723bb30f9011ac64c36d894aa41713ec9b..17e3ee3a73a2347e9f0baa0ed1640a3b0e75ed16 100644 index 0b5979723bb30f9011ac64c36d894aa41713ec9b..e220f5601f6b92b7b280ce8ebe64117d30192b0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning { @@ -11,7 +11,7 @@ public final class Versioning {
@@ -135,7 +135,7 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..17e3ee3a73a2347e9f0baa0ed1640a3b
String result = "Unknown-Version"; String result = "Unknown-Version";
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.galemc.gale/gale-api/pom.properties"); // Gale - branding changes - InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.galemc.gale/gale-api/pom.properties"); // Gale - branding changes
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.dreeam.leaf/leaf-api/pom.properties"); // Gale - branding changes // Leaf + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/cn.dreeam.leaf/leaf-api/pom.properties"); // Gale - branding changes // Leaf
Properties properties = new Properties(); Properties properties = new Properties();
if (stream != null) { if (stream != null) {