Skip to content

Commit c2b5325

Browse files
redomarredomar
authored
Merge pull request #24 from redomar/develop
Update to 1.8.6 - Code refactored
2 parents 1295a77 + 2453d5d commit c2b5325

Some content is hidden

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

72 files changed

+1524
-3027
lines changed

‎.github/workflows/gradle.yml‎

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

‎.github/workflows/maven.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Java CI with Maven
2+
3+
on:
4+
push:
5+
branches: ['master', 'develop']
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Set up JDK 8
15+
uses: actions/setup-java@v3
16+
with:
17+
java-version: '8'
18+
distribution: 'temurin'
19+
cache: maven
20+
- name: Build with Maven - Install
21+
run: mvn install:install-file -Dfile=res/jars/JSplashScreen.jar -DgroupId=com.thehowtotutorial.splashscreen -DartifactId=JSplashScreen -Dversion=1.0 -Dpackaging=jar
22+
- name: Build with Maven - From Pom
23+
run: mvn -B package --file pom.xml
24+
25+
- name: Upload build artifacts
26+
uses: actions/[email protected]
27+
with:
28+
name: my-artifacts
29+
path: target/*.jar
30+
31+
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
32+
- name: Update dependency graph
33+
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,5 @@ out/
190190
.log.txt
191191
/.gradle/
192192
Package game.png
193+
target/*
194+
.PrintType-TEST.txt

‎build.gradle‎

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

‎gradle/wrapper/gradle-wrapper.jar‎

-57.3 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

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

‎pom.xml‎

Lines changed: 121 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
45
<modelVersion>4.0.0</modelVersion>
56
<groupId>com.redomar.game</groupId>
67
<artifactId>javagame</artifactId>
7-
<version>Alpha 1.8.5</version>
8+
<version>Alpha 1.8.6</version>
89
<inceptionYear>2013</inceptionYear>
910
<licenses>
1011
<license>
@@ -13,24 +14,136 @@
1314
<distribution>repo</distribution>
1415
</license>
1516
</licenses>
17+
<repositories>
18+
<repository>
19+
<id>local-maven-repo</id>
20+
<url>file://${project.basedir}/res/jars</url>
21+
</repository>
22+
</repositories>
1623
<dependencies>
1724
<dependency>
1825
<groupId>org.apache.commons</groupId>
1926
<artifactId>commons-text</artifactId>
20-
<version>+</version>
21-
<scope>runtime</scope>
27+
<version>1.10.0</version>
2228
</dependency>
2329
<dependency>
2430
<groupId>org.apache.commons</groupId>
2531
<artifactId>commons-lang3</artifactId>
26-
<version>3.+</version>
27-
<scope>runtime</scope>
32+
<version>3.12.0</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.jetbrains</groupId>
36+
<artifactId>annotations</artifactId>
37+
<version>23.1.0</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.thehowtotutorial.splashscreen</groupId>
41+
<artifactId>JSplashScreen</artifactId>
42+
<version>1.0</version>
2843
</dependency>
2944
<dependency>
3045
<groupId>junit</groupId>
3146
<artifactId>junit</artifactId>
32-
<version>4.13</version>
47+
<version>4.13.2</version>
3348
<scope>test</scope>
3449
</dependency>
3550
</dependencies>
51+
<properties>
52+
<maven.compiler.source>8</maven.compiler.source>
53+
<maven.compiler.target>8</maven.compiler.target>
54+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
55+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
56+
</properties>
57+
<build>
58+
<sourceDirectory>src</sourceDirectory>
59+
<resources>
60+
<resource>
61+
<directory>res</directory>
62+
</resource>
63+
</resources>
64+
<testSourceDirectory>
65+
test
66+
</testSourceDirectory>
67+
<plugins>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-resources-plugin</artifactId>
71+
<version>2.6</version>
72+
<configuration>
73+
<useDefaultDelimiters>false</useDefaultDelimiters>
74+
<delimiters>
75+
<delimiter>${*}</delimiter>
76+
<delimiter>@</delimiter>
77+
</delimiters>
78+
<encoding>UTF-8</encoding>
79+
</configuration>
80+
</plugin>
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-dependency-plugin</artifactId>
84+
<version>3.3.0</version>
85+
<executions>
86+
<execution>
87+
<id>copy-dependencies</id>
88+
<phase>prepare-package</phase>
89+
<goals>
90+
<goal>copy-dependencies</goal>
91+
</goals>
92+
<configuration>
93+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
94+
<overWriteReleases>false</overWriteReleases>
95+
<overWriteSnapshots>false</overWriteSnapshots>
96+
<overWriteIfNewer>true</overWriteIfNewer>
97+
</configuration>
98+
</execution>
99+
</executions>
100+
</plugin>
101+
<plugin>
102+
<!-- Build an executable JAR -->
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-jar-plugin</artifactId>
105+
<version>2.4</version>
106+
<configuration>
107+
108+
<archive>
109+
<manifest>
110+
<addClasspath>true</addClasspath>
111+
<classpathPrefix>lib/</classpathPrefix>
112+
<mainClass>com.redomar.game.Launcher</mainClass>
113+
</manifest>
114+
</archive>
115+
</configuration>
116+
<dependencies>
117+
<dependency>
118+
<groupId>com.thehowtotutorial.splashscreen</groupId>
119+
<artifactId>JSplashScreen</artifactId>
120+
<version>1.0</version>
121+
</dependency>
122+
</dependencies>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-install-plugin</artifactId>
127+
<version>2.4</version>
128+
<executions>
129+
<execution>
130+
<id>install-external-non-maven-jar-MWS-Client-into-local-maven-repo</id>
131+
<phase>clean</phase>
132+
<configuration>
133+
<repositoryLayout>default</repositoryLayout>
134+
<groupId>com.thehowtotutorial.splashscreen</groupId>
135+
<artifactId>JSplashScreen</artifactId>
136+
<version>1.0</version>
137+
<file>${project.basedir}/res/jars/JSplashScreen.jar</file>
138+
<packaging>jar</packaging>
139+
<generatePom>true</generatePom>
140+
</configuration>
141+
<goals>
142+
<goal>install-file</goal>
143+
</goals>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
</plugins>
148+
</build>
36149
</project>

‎res/music/Towards The End.wav‎

31.3 MB
Binary file not shown.

‎res/music/small.wav‎

11.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)