Skip to content

Commit 38bdf56

Browse files
author
Ali shirzad
committed
upgraded kotlin and gradle versions
1 parent 7624256 commit 38bdf56

18 files changed

+1908
-1155
lines changed

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ https://kotlin-nodejs.herokuapp.com/
1919
1. express.js to run server
2020
2. ejs templating engine for express.js
2121
3. Kotlin Dependencies
22-
4. gradle to compile/transcompile kotlin to js
22+
4. gradle to compile/trans-compile kotlin to js
2323

2424

2525

@@ -30,6 +30,10 @@ https://kotlin-nodejs.herokuapp.com/
3030

3131
#### Compile Kotlin to JS using gradle
3232

33+
###### On Windows
34+
`$ gradlew.bat build`
35+
36+
###### On Linux / Mac
3337
`$ ./gradlew build`
3438

3539
#### Run Server
@@ -40,8 +44,9 @@ https://kotlin-nodejs.herokuapp.com/
4044
https://kotlinlang.org/docs/reference/js-overview.html
4145

4246
## To Do
43-
1. <s>add frontend framework</s>
44-
2. integrate sass styling
45-
3. use gulp watch for automatic compilation
46-
4. add testing framework
47+
1. <s>add frontend framework</s>
48+
2. add testing framework
49+
3. use jetbrains frontend plugin for dependency management and hot-reload
50+
4. integrate sass styling
51+
4752

backend/server/app.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ group 'com.techprd'
22
version '1.0.0'
33

44
subprojects { p ->
5-
ext.kotlin_version = "1.3.41"
6-
ext.html_version = "0.6.11"
5+
ext.kotlin_version = "1.3.61"
6+
ext.html_version = "0.6.12"
77

88
repositories {
99
mavenLocal()
@@ -12,7 +12,7 @@ subprojects { p ->
1212
}
1313

1414
p.buildscript {
15-
ext.kotlin_version = "1.3.41"
15+
ext.kotlin_version = "1.3.61"
1616

1717
repositories {
1818
mavenLocal()

gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sun Aug 11 00:41:32 AEST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"cookie-parser": "~1.4.3",
1919
"ejs": "~2.5.6",
2020
"express": "^4.17.1",
21-
"kotlin": "^1.3.41",
21+
"kotlin": "^1.3.61",
2222
"materialize-css": "1.0.0-rc.2"
2323
},
2424
"devDependencies": {}

webapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repositories {
1111
dependencies {
1212
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
1313
implementation "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
14-
implementation "org.jetbrains.kotlinx:kotlinx-html-js:$html_version"
14+
compile "org.jetbrains.kotlinx:kotlinx-html-js:$html_version"
1515
compile project(':common')
1616
}
1717

webapp/public/js/main.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)