Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tracking: Kotlin 2.0.0 #587

Merged
merged 25 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0dfa0ac
chore: update to latest gvm
sgammon Jan 25, 2024
b5691f3
fix: version detection on lts gvm releases
sgammon Jan 25, 2024
0cda55b
chore: use as embedded codebase
sgammon Jan 25, 2024
888e39e
chore: dependency upgrades
sgammon Jan 27, 2024
6935cb4
chore: update gradle wrapper
sgammon Jan 27, 2024
865fda3
chore: relock, update verification metadata, submodules
sgammon Jan 27, 2024
307328d
chore: kotlin beta upgrade → \`2.0.0-Beta3\`
sgammon Jan 27, 2024
58b5645
chore: verification metadata updates
sgammon Jan 27, 2024
630811b
fix: don't build site by default, build `uuid` module locally
sgammon Nov 16, 2023
21d52a3
fix: temporarily disable kotlin progressive mode
sgammon Nov 16, 2023
adcbfe9
fix: code changes for kotlin 2.0
sgammon Nov 16, 2023
e1d49d5
fix: temporarily disable `elide.strict`
sgammon Nov 16, 2023
49d9533
fix: further strict mode deactivations
sgammon Jan 27, 2024
0dc774e
fix: continued fixes for kotlin v2.0
sgammon Jan 27, 2024
ceb31ef
chore: update verification metadata
sgammon Jan 27, 2024
3fccd48
chore: add `.kotlin` dir to gitignore
sgammon Jan 27, 2024
4728486
fix: code changes for kotlin 2.0 (re-apply)
sgammon Nov 16, 2023
737f329
fix: nodejs extension warning
sgammon Jan 27, 2024
1594bba
fix: disable `cli` module until mosaic fix is applied
sgammon Jan 27, 2024
f9582d2
chore: update `uuid` subpackage
sgammon Jan 27, 2024
b15f87d
fix: drop native test skips (temp)
sgammon Jan 27, 2024
e4ef8f7
chore: updates to `uuid` package
sgammon Jan 27, 2024
6bf7a6f
fix: drop old `jacocoTestReport` task exclusion
sgammon Jan 27, 2024
5ae6758
fix: drop combined test report task (it breaks lol)
sgammon Jan 27, 2024
f36d604
fix: ignore redaction test until plugins are fixed on kotlin v2.0
sgammon Jan 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/build.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,6 @@ jobs:
-x jvmTest
-x jsTest
-x jsBrowserTest
-x nativeCompile
-x nativeTest
-x nativeOptimizedCompile
Comment on lines -180 to -182
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to be restored with cli build

--scan
--no-daemon
--warning-mode=none
Expand Down Expand Up @@ -275,19 +272,14 @@ jobs:
arguments: |
test
check
jacocoTestReport
koverXmlReport
:tools:reports:reports
--scan
--no-daemon
--warning-mode=none
--dependency-verification=lenient
-x ktlintCheck
-x ktlintKotlinScriptCheck
-x apiCheck
-x nativeTest
-x nativeCompile
-x nativeOptimizedCompile
-Pelide.ci=true
-PbuildSamples=false
-PbuildDocs=false
Expand All @@ -310,9 +302,6 @@ jobs:
-x ktlintCheck
-x ktlintKotlinScriptCheck
-x apiCheck
-x nativeTest
-x nativeCompile
-x nativeOptimizedCompile
-Pelide.ci=true
-PbuildSamples=false
-PbuildDocs=false
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ app-glibc
app-musl
tmpdocs/
test-results-native/
.codebase/cache
.kotlin/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<br />
<a href="https://www.graalvm.org/"><img src="https://img.shields.io/badge/GraalVM-23.x.x-blue.svg?logo=oracle" /></a>
<a href="https://openjdk.org/projects/jdk/21/"><img src="https://img.shields.io/badge/Java-21-blue.svg?logo=oracle" /></a>
<a href="http://kotlinlang.org"><img src="https://img.shields.io/badge/Kotlin-1.9.21-blue.svg?logo=kotlin" /></a>
<a href="http://kotlinlang.org"><img src="https://img.shields.io/badge/Kotlin-2.0.0-blue.svg?logo=kotlin" /></a>
<a href="https://262.ecma-international.org/13.0/"><img src="https://img.shields.io/badge/ECMA-2022-blue.svg?logo=javascript" /></a>
</p>

Expand Down Expand Up @@ -260,7 +260,7 @@ not need some of these components:

| Status | **Java** | **Kotlin** | **GraalVM** | **Micronaut** | **React** | **Protobuf/gRPC** |
|-----------------------------------------------------------------|-------------|------------|-------------|---------------|-----------|--------------------|
| ![Status](https://img.shields.io/badge/-experimental-important) | `Java 21` | `1.9.21` | `23.1.x` | `4.2.x` | `18.x` | `3.25.1`/`1.60.0` |
| ![Status](https://img.shields.io/badge/-experimental-important) | `Java 21` | `2.0.0-Beta3` | `23.1.x` | `4.2.x` | `18.x` | `3.25.1`/`1.60.1` |
| ![Status](https://img.shields.io/badge/-tested-success) | `Java 20` | `1.9.10` | `23.0.x` | `4.0.x` | `18.x` | `3.21.11`/`1.56.1` |
| ![Status](https://img.shields.io/badge/-tested-success) | `Java 20` | `1.9.20` | `23.0.x` | `3.10.x` | `18.x` | `3.21.11`/`1.56.1` |
| ![Status](https://img.shields.io/badge/-tested-success) | `Java 17` | `1.8.20` | `22.3.x` | `3.9.x` | `18.x` | `3.21.11`/`1.42.0` |
Expand Down
20 changes: 10 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ rootProject.plugins.withType(NodeJsRootPlugin::class.java) {
// 16+ required for Apple Silicon support
// https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5259190.0-0
rootProject.the<NodeJsRootExtension>().download = true
rootProject.the<NodeJsRootExtension>().nodeVersion = "20.5.0"
rootProject.the<NodeJsRootExtension>().version = "20.5.0"
}
rootProject.plugins.withType(YarnPlugin::class.java) {
rootProject.the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.WARNING
Expand All @@ -138,7 +138,7 @@ apiValidation {

ignoredProjects += listOf(
"bom",
"cli",
// "cli", @TODO(sgammon): Disabled for Kotlin v2 transition
"proto",
"processor",
"reports",
Expand Down Expand Up @@ -203,7 +203,7 @@ val mermaidDokka: Provider<String> = libs.versions.mermaidDokka
dependencies {
// Kover: Merged Coverage Reporting
kover(projects.packages.base)
kover(projects.packages.cli)
// kover(projects.packages.cli) @TODO(sgammon): Disabled for Kotlin v2 transition
kover(projects.packages.core)
kover(projects.packages.graalvm)
kover(projects.packages.model)
Expand Down Expand Up @@ -427,14 +427,14 @@ if (tasks.findByName("resolveAllDependencies") == null) {
}
}

tasks.register("samples") {
/*tasks.register("samples") {
description = "Build and test all built-in code samples, in the `samples` path and with Knit."

dependsOn(
"buildSamples",
"testSamples",
"nativeTestSamples",
)
//dependsOn(
//"buildSamples",
//"testSamples",
//"nativeTestSamples",
//)
}
Comment on lines +430 to 438
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop


tasks.register("buildSamples") {
Expand All @@ -459,7 +459,7 @@ tasks.register("nativeTestSamples") {
Projects.samples.forEach {
dependsOn("$it:nativeTest")
}
}
}*/

tasks.register("reports") {
description = "Build all reports."
Expand Down
200 changes: 0 additions & 200 deletions buildscript-gradle.lockfile

This file was deleted.

2 changes: 1 addition & 1 deletion gradle-ci.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ org.gradle.jvmargs = -Xmx4096m -XX:MaxMetaspaceSize=1024m
# # Settings: Languages
versions.java.language = 17
versions.ecma.language = v5
versions.kotlin.sdk = 1.9.21
versions.kotlin.sdk = 2.0.0-Beta3
versions.kotlin.language = 1.9

# # Settings: Kotlin
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildDocs = false
buildDocsSite = false
buildBenchmarks = false
buildMingw = true
buildUuid = false
buildUuid = true
buildRpc = true
buildSsg = false
buildWasm = false
Expand All @@ -31,7 +31,7 @@ embeddedR8 = false
embeddedCompose = false
elide.buildMode = dev
elie.release = false
elide.strict = true
elide.strict = false
elide.pluginVersion = 1.0.0-beta23
elide.pluginMode = inert
elide.stamp = false
Expand Down Expand Up @@ -68,7 +68,7 @@ versions.java.language = 17
versions.java.minimum = 11
versions.java.target = 17
versions.ecma.language = v5
versions.kotlin.sdk = 1.9.21
versions.kotlin.sdk = 2.0.0-Beta3
versions.kotlin.language = 1.9
versions.android.sdk.target = 33

Expand Down
Loading
Loading