Skip to content

Commit 83e7f70

Browse files
ShynixnShynixn
authored
Merge pull request #129 from Shynixn/development
Merge changes to master --release
2 parents 67662b0 + fd92f44 commit 83e7f70

File tree

34 files changed

+188
-243
lines changed

34 files changed

+188
-243
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v2
2525
- uses: actions/setup-java@v1
2626
with:
27-
java-version: '8'
27+
java-version: '21'
2828

2929
- name: Build Java Application
3030
run: |

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ tasks.register("printVersion") {
4343

4444
subprojects {
4545
group 'com.github.shynixn.mccoroutine'
46-
version '2.20.0'
46+
version '2.21.0'
4747

4848
sourceCompatibility = 1.8
4949

@@ -145,7 +145,7 @@ subprojects {
145145

146146
dependencies {
147147
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
148-
testImplementation 'org.mockito:mockito-core:2.23.0'
148+
testImplementation 'org.mockito:mockito-core:5.14.2'
149149
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
150150
}
151151
}

‎docs/wiki/docs/installation.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,62 +8,62 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
88

99
```groovy
1010
dependencies {
11-
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.20.0")
12-
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.20.0")
11+
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.21.0")
12+
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.21.0")
1313
}
1414
```
1515

1616
=== "BungeeCord"
1717

1818
```groovy
1919
dependencies {
20-
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.20.0")
21-
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.20.0")
20+
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.21.0")
21+
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.21.0")
2222
}
2323
```
2424

2525
=== "Fabric"
2626

2727
```groovy
2828
dependencies {
29-
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.20.0")
30-
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.20.0")
29+
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.21.0")
30+
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.21.0")
3131
}
3232
```
3333

3434
=== "Folia"
3535

3636
```groovy
3737
dependencies {
38-
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.20.0")
39-
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.20.0")
38+
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.21.0")
39+
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.21.0")
4040
}
4141
```
4242

4343
=== "Minestom"
4444

4545
```groovy
4646
dependencies {
47-
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.20.0")
48-
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.20.0")
47+
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.21.0")
48+
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.21.0")
4949
}
5050
```
5151

5252
=== "Sponge"
5353

5454
```groovy
5555
dependencies {
56-
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.20.0")
57-
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.20.0")
56+
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.21.0")
57+
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.21.0")
5858
}
5959
```
6060

6161
=== "Velocity"
6262

6363
```groovy
6464
dependencies {
65-
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.20.0")
66-
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.20.0")
65+
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.21.0")
66+
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.21.0")
6767
}
6868
```
6969

@@ -87,17 +87,17 @@ dependencies {
8787
**plugin.yml**
8888
```yaml
8989
libraries:
90-
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.20.0
91-
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.20.0
90+
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.21.0
91+
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.21.0
9292
```
9393

9494
=== "Folia"
9595

9696
**plugin.yml**
9797
```yaml
9898
libraries:
99-
- com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.20.0
100-
- com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.20.0
99+
- com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.21.0
100+
- com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.21.0
101101
```
102102

103103

‎docs/wiki/docs/unittests.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ feedback to the real environment.
1919

2020
```kotlin
2121
dependencies {
22-
testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.20.0")
22+
testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.21.0")
2323
}
2424
```
2525

2626
=== "Folia"
2727

2828
```kotlin
2929
dependencies {
30-
testImplementation("com.github.shynixn.mccoroutine:mccoroutine-folia-test:2.20.0")
30+
testImplementation("com.github.shynixn.mccoroutine:mccoroutine-folia-test:2.21.0")
3131
}
3232
```
3333

‎mccoroutine-bukkit-api/build.gradle.kts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
repositories {
24
maven {
35
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
46
}
57
}
68

9+
tasks.withType<KotlinCompile> {
10+
kotlinOptions.jvmTarget = "1.8"
11+
}
12+
713
java {
8-
toolchain {
9-
languageVersion.set(JavaLanguageVersion.of(8))
10-
}
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
1116
}
1217

1318
dependencies {

‎mccoroutine-bukkit-core/build.gradle.kts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
repositories {
24
maven {
35
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
46
}
57
}
68

9+
tasks.withType<KotlinCompile> {
10+
kotlinOptions.jvmTarget = "1.8"
11+
}
12+
713
java {
8-
toolchain {
9-
languageVersion.set(JavaLanguageVersion.of(8))
10-
}
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
1116
}
1217

1318
dependencies {

‎mccoroutine-bukkit-sample/build.gradle.kts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
plugins {
45
id("com.github.johnrengelman.shadow") version ("8.1.1")
@@ -17,10 +18,13 @@ repositories {
1718
}
1819
}
1920

21+
tasks.withType<KotlinCompile> {
22+
kotlinOptions.jvmTarget = "1.8"
23+
}
24+
2025
java {
21-
toolchain {
22-
languageVersion.set(JavaLanguageVersion.of(8))
23-
}
26+
sourceCompatibility = JavaVersion.VERSION_1_8
27+
targetCompatibility = JavaVersion.VERSION_1_8
2428
}
2529

2630
dependencies {

‎mccoroutine-bukkit-sample/src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: MCCoroutine-Sample
2-
version: 2.20.0
2+
version: 2.21.0
33
author: Shynixn
44
main: com.github.shynixn.mccoroutine.bukkit.sample.MCCoroutineSamplePlugin
55
commands:

‎mccoroutine-bukkit-test/build.gradle.kts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
repositories {
24
maven {
35
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
46
}
57
}
68

9+
tasks.withType<KotlinCompile> {
10+
kotlinOptions.jvmTarget = "1.8"
11+
}
12+
713
java {
8-
toolchain {
9-
languageVersion.set(JavaLanguageVersion.of(8))
10-
}
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
1116
}
1217

1318
dependencies {

‎mccoroutine-bungeecord-api/build.gradle.kts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
repositories {
24
maven {
35
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
46
}
57
}
68

9+
tasks.withType<KotlinCompile> {
10+
kotlinOptions.jvmTarget = "1.8"
11+
}
12+
713
java {
8-
toolchain {
9-
languageVersion.set(JavaLanguageVersion.of(8))
10-
}
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
1116
}
1217

1318
dependencies {

0 commit comments

Comments
 (0)