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

Kotlin 2.0.0 #187

Merged
merged 3 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### Kotlin/JVM ###
.kotlin
*.class
*.log

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

dependencies {
//region Gradle Plugins
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
implementation("io.kotest:kotest-framework-multiplatform-plugin-gradle:5.9.0")
//endregion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ kotlin {
nodejs()
}
}

relocateKotlinJsStore()

This file was deleted.

3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ org.gradle.configuration-cache=true
org.gradle.configuration-cache-problems=warn
org.gradle.parallel=true
org.gradle.welcome=never

# Kotlin 2.0 can use NPM instead of Yarn. Disable Yarn, so there's one less tool to manage.
kotlin.js.yarn=false
1,934 changes: 0 additions & 1,934 deletions gradle/kotlin-js-store/yarn.lock

This file was deleted.

31 changes: 1 addition & 30 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencyResolutionManagement {
mavenCentral()

// Declare the Node.js & Yarn download repositories
// https://youtrack.jetbrains.com/issue/KT-55620/
exclusiveContent {
forRepository {
ivy("https://nodejs.org/dist/") {
Expand All @@ -39,36 +40,6 @@ dependencyResolutionManagement {
filter { includeGroup("com.yarnpkg") }
}

// workaround for https://youtrack.jetbrains.com/issue/KT-51379
exclusiveContent {
forRepository {
ivy("https://download.jetbrains.com/kotlin/native/builds") {
name = "Kotlin Native"
patternLayout {

// example download URLs:
// https://download.jetbrains.com/kotlin/native/builds/releases/1.7.20/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.7.20.tar.gz
// https://download.jetbrains.com/kotlin/native/builds/releases/1.7.20/windows-x86_64/kotlin-native-prebuilt-windows-x86_64-1.7.20.zip
// https://download.jetbrains.com/kotlin/native/builds/releases/1.7.20/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.7.20.tar.gz
listOf(
"macos-x86_64",
"macos-aarch64",
"osx-x86_64",
"osx-aarch64",
"linux-x86_64",
"windows-x86_64",
).forEach { os ->
listOf("dev", "releases").forEach { stage ->
artifact("$stage/[revision]/$os/[artifact]-[revision].[ext]")
}
}
}
metadataSources { artifact() }
}
}
filter { includeModuleByRegex(".*", ".*kotlin-native-prebuilt.*") }
}

ivy("https://github.com/") {
name = "GitHub Release"
// used to download YAML Test Suite data from GitHub
Expand Down
Loading