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

Gradle 7.4.2, Kotlin 1.6.21 and other plugin updates #3281

Merged
merged 1 commit into from
May 17, 2022

Conversation

wojtek-kalicinski
Copy link
Contributor

Upgrading to Gradle 7.4.2 also includes updating or removing plugins that were outdated or incompatible with Gradle 7.x

Kotlin 1.6.21 update is not required but bumping anyway since tests pass.

One difference that I noticed is that dokka now generates absolute paths for links, and not ../../, if this is a problem it's something that should be looked into.

./gradlew build passes, and I also verified (more or less) that all files are generated in the right paths in the maven publication.

@qwwdfsad qwwdfsad self-requested a review May 16, 2022 08:10
Copy link
Collaborator

@qwwdfsad qwwdfsad left a comment

Choose a reason for hiding this comment

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

I see that the build consistently fails on our CI (e.g. https://teamcity.jetbrains.com/viewLog.html?buildTypeId=KotlinTools_KotlinxCoroutines_Build&buildId=3854604&tab=buildLog&logTab=tree&filter=debug&expand=all&_focus=961):

Script '/mnt/agent/work/44ec6e850d5c63f0/gradle/test-mocha-js.gradle' line: 12

Could you please take a look and ensure that ./gradlew build passes?
Meanwhile I'll handle Dokka

@wojtek-kalicinski
Copy link
Contributor Author

There was a code path that was only accessed with -Pteamcity set that I didn't notice. Fixed, can you try it now?

Copy link
Collaborator

@qwwdfsad qwwdfsad left a comment

Choose a reason for hiding this comment

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

Great job, thanks for looking into that!

@@ -56,6 +57,11 @@ fun configureMavenPublication(rh: RepositoryHandler, project: Project) {
password = project.getSensitiveProperty("libs.sonatype.password")
}
}

// Something that's easy to "clean" for development, not mavenLocal
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

@qwwdfsad qwwdfsad merged commit 155868f into Kotlin:develop May 17, 2022
@wojtek-kalicinski wojtek-kalicinski deleted the gradle-7.4.2 branch May 18, 2022 10:43
pablobaxter pushed a commit to pablobaxter/kotlinx.coroutines that referenced this pull request Sep 14, 2022
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.

None yet

2 participants