Skip to content

Commit 7e4ea55

Browse files
Update build.gradle and switch to jetbrains annotations (#152)
1 parent d78830c commit 7e4ea55

24 files changed

+35
-45
lines changed

build.gradle

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,8 @@ apply plugin: 'java'
77

88
repositories {
99
mavenCentral()
10-
maven {
11-
url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
12-
}
13-
maven {
14-
url 'https://oss.sonatype.org/content/groups/public/'
15-
}
16-
maven {
17-
url 'https://repo.destroystokyo.com/repository/maven-public/'
18-
}
19-
maven {
20-
url 'https://repo.skriptlang.org/releases'
21-
}
10+
maven { url 'https://repo.papermc.io/repository/maven-public/' }
11+
maven { url 'https://repo.skriptlang.org/releases' }
2212
}
2313

2414
processResources {
@@ -27,14 +17,15 @@ processResources {
2717
]
2818
}
2919

30-
compileJava {
31-
sourceCompatibility = '17'
32-
targetCompatibility = '17'
20+
java {
21+
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
22+
}
23+
24+
tasks.withType(JavaCompile).configureEach {
3325
options.encoding = 'UTF-8'
3426
}
3527

3628
dependencies {
37-
implementation 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
38-
implementation 'com.github.SkriptLang:Skript:2.10.0'
39-
implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
29+
compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.21.10-R0.1-SNAPSHOT'
30+
compileOnly group: 'com.github.SkriptLang', name: 'Skript', version: '2.13.0'
4031
}

src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import ch.njol.skript.lang.function.Function;
44
import ch.njol.skript.lang.function.Functions;
55
import ch.njol.skript.lang.parser.ParserInstance;
6-
import org.eclipse.jdt.annotation.Nullable;
6+
import org.jetbrains.annotations.Nullable;
77

88
public class FunctionWrapper {
99

@@ -36,4 +36,3 @@ public Function<?> getFunction() {
3636
}
3737

3838
}
39-

src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import ch.njol.util.Kleenean;
1010
import com.btk5h.skriptmirror.JavaType;
1111
import com.btk5h.skriptmirror.ObjectWrapper;
12+
import org.jetbrains.annotations.NotNull;
1213
import org.skriptlang.reflect.java.elements.structures.StructImport;
1314
import org.bukkit.Bukkit;
1415
import org.bukkit.plugin.Plugin;
1516
import org.bukkit.plugin.java.JavaPlugin;
16-
import org.eclipse.jdt.annotation.NonNull;
1717

1818
public class ExprPlugin extends SimplePropertyExpression<Object, ObjectWrapper> {
1919

@@ -64,13 +64,13 @@ public ObjectWrapper convert(Object plugin) {
6464
}
6565

6666
@Override
67-
@NonNull
67+
@NotNull
6868
public Class<? extends ObjectWrapper> getReturnType() {
6969
return ObjectWrapper.class;
7070
}
7171

7272
@Override
73-
@NonNull
73+
@NotNull
7474
protected String getPropertyName() {
7575
return "plugin instance";
7676
}

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import ch.njol.util.Checker;
1212
import ch.njol.util.Kleenean;
1313
import ch.njol.util.coll.iterator.ArrayIterator;
14+
import org.jetbrains.annotations.Nullable;
1415
import org.skriptlang.reflect.syntax.condition.ConditionCheckEvent;
1516
import org.skriptlang.reflect.syntax.effect.EffectTriggerEvent;
1617
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
1718
import org.skriptlang.reflect.syntax.expression.ExpressionChangeEvent;
1819
import org.skriptlang.reflect.syntax.expression.ExpressionGetEvent;
1920
import com.btk5h.skriptmirror.util.JavaUtil;
2021
import org.bukkit.event.Event;
21-
import org.eclipse.jdt.annotation.Nullable;
2222
import org.skriptlang.skript.lang.converter.Converters;
2323

2424
import java.util.Iterator;

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprParseTags.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import ch.njol.skript.lang.SkriptParser.ParseResult;
77
import ch.njol.skript.lang.util.SimpleExpression;
88
import ch.njol.util.Kleenean;
9+
import org.jetbrains.annotations.Nullable;
910
import org.skriptlang.reflect.syntax.condition.ConditionCheckEvent;
1011
import org.skriptlang.reflect.syntax.effect.EffectTriggerEvent;
1112
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
1213
import org.skriptlang.reflect.syntax.expression.ExpressionChangeEvent;
1314
import org.skriptlang.reflect.syntax.expression.ExpressionGetEvent;
1415
import org.bukkit.event.Event;
15-
import org.eclipse.jdt.annotation.Nullable;
1616

1717
public class ExprParseTags extends SimpleExpression<String> {
1818

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprClassReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.btk5h.skriptmirror.ObjectWrapper;
1111
import com.btk5h.skriptmirror.util.JavaTypeWrapper;
1212
import org.bukkit.event.Event;
13-
import org.eclipse.jdt.annotation.Nullable;
13+
import org.jetbrains.annotations.Nullable;
1414

1515
public class ExprClassReference extends SimpleExpression<ObjectWrapper> {
1616

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.btk5h.skriptmirror.JavaType;
1616
import com.btk5h.skriptmirror.Null;
1717
import com.btk5h.skriptmirror.ObjectWrapper;
18+
import org.jetbrains.annotations.Nullable;
1819
import org.skriptlang.reflect.java.elements.structures.StructImport;
1920
import com.btk5h.skriptmirror.util.JavaUtil;
2021
import com.btk5h.skriptmirror.util.LRUCache;
@@ -23,7 +24,6 @@
2324
import com.btk5h.skriptmirror.util.StringSimilarity;
2425
import com.btk5h.skriptmirror.util.lookup.LookupGetter;
2526
import org.bukkit.event.Event;
26-
import org.eclipse.jdt.annotation.Nullable;
2727
import org.skriptlang.skript.lang.converter.Converters;
2828
import org.skriptlang.skript.lang.script.Script;
2929

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprNewArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.btk5h.skriptmirror.ObjectWrapper;
1111
import com.btk5h.skriptmirror.util.JavaTypeWrapper;
1212
import org.bukkit.event.Event;
13-
import org.eclipse.jdt.annotation.Nullable;
13+
import org.jetbrains.annotations.Nullable;
1414

1515
import java.lang.reflect.Array;
1616

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.btk5h.skriptmirror.util.JavaUtil;
2020
import com.btk5h.skriptmirror.util.SkriptUtil;
2121
import org.bukkit.event.Event;
22-
import org.eclipse.jdt.annotation.Nullable;
22+
import org.jetbrains.annotations.Nullable;
2323

2424
import java.lang.reflect.InvocationHandler;
2525
import java.lang.reflect.InvocationTargetException;

src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.btk5h.skriptmirror.util.SkriptUtil;
1616
import org.bukkit.Bukkit;
1717
import org.bukkit.event.Event;
18-
import org.eclipse.jdt.annotation.Nullable;
18+
import org.jetbrains.annotations.Nullable;
1919

2020
import java.util.ArrayList;
2121
import java.util.Collections;

0 commit comments

Comments
 (0)