Skip to content

Commit c2f7494

Browse files
committed
chore: kotlin 2.0.20-Beta2 update and some major refactorings
1 parent 29022cb commit c2f7494

38 files changed

+1747
-1670
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138

139139
- name: 🕸 Deploy Wasm & Js webapp to Github Pages
140140
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
141-
uses: JamesIves/[email protected].1
141+
uses: JamesIves/[email protected].3
142142
with:
143143
branch: gh-pages
144144
folder: backend/jvm/build/resources/main/app
@@ -148,7 +148,7 @@ jobs:
148148

149149
- name: 🏖️ Publish documentation to Github Pages
150150
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
151-
uses: JamesIves/[email protected].1
151+
uses: JamesIves/[email protected].3
152152
with:
153153
branch: gh-pages
154154
folder: build/dokka/htmlMultiModule
@@ -158,7 +158,7 @@ jobs:
158158

159159
- name: 🏖️ Publish coverage report to Github Pages
160160
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
161-
uses: JamesIves/[email protected].1
161+
uses: JamesIves/[email protected].3
162162
with:
163163
branch: gh-pages
164164
folder: build/reports/kover/html
@@ -168,7 +168,7 @@ jobs:
168168

169169
- name: 🧪️ Publish test report to Github Pages
170170
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
171-
uses: JamesIves/[email protected].1
171+
uses: JamesIves/[email protected].3
172172
with:
173173
branch: gh-pages
174174
folder: build/reports/tests/test

.github/workflows/dependabot-prs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: 🔧Dependabot metadata
1313
id: dependabot-metadata
14-
uses: dependabot/fetch-metadata@v2.1.0
14+
uses: dependabot/fetch-metadata@v2.2.0
1515
with:
1616
github-token: "${{ secrets.GITHUB_TOKEN }}"
1717

README.md

+19-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $ ./gradlew :backend:jvm:run
3939

4040
```bash
4141
$ ./gradlew :backend:jvm:run
42-
$ ./gradlew :shared:run
42+
$ ./gradlew :shared:jvmRun
4343

4444
# Benchmark
4545
$ ./gradlew :benchmark:benchmark
@@ -93,12 +93,6 @@ $ ./gradlew :backend:jvm:run
9393
-e OTEL_EXPORTER_OTLP_ENDPOINT="http://host.docker.internal:4317" \
9494
sureshg/jvm:latest
9595
```
96-
* Tests
97-
98-
```bash
99-
$ ./gradlew :backend:jvm:test -PktorTest
100-
$ ./gradlew :backend:jvm:jvmRun -DmainClass=dev.suresh.lang.SysCallKt --quiet
101-
```
10296

10397
* AppCDS
10498

@@ -107,11 +101,25 @@ $ ./gradlew :backend:jvm:run
107101
$ java -Xlog:class+load:file=/tmp/cds.log:uptime,level,tags,pid \
108102
-XX:+AutoCreateSharedArchive \
109103
-XX:SharedArchiveFile=/tmp/app.jsa \
110-
-jar backend/jvm/build/libs/jvm-app.jar
104+
-jar backend/jvm/build/libs/jvm-all.jar
111105

112106
# cds-log-parser.jar --logFile=/tmp/cds.log
113107
```
114108

109+
* Tests
110+
111+
```bash
112+
$ ./gradlew :backend:jvm:test -PktorTest
113+
$ ./gradlew :backend:jvm:jvmRun -DmainClass=dev.suresh.lang.SysCallKt --quiet
114+
```
115+
116+
* Binary Compatibility
117+
118+
```bash
119+
$ ./gradlew :backend:security:apiDump
120+
$ ./gradlew :backend:security:apiCheck
121+
```
122+
115123
### Wasm/JS
116124

117125
```bash
@@ -221,6 +229,9 @@ $ ./gradlew :backend:jvm:run
221229

222230
# GitHub Actions lint
223231
$ actionlint
232+
233+
# ToDo
234+
# Enable es2015 for configureKotlinJs
224235
```
225236

226237
</details>

backend/boot/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ description = "Kotlin SpringBoot app"
1111

1212
dependencies {
1313
implementation("org.springframework.boot:spring-boot-starter-web")
14-
// implementation("org.springframework.boot:spring-boot-starter-jdbc")
1514
implementation("org.jetbrains.kotlin:kotlin-reflect")
1615
runtimeOnly("org.postgresql:postgresql")
16+
// implementation("org.springframework.boot:spring-boot-starter-jdbc")
17+
// implementation("org.springframework.boot:spring-boot-starter-security")
18+
// implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
19+
// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
1720
testImplementation("org.springframework.boot:spring-boot-starter-test")
1821
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
1922
testImplementation("org.springframework.security:spring-security-test")
2023
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
21-
// implementation("org.springframework.boot:spring-boot-starter-security")
22-
// implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
23-
// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
2424
}
2525

2626
// Fix for https://github.com/Kotlin/dokka/issues/3472

backend/jvm/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ application {
2121
applicationDefaultJvmArgs += jvmArguments(appRun = true)
2222
}
2323

24-
ktor { fatJar { archiveFileName = "${project.name}-app.jar" } }
24+
ktor { fatJar { archiveFileName = "${project.name}-all.jar" } }
2525

2626
jte {
2727
contentType = gg.jte.ContentType.Html

backend/jvm/src/main/resources/META-INF/native-image/jni-config.json

-44
This file was deleted.

backend/jvm/src/main/resources/META-INF/native-image/predefined-classes-config.json

-7
This file was deleted.

backend/jvm/src/main/resources/META-INF/native-image/proxy-config.json

-2
This file was deleted.

0 commit comments

Comments
 (0)