Skip to content

Fixes for 1.4-M2 & HMPP #2031

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

Merged
merged 16 commits into from
May 22, 2020
Merged

Fixes for 1.4-M2 & HMPP #2031

merged 16 commits into from
May 22, 2020

Conversation

h0tk3y
Copy link
Contributor

@h0tk3y h0tk3y commented May 15, 2020

No description provided.

@h0tk3y h0tk3y changed the title Hmpp testing pr Fixes for 1.4-M2 & HMPP May 15, 2020
@qwwdfsad qwwdfsad self-requested a review May 18, 2020 11:25
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.

Current status: waiting for ./gradlew :kotlinx-coroutines-core:compileCommonMainKotlinMetadata to be fixed

@qwwdfsad
Copy link
Collaborator

Also, please revert changes in DebugProbesKt.bin and mute the test here instead

@h0tk3y h0tk3y force-pushed the hmpp-testing-pr branch from 6cbc2fb to 81570df Compare May 19, 2020 15:26
h0tk3y and others added 5 commits May 19, 2020 18:28
* Rename the JVM module: empty suffix -> '-jvm';
* Rename the root MPP module: '-native' -> empty suffix;
* Publish the JVM JAR and POM in the root MPP module, so
  that consumers who can't read Gradle module metadata, such
  as Maven or old Gradle versions, get the JVM resolution
  result from the root MPP module.
Otherwise variant-aware resolution fails to find compatible variant in
kotlinx-coroutines-core
@qwwdfsad qwwdfsad self-requested a review May 22, 2020 08:53
@qwwdfsad qwwdfsad merged commit 17248c8 into develop May 22, 2020
@qwwdfsad qwwdfsad deleted the hmpp-testing-pr branch May 22, 2020 09:28
recheej pushed a commit to recheej/kotlinx.coroutines that referenced this pull request Dec 28, 2020
* Gradle 6.3
* Enable Gradle module metadata in all modules
* Workaround for gradle/gradle#11412
* Fix invalid mutation of a tasks's dependsOn w/Gradle 6.3
* Rename root MPP module and publish the JVM JAR within
* Rename the JVM module: empty suffix -> '-jvm';
* Rename the root MPP module: '-native' -> empty suffix;
* Publish the JVM JAR and POM in the root MPP module, so
  that consumers who can't read Gradle module metadata, such
  as Maven or old Gradle versions, get the JVM resolution
  result from the root MPP module.
* Enable HMPP
* Add jvm attribute to detached configuration
Otherwise variant-aware resolution fails to find compatible variant in
kotlinx-coroutines-core

* Enable HMPP conditionally for Kotlin 1.4.x and not 1.3.7x
* Workaround KT-39037
* Disable PrecompiledDebugProbesTest test in train builds
* Conditionally hack out the Gradle module metadata with Kotlin 1.3.7x
* Conditionally rename Kotlin metadata module to *-metadata with Kotlin 1.4.x
* Conditionally rename the root & JVM modules with Kotlin 1.4.x

Co-authored-by: Dmitry Savvinov <[email protected]>
Co-authored-by: Vsevolod Tolstopyatov <[email protected]>
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.

3 participants