Skip to content

Commit 16161d5

Browse files
authored
Merge pull request #10193 from eugenp/fix-kotlinjs-version
upgrade gradle, kotlin versions
2 parents a0299b2 + e31e8cc commit 16161d5

7 files changed

Lines changed: 87 additions & 59 deletions

File tree

kotlin-js/build.gradle

100755100644
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
buildscript {
2-
ext.kotlin_version = '1.2.41'
3-
repositories {
4-
mavenCentral()
5-
}
6-
dependencies {
7-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
8-
}
9-
}
10-
11-
group 'com.baeldung'
12-
version '1.0-SNAPSHOT'
13-
apply plugin: 'kotlin2js'
14-
15-
repositories {
16-
mavenCentral()
17-
}
18-
19-
dependencies {
20-
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
21-
testCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
22-
}
23-
24-
compileKotlin2Js.kotlinOptions {
25-
moduleKind = "commonjs"
26-
outputFile = "node/crypto.js"
27-
}
1+
buildscript {
2+
ext.kotlin_version = '1.4.10'
3+
repositories {
4+
mavenCentral()
5+
}
6+
dependencies {
7+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
8+
}
9+
}
10+
11+
group 'com.baeldung'
12+
version '1.0-SNAPSHOT'
13+
apply plugin: 'kotlin2js'
14+
15+
repositories {
16+
mavenCentral()
17+
}
18+
19+
dependencies {
20+
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
21+
testCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
22+
}
23+
24+
compileKotlin2Js.kotlinOptions {
25+
moduleKind = "commonjs"
26+
outputFile = "node/crypto.js"
27+
}
4.26 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

kotlin-js/gradlew

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

kotlin-js/gradlew.bat

100755100644
Lines changed: 20 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kotlin-js/package.json

100755100644
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
{
2-
"name": "kotlin-node.js",
2+
"name": "kotlin-node",
33
"version": "1.0.0",
44
"description": "Example of using NodeJS in Kotlin",
55
"main": "crypto.js",
6-
"dependencies": {
7-
"express": "^4.15.2",
8-
"fs": "0.0.1-security",
9-
"kotlin": "^1.1.0",
10-
"node.js": "0.0.0",
11-
"request": "^2.85.0"
12-
},
13-
"devDependencies": {},
146
"scripts": {
157
"start": "node node/crypto.js"
8+
},
9+
"author": "",
10+
"license": "ISC",
11+
"dependencies": {
12+
"express": "^4.17.1",
13+
"kotlin": "^1.4.10"
1614
}
1715
}

kotlin-js/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name = 'KotlinNode'
1+
rootProject.name = 'kotlin-node'

0 commit comments

Comments
 (0)