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

Adopt Kotlin 1.6.20 #7206

Merged
merged 2 commits into from
Apr 2, 2022
Merged

Adopt Kotlin 1.6.20 #7206

merged 2 commits into from
Apr 2, 2022

Conversation

Goooler
Copy link
Contributor

@Goooler Goooler commented Apr 2, 2022

Follow up #7204.


// Fix until 1.6.20 https://youtrack.jetbrains.com/issue/KT-49109
rootProject.plugins.withType(NodeJsRootPlugin::class.java) {
rootProject.the<NodeJsRootExtension>().nodeVersion = "16.13.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Comment on lines +47 to +51
val kotlinOsgi = extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
.findLibrary("kotlin.stdlib.osgi").get().get()

project.dependencies {
osgiApi("org.jetbrains.kotlin:kotlin-osgi-bundle:1.6.10")
osgiApi(kotlinOsgi)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@yschimke
Copy link
Collaborator

yschimke commented Apr 2, 2022

Thanks, nice cleanup

@yschimke yschimke merged commit b337403 into square:master Apr 2, 2022
@Goooler Goooler deleted the kt1620 branch April 2, 2022 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants