Bump versions
This commit is contained in:
parent
2adf0a44a1
commit
745baf798f
@ -5,7 +5,7 @@ packages:
|
|||||||
sources:
|
sources:
|
||||||
- https://git.sr.ht/~crg/lingo
|
- https://git.sr.ht/~crg/lingo
|
||||||
artifacts:
|
artifacts:
|
||||||
- lingo/server/target/lingo-server.jar
|
- lingo/server/target/lingo.jar
|
||||||
tasks:
|
tasks:
|
||||||
- build: |
|
- build: |
|
||||||
cd lingo
|
cd lingo
|
||||||
|
2
Procfile
2
Procfile
@ -1 +1 @@
|
|||||||
web: java -jar server/target/lingo-server.jar
|
web: java -jar server/target/lingo.jar
|
||||||
|
@ -19,8 +19,8 @@ A word guessing game based on the [game show](https://en.wikipedia.org/wiki/Ling
|
|||||||
|
|
||||||
- Build: `mvn clean install`
|
- Build: `mvn clean install`
|
||||||
- Start server
|
- Start server
|
||||||
* Default port (8080): `java -jar server/target/lingo-server.jar`
|
* Default port (8080): `java -jar server/target/lingo.jar`
|
||||||
* Custom port: `java -jar server/target/lingo-server.jar --server.port=<port>`
|
* Custom port: `java -jar server/target/lingo.jar --server.port=<port>`
|
||||||
- Start client
|
- Start client
|
||||||
* Browser: `open http://localhost:<port>`
|
* Browser: `open http://localhost:<port>`
|
||||||
* JavaFX: `mvn -f client javafx:run -Dlingo-url=http://localhost:<port>`
|
* JavaFX: `mvn -f client javafx:run -Dlingo-url=http://localhost:<port>`
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<name>Lingo :: Client</name>
|
<name>Lingo :: Client</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<javafx.version>11.0.2</javafx.version>
|
<javafx.version>15.0.1</javafx.version>
|
||||||
<lingo.url>https://lingo.charego.com</lingo.url>
|
<lingo.url>https://lingo.charego.com</lingo.url>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@ -52,7 +52,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.openjfx</groupId>
|
<groupId>org.openjfx</groupId>
|
||||||
<artifactId>javafx-maven-plugin</artifactId>
|
<artifactId>javafx-maven-plugin</artifactId>
|
||||||
<version>0.0.4</version>
|
<version>0.0.5</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
|
<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
|
||||||
<options>
|
<options>
|
||||||
@ -63,6 +63,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>exec-maven-plugin</artifactId>
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
|
<version>3.0.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
|
<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
|
||||||
<addResourcesToClasspath>true</addResourcesToClasspath>
|
<addResourcesToClasspath>true</addResourcesToClasspath>
|
||||||
|
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>2.3.0.RELEASE</version>
|
<version>2.4.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>com.charego</groupId>
|
<groupId>com.charego</groupId>
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Development Tools -->
|
<!-- Development Tools -->
|
||||||
|
<!-- Enable hot refreshing of resources -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-devtools</artifactId>
|
<artifactId>spring-boot-devtools</artifactId>
|
||||||
@ -35,37 +36,31 @@
|
|||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<!-- Repackage as executable JAR (java -jar) -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- Enable hot refreshing of resources -->
|
<finalName>lingo</finalName>
|
||||||
<!-- Add src/main/resources to the classpath -->
|
|
||||||
<!-- Remove duplicate resources from target/classes -->
|
|
||||||
<addResources>true</addResources>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
|
||||||
<!-- Repackage as executable JAR (java -jar) -->
|
|
||||||
<execution>
|
|
||||||
<id>repackage</id>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- How to build image directly to Docker daemon: -->
|
<!-- How to build image directly to Docker daemon: -->
|
||||||
<!-- $ mvn jib:dockerBuild -->
|
<!-- $ mvn jib:dockerBuild -->
|
||||||
<!-- How to build image and publish to Docker registry: -->
|
<!-- How to build image and publish to Docker registry: -->
|
||||||
<!-- $ mvn jib:build -Djib.to.image=<myregistry>/<myimage>:latest -->
|
<!-- $ mvn jib:build -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.google.cloud.tools</groupId>
|
<groupId>com.google.cloud.tools</groupId>
|
||||||
<artifactId>jib-maven-plugin</artifactId>
|
<artifactId>jib-maven-plugin</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.7.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- Enable this setting to allow pushes to local Docker registry -->
|
<!-- Enable this setting to allow pushes to local Docker registry -->
|
||||||
<!--<allowInsecureRegistries>true</allowInsecureRegistries>-->
|
<!--<allowInsecureRegistries>true</allowInsecureRegistries>-->
|
||||||
<from>
|
<from>
|
||||||
<image>adoptopenjdk:11-jre-openj9</image>
|
<image>adoptopenjdk:11-jre-openj9</image>
|
||||||
</from>
|
</from>
|
||||||
|
<to>
|
||||||
|
<image>docker.io/charego/lingo</image>
|
||||||
|
</to>
|
||||||
<container>
|
<container>
|
||||||
<ports>
|
<ports>
|
||||||
<port>8080</port>
|
<port>8080</port>
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
<link rel="icon" href="favicon.svg" sizes="any" type="image/svg+xml">
|
<link rel="icon" href="favicon.svg" sizes="any" type="image/svg+xml">
|
||||||
<link rel="stylesheet" href="layout.css">
|
<link rel="stylesheet" href="layout.css">
|
||||||
<link rel="stylesheet" href="style.css">
|
<link rel="stylesheet" href="style.css">
|
||||||
<script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
|
<script src="//cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js"></script>
|
||||||
<script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@5.4.4/bundles/stomp.umd.min.js"></script>
|
<script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@6.0.0/bundles/stomp.umd.min.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="vue-app" v-cloak>
|
<div id="vue-app" v-cloak>
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
<button id="skipButton" type="button">Skip Word</button>
|
<button id="skipButton" type="button">Skip Word</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@5.2.0/bundles/stomp.umd.min.js"></script>
|
<script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@6.0.0/bundles/stomp.umd.min.js"></script>
|
||||||
<script src="practice.js"></script>
|
<script src="practice.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user