Merge pull request #99 from Shynixn/development

Merge changes to master --release
Shynixn · Mar 5, 2023 · 5fc0317 · 5fc0317
2 parents 70e4170 + 167b10f
commit 5fc0317
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -203,6 +203,28 @@ jobs:
           asset_name: MCCoroutine-Minestom-Core.jar
           asset_content_type: application/jar
 
+      - name: Upload Fabric Api to Github
+        if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: /home/runner/work/MCCoroutine/MCCoroutine/mccoroutine-fabric-api/build/libs/mccoroutine-fabric-api-${{ env.RELEASE_VERSION }}.jar
+          asset_name: MCCoroutine-Fabric-Api.jar
+          asset_content_type: application/jar
+
+      - name: Upload Fabric Core to Github
+        if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: /home/runner/work/MCCoroutine/MCCoroutine/mccoroutine-fabric-core/build/libs/mccoroutine-fabric-core-${{ env.RELEASE_VERSION }}.jar
+          asset_name: MCCoroutine-Fabric-Core.jar
+          asset_content_type: application/jar
+
   Documentation:
     runs-on: ubuntu-latest
     if: "contains(github.ref, 'master')"
@@ -228,6 +250,7 @@ jobs:
           ./gradlew generateBungeeCordJavaDocPages > /dev/null
           ./gradlew generateVelocityJavaDocPages > /dev/null
           ./gradlew generateMinestomJavaDocPages > /dev/null
+          ./gradlew generateFabricJavaDocPages > /dev/null
           sudo apt-get install -y mkdocs
           pip install mkdocs-material
           pip install Pygments

diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ tasks.register("printVersion") {
 
 subprojects {
     group 'com.github.shynixn.mccoroutine'
-    version '2.10.0'
+    version '2.11.0'
 
     sourceCompatibility = 1.8
 
@@ -202,3 +202,12 @@ task generateMinestomJavaDocPages(type: org.jetbrains.dokka.gradle.DokkaTask) {
         }
     }
 }
+
+task generateFabricJavaDocPages(type: org.jetbrains.dokka.gradle.DokkaTask) {
+    dokkaSourceSets {
+        named("main") {
+            outputDirectory = file("docs/apidocs")
+            sourceRoots.from(file("mccoroutine-fabric-api/src/main/java"))
+        }
+    }
+}
diff --git a/docs/wiki/docs/installation.md b/docs/wiki/docs/installation.md
@@ -8,53 +8,53 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.10.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.10.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.11.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.11.0")
     }
     ```
 
 === "BungeeCord"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.10.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.10.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.11.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.11.0")
     }
     ```
 
 === "Sponge"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.10.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.10.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.11.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.11.0")
     }
     ```
 
 === "Velocity"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.10.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.10.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.11.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.11.0")
     }
     ```
 
 === "Minestom"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.10.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.10.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.11.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.11.0")
     }
     ```
 
 === "Fabric"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.10.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.10.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.11.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.11.0")
     }
     ```
 
@@ -78,8 +78,8 @@ dependencies {
     **plugin.yml**
     ```yaml
     libraries:
-      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.10.0
-      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.10.0
+      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.11.0
+      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.11.0
     ```
 
 === "Other Server"

diff --git a/docs/wiki/docs/unittests.md b/docs/wiki/docs/unittests.md
@@ -18,7 +18,7 @@ feedback to the real environment.
 
 ```kotlin
 dependencies {
-    testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.10.0")
+    testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.11.0")
 }
 ```
 

diff --git a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.10.0
+version: 2.11.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.bukkit.sample.MCCoroutineSamplePlugin
 commands:

diff --git a/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml b/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.10.0
+version: 2.11.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.bungeecord.sample.MCCoroutineSamplePlugin
 commands:

diff --git a/mccoroutine-fabric-sample/build.gradle.kts b/mccoroutine-fabric-sample/build.gradle.kts
@@ -9,8 +9,8 @@ repositories {
     mavenLocal()
 }
 dependencies {
-    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.10.0")
-    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.10.0")
+    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.11.0")
+    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.11.0")
 
     minecraft("com.mojang", "minecraft", project.extra["minecraft_version"] as String)
     mappings("net.fabricmc", "yarn", project.extra["yarn_mappings"] as String, null, "v2")

diff --git a/mccoroutine-minestom-sample/src/main/resources/extension.json b/mccoroutine-minestom-sample/src/main/resources/extension.json
@@ -1,5 +1,5 @@
 {
   "entrypoint": "com.github.shynixn.mccoroutine.minestom.sample.extension.MCCoroutineSampleExtension",
   "name": "MCCoroutineSampleExtension",
-  "version": "2.10.0"
+  "version": "2.11.0"
 }
diff --git a/mccoroutine-sponge-sample/src/main/resources/mcmod.info b/mccoroutine-sponge-sample/src/main/resources/mcmod.info
@@ -1,7 +1,7 @@
 [{
     "modid": "mccoroutinesample",
     "name": "MCCoroutineSample",
-    "version": "2.10.0",
+    "version": "2.11.0",
     "description": "MCCoroutineSample is sample plugin to use MCCoroutine in Sponge.",
     "authorList": [
         "Shynixn"