Skip to content
This repository was archived by the owner on Aug 9, 2021. It is now read-only.

Commit dfa2b36

Browse files
FjarikFjarik
committed
Merge branch 'release/1.0'
2 parents 6ac0ad4 + 6327d02 commit dfa2b36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2432
-876
lines changed

‎.circleci/config.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
version: 2 # use CircleCI 2.0
2+
jobs: # a collection of steps
3+
build: # runs not using Workflows must have a `build` job as entry point
4+
5+
working_directory: ~/circleci-demo-java-spring # directory where steps will run
6+
7+
docker: # run the steps with Docker
8+
- image: circleci/openjdk:8-jdk-stretch # ...with this image as the primary container; this is where all `steps` will run
9+
10+
steps: # a collection of executable commands
11+
12+
- checkout # check out source code to working directory
13+
14+
- restore_cache: # restore the saved cache after the first run or if `pom.xml` has changed
15+
# Read about caching dependencies: https://circleci.com/docs/2.0/caching/
16+
key: circleci-demo-java-spring-{{ checksum "pom.xml" }}
17+
18+
- run: mvn dependency:go-offline # gets the project dependencies
19+
20+
- save_cache: # saves the project dependencies
21+
paths:
22+
- ~/.m2
23+
key: circleci-demo-java-spring-{{ checksum "pom.xml" }}
24+
25+
- run: mvn package # run the actual tests
26+
27+
- store_test_results: # uploads the test metadata from the `target/surefire-reports` directory so that it can show up in the CircleCI dashboard.
28+
# Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
29+
path: target/surefire-reports
30+
31+
- store_artifacts: # store the uberjar as an artifact
32+
# Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
33+
path: target/DeltaCraft-1.0.jar
34+
# See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples

‎pom.xml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,93 @@
99
<version>1.0</version>
1010
<build>
1111
<plugins>
12+
<plugin>
13+
<groupId>org.jetbrains.kotlin</groupId>
14+
<artifactId>kotlin-maven-plugin</artifactId>
15+
<version>${kotlin.version}</version>
16+
<executions>
17+
<execution>
18+
<id>compile</id>
19+
<phase>compile</phase>
20+
<goals>
21+
<goal>compile</goal>
22+
</goals>
23+
<configuration>
24+
<sourceDirs>
25+
<sourceDir>${project.basedir}/src/main/java</sourceDir>
26+
</sourceDirs>
27+
</configuration>
28+
</execution>
29+
<execution>
30+
<id>test-compile</id>
31+
<phase>test-compile</phase>
32+
<goals>
33+
<goal>test-compile</goal>
34+
</goals>
35+
<configuration>
36+
<sourceDirs>
37+
<sourceDir>${project.basedir}/src/main/java</sourceDir>
38+
</sourceDirs>
39+
</configuration>
40+
</execution>
41+
</executions>
42+
<configuration>
43+
<jvmTarget>1.8</jvmTarget>
44+
</configuration>
45+
</plugin>
1246
<plugin>
1347
<groupId>org.apache.maven.plugins</groupId>
1448
<artifactId>maven-compiler-plugin</artifactId>
1549
<version>3.8.1</version>
50+
<executions>
51+
<execution>
52+
<id>default-compile</id>
53+
<phase>none</phase>
54+
</execution>
55+
<execution>
56+
<id>default-testCompile</id>
57+
<phase>none</phase>
58+
</execution>
59+
<execution>
60+
<id>java-compile</id>
61+
<phase>compile</phase>
62+
<goals>
63+
<goal>compile</goal>
64+
</goals>
65+
</execution>
66+
<execution>
67+
<id>java-test-compile</id>
68+
<phase>test-compile</phase>
69+
<goals>
70+
<goal>testCompile</goal>
71+
</goals>
72+
</execution>
73+
</executions>
1674
<configuration>
1775
<source>8</source>
1876
<target>8</target>
1977
</configuration>
2078
</plugin>
79+
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
81+
<artifactId>maven-shade-plugin</artifactId>
82+
<version>3.0.0</version>
83+
<executions>
84+
<execution>
85+
<phase>package</phase>
86+
<goals>
87+
<goal>shade</goal>
88+
</goals>
89+
</execution>
90+
</executions>
91+
</plugin>
2192
</plugins>
2293
</build>
2394

2495
<properties>
2596
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2697
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
98+
<kotlin.version>1.3.72</kotlin.version>
2799
</properties>
28100

29101
<repositories>
@@ -34,12 +106,30 @@
34106
</repositories>
35107

36108
<dependencies>
109+
<dependency>
110+
<groupId>org.spigotmc</groupId>
111+
<artifactId>spigot</artifactId>
112+
<version>1.16.1-R0.1-SNAPSHOT</version>
113+
<scope>system</scope>
114+
<systemPath>${pom.basedir}/src/lib/spigot.jar</systemPath>
115+
</dependency>
37116
<dependency>
38117
<groupId>org.spigotmc</groupId>
39118
<artifactId>spigot-api</artifactId>
40119
<version>1.16.1-R0.1-SNAPSHOT</version>
41120
<scope>provided</scope>
42121
</dependency>
122+
<dependency>
123+
<groupId>org.jetbrains.kotlin</groupId>
124+
<artifactId>kotlin-stdlib</artifactId>
125+
<version>${kotlin.version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.jetbrains.kotlin</groupId>
129+
<artifactId>kotlin-test</artifactId>
130+
<version>${kotlin.version}</version>
131+
<scope>test</scope>
132+
</dependency>
43133
</dependencies>
44134

45135
</project>

‎src/lib/spigot.jar‎

34.1 MB
Binary file not shown.

‎src/main/java/eu/quantumsociety/DeltaCraft/classes/CacheRegion.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/main/java/eu/quantumsociety/DeltaCraft/classes/PlayerHome.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/java/eu/quantumsociety/DeltaCraft/commands/home/HomeCommand.java‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/main/java/eu/quantumsociety/DeltaCraft/commands/home/HomesCommand.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/main/java/eu/quantumsociety/DeltaCraft/commands/home/SetHomeCommand.java‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)