@@ -20,29 +20,28 @@ index edf9e5c3afdfcb9e357974d6536d25bd828d67b0..dfa15b1d499bd8bf1cb6b81441d0d409
20
20
21
21
diff --git a/build.gradle b/build.gradle
22
22
new file mode 100644
23
- index 0000000000000000000000000000000000000000..45aafcce4ef6ae0e0fa01eba5f174a501f1a3ca0
23
+ index 0000000000000000000000000000000000000000..a9a3e5af8057128b24b51fe07a7cd2914b205991
24
24
--- /dev/null
25
25
+++ b/build.gradle
26
- @@ -0,0 +1,45 @@
26
+ @@ -0,0 +1,56 @@
27
27
+ dependencies {
28
28
+ // Minecraft libraries start
29
- + api 'commons-lang:commons-lang:2.6'
30
- + api 'com.googlecode.json-simple:json-simple:1.1.1'
31
- + api 'org.avaje:ebean:2.8.1'
32
- + api 'org.yaml:snakeyaml:1.15'
33
- + api 'net.md-5:bungeecord-chat:1.8-SNAPSHOT'
34
- +
35
- + // bundled with Minecraft, should be kept in sync
36
29
+ api 'com.google.guava:guava:17.0'
37
30
+ api 'com.google.code.gson:gson:2.2.4'
31
+ + api 'net.md-5:bungeecord-chat:1.8-SNAPSHOT'
32
+ + api 'org.yaml:snakeyaml:1.15'
33
+ + api ('com.googlecode.json-simple:json-simple:1.1.1') {
34
+ + transitive = false
35
+ + }
36
+ + api 'org.avaje:ebean:2.8.1'
37
+ + api 'commons-lang:commons-lang:2.6'
38
38
+
39
39
+ compileOnlyApi 'net.sf.trove4j:trove4j:3.0.3' // provided by CraftBukkit
40
40
+ // Minecraft libraries end
41
41
+
42
- + // Titanium start - Use okaeri-configs for server configuration
43
- + api 'eu.okaeri:okaeri-configs-yaml-bukkit:4.0.6'
44
- + api 'eu.okaeri:okaeri-configs-serdes-commons:4.0.6'
45
- + // Titanium end
42
+ + // Titanium libraries start
43
+ + api 'org.apache.commons:commons-lang3:3.12.0' // Titanium - updated commons-lang3 to 3.12.0 // Titanium - Add commons-lang3 to API
44
+ + // Titanium libraries end
46
45
+
47
46
+ testImplementation 'junit:junit:4.13.2' // Titanium - Updated junit to 4.13.2
48
47
+ testImplementation 'org.hamcrest:hamcrest-library:1.3'
@@ -57,6 +56,18 @@ index 0000000000000000000000000000000000000000..45aafcce4ef6ae0e0fa01eba5f174a50
57
56
+ file.write "version=${project.version}"
58
57
+ }
59
58
+
59
+ + shadowJar {
60
+ + dependsOn generateApiVersioningFile
61
+ + from(layout.buildDirectory.file("pom.properties")) {
62
+ + into("META-INF/maven/${project.group}/${project.name.toLowerCase()}")
63
+ + }
64
+ +
65
+ + manifest {
66
+ + attributes(
67
+ + "Automatic-Module-Name": "org.bukkit"
68
+ + )
69
+ + }
70
+ + }
60
71
+ jar {
61
72
+ dependsOn generateApiVersioningFile
62
73
+ from(layout.buildDirectory.file("pom.properties")) {
@@ -72,42 +83,49 @@ index 0000000000000000000000000000000000000000..45aafcce4ef6ae0e0fa01eba5f174a50
72
83
\ No newline at end of file
73
84
diff --git a/pom.xml b/pom.xml
74
85
deleted file mode 100644
75
- index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba ..0000000000000000000000000000000000000000
86
+ index fe9d6d265b686ae1c373e4fdcd202b16673366f1 ..0000000000000000000000000000000000000000
76
87
--- a/pom.xml
77
88
+++ /dev/null
78
- @@ -1,187 +0,0 @@
89
+ @@ -1,161 +0,0 @@
79
90
-
80
91
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
81
92
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
82
93
- <modelVersion>4.0.0</modelVersion>
83
94
-
84
95
- <parent>
85
- - <groupId>net.titanvale </groupId>
86
- - <artifactId>titanium -parent</artifactId>
87
- - <version>1.8.8 -SNAPSHOT</version>
96
+ - <groupId>org.github.paperspigot </groupId>
97
+ - <artifactId>paperspigot -parent</artifactId>
98
+ - <version>dev -SNAPSHOT</version>
88
99
- </parent>
89
100
-
90
- - <name>Titanium-API</name >
91
- - <artifactId>titanium -api</artifactId>
101
+ - <groupId>org.github.paperspigot</groupId >
102
+ - <artifactId>paperspigot -api</artifactId>
92
103
- <version>1.8.8-R0.1-SNAPSHOT</version>
93
104
- <packaging>jar</packaging>
94
105
-
106
+ - <name>PaperSpigot-API</name>
107
+ - <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
108
+ - <description>An enhanced plugin API for Minecraft servers.</description>
109
+ -
95
110
- <properties>
96
111
- <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
97
112
- <additionalparam>-Xdoclint:none</additionalparam>
98
113
- <maven.compiler.source>1.8</maven.compiler.source>
99
114
- <maven.compiler.target>1.8</maven.compiler.target>
100
115
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
101
- - <!-- Titanium - since submodules inherit this from titanium-parent -->
102
- - <maven.deploy.skip>false</maven.deploy.skip>
103
116
- </properties>
104
117
-
105
- - <repositories>
118
+ - <!-- just until we get deployment to central approved -->
119
+ - <distributionManagement>
106
120
- <repository>
107
- - <id>jitpack-io </id>
108
- - <url>https://jitpack.io </url>
121
+ - <id>destroystokyo-releases </id>
122
+ - <url>https://repo.destroystokyo.com/content/repositories/releases/ </url>
109
123
- </repository>
110
- - </repositories>
124
+ - <snapshotRepository>
125
+ - <id>destroystokyo-snapshots</id>
126
+ - <url>https://repo.destroystokyo.com/content/repositories/snapshots/</url>
127
+ - </snapshotRepository>
128
+ - </distributionManagement>
111
129
-
112
130
- <!-- required until fixed plexus-compiler-eclipse is deployed -->
113
131
- <pluginRepositories>
@@ -119,11 +137,6 @@ index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba..00000000000000000000000000000000
119
137
-
120
138
- <dependencies>
121
139
- <dependency>
122
- - <groupId>com.google.code.findbugs</groupId>
123
- - <artifactId>jsr305</artifactId>
124
- - <version>3.0.2</version>
125
- - </dependency>
126
- - <dependency>
127
140
- <groupId>net.sf.trove4j</groupId>
128
141
- <artifactId>trove4j</artifactId>
129
142
- <version>3.0.3</version>
@@ -154,7 +167,7 @@ index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba..00000000000000000000000000000000
154
167
- <dependency>
155
168
- <groupId>com.google.code.gson</groupId>
156
169
- <artifactId>gson</artifactId>
157
- - <version>2.2.4</version>
170
+ - <version>2.2.4</version>
158
171
- </dependency>
159
172
- <dependency>
160
173
- <groupId>org.avaje</groupId>
@@ -169,27 +182,18 @@ index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba..00000000000000000000000000000000
169
182
- <scope>compile</scope>
170
183
- </dependency>
171
184
- <dependency>
172
- - <groupId>com.github.Electroid </groupId>
173
- - <artifactId>BungeeCord </artifactId>
174
- - <version>master </version>
185
+ - <groupId>net.md-5 </groupId>
186
+ - <artifactId>bungeecord-chat </artifactId>
187
+ - <version>1.8-SNAPSHOT </version>
175
188
- <type>jar</type>
176
189
- <scope>compile</scope>
177
190
- </dependency>
178
- - <dependency>
179
- - <groupId>eu.okaeri</groupId>
180
- - <artifactId>okaeri-configs-yaml-bukkit</artifactId>
181
- - <version>4.0.0-beta18</version>
182
- - </dependency>
183
- - <dependency>
184
- - <groupId>eu.okaeri</groupId>
185
- - <artifactId>okaeri-configs-serdes-commons</artifactId>
186
- - <version>4.0.0-beta18</version>
187
- - </dependency>
191
+ -
188
192
- <!-- testing -->
189
193
- <dependency>
190
194
- <groupId>junit</groupId>
191
195
- <artifactId>junit</artifactId>
192
- - <version>4.13.2 </version>
196
+ - <version>4.12 </version>
193
197
- <scope>test</scope>
194
198
- </dependency>
195
199
- <dependency>
@@ -206,7 +210,7 @@ index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba..00000000000000000000000000000000
206
210
- <groupId>org.apache.maven.plugins</groupId>
207
211
- <artifactId>maven-compiler-plugin</artifactId>
208
212
- <!-- versions after this appear to be broken -->
209
- - <version>3.10. 1</version>
213
+ - <version>3.1</version>
210
214
- <configuration>
211
215
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
212
216
- <compilerId>eclipse</compilerId>
@@ -225,7 +229,7 @@ index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba..00000000000000000000000000000000
225
229
- <plugin>
226
230
- <groupId>org.apache.maven.plugins</groupId>
227
231
- <artifactId>maven-shade-plugin</artifactId>
228
- - <version>3.3.0 </version>
232
+ - <version>2.3 </version>
229
233
- <executions>
230
234
- <execution>
231
235
- <phase>package</phase>
@@ -241,25 +245,6 @@ index 2ff99a888a04e285fb9bf10cb5cf5560a60227ba..00000000000000000000000000000000
241
245
- <shadedArtifactAttached>true</shadedArtifactAttached>
242
246
- </configuration>
243
247
- </plugin>
244
- - <plugin>
245
- - <groupId>org.apache.maven.plugins</groupId>
246
- - <artifactId>maven-source-plugin</artifactId>
247
- - <version>3.2.0</version>
248
- - <executions>
249
- - <execution>
250
- - <id>attach-sources</id>
251
- - <phase>verify</phase>
252
- - <goals>
253
- - <goal>jar-no-fork</goal>
254
- - </goals>
255
- - </execution>
256
- - </executions>
257
- - </plugin>
258
- - <plugin>
259
- - <groupId>org.apache.maven.plugins</groupId>
260
- - <artifactId>maven-deploy-plugin</artifactId>
261
- - <version>3.0.0-M2</version>
262
- - </plugin>
263
248
- </plugins>
264
249
- </build>
265
250
- </project>
@@ -284,15 +269,3 @@ index 7e89b97b60d547c75bde6d54f1512b0277099034..56e932b84ee8cde6a86d7a4f4cc562dd
284
269
} catch (Exception ignored) {}
285
270
286
271
new AuthorNagException("Deprecated use of CustomTimingsHandler. Please Switch to Timings.of ASAP").printStackTrace();
287
- diff --git a/src/test/java/org/bukkit/DifficultyTest.java b/src/test/java/org/bukkit/DifficultyTest.java
288
- index 293e283a22fdc2abb387c29239cc3391f7cb6a4f..9ef39817d0df126e74c121073b71b3a881e949f8 100644
289
- --- a/src/test/java/org/bukkit/DifficultyTest.java
290
- +++ b/src/test/java/org/bukkit/DifficultyTest.java
291
- @@ -2,6 +2,7 @@ package org.bukkit;
292
-
293
- import static org.hamcrest.CoreMatchers.is;
294
- import static org.junit.Assert.assertThat;
295
- + import static org.junit.Assert.assertTrue;
296
-
297
- import org.junit.Test;
298
-
0 commit comments