Skip to content

Commit 199239e

Browse files
committed
Migrate to Kotlin M13
1 parent 6c0202c commit 199239e

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ Demo web application using Spring Boot, Kotlin and React.js. This project depend
55

66
### Getting started
77

8-
You need Java 1.8, Maven 3, NPM and Webpack pre-installed. Fork or clone this repository, then:
8+
You need [Java 8](https://www.oracle.com/java/), [Maven 3](https://maven.apache.org/
9+
), [NPM](https://www.npmjs.com/) and [Webpack](https://webpack.github.io/) pre-installed. Fork or clone this repository, then execute: `npm run all`
910

10-
- Install: `npm install`
11-
- Build: `webpack`
12-
- Start: `mvn spring-boot:run`
11+
### Development
12+
13+
Use the following commands for development:
14+
15+
- Build: `npm run build`
16+
- Start: `npm run serve`
17+
- All: `npm run all`
1318

1419
> Use `webpack --watch` to automatically rebuild JavaScript files on the fly.
1520

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"type": "git",
1111
"url": "https://github.com/winterbe/spring-kotlin-react-demo"
1212
},
13+
"scripts": {
14+
"build": "mvn -q compile && npm install && webpack",
15+
"serve": "mvn -q spring-boot:run",
16+
"all": "npm install && webpack && mvn -q spring-boot:run"
17+
},
1318
"dependencies": {
1419
"babel-core": "^5.8.22",
1520
"babel-loader": "^5.3.2",

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</parent>
2020

2121
<properties>
22-
<kotlin.version>0.12.1230</kotlin.version>
22+
<kotlin.version>0.13.1514</kotlin.version>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<java.version>1.8</java.version>
2525
</properties>

0 commit comments

Comments
 (0)