Support JVM IR compiler plugin in AtomicfuGradlePlugin #246
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Why doesn't the build pass with RC? |
|
This fix for |
… the plugin separately to JS ans JVM targets
mvicsokolova
force-pushed
the
support-jvmir-compiler-plugin
branch
from
ee1f42a
to
85bebfc
Compare
qwwdfsad
requested changes
Oct 13, 2022
| @@ -29,16 +29,16 @@ private const val ORIGINAL_DIR_NAME = "originalClassesDir" | |||
| private const val COMPILE_ONLY_CONFIGURATION = "compileOnly" | |||
| private const val IMPLEMENTATION_CONFIGURATION = "implementation" | |||
| private const val TEST_IMPLEMENTATION_CONFIGURATION = "testImplementation" | |||
| private const val ENABLE_IR_TRANSFORMATION = "kotlinx.atomicfu.enableIrTransformation" | |||
| private const val ENABLE_JS_IR_TRANSFORMATION_LEGACY = "kotlinx.atomicfu.enableIrTransformation" | |||
There was a problem hiding this comment.
Please leave a comment why it is legacy and when it is safe to remove it
| // for KGP >= 1.7.20: | ||
| // compiler plugin for JS IR is applied via the property `kotlinx.atomicfu.enableJsIrTransformation` | ||
| // compiler plugin for JVM IR is applied via the property `kotlinx.atomicfu.enableJvmIrTransformation` | ||
| if (kotlinVersion.major == 1 && (kotlinVersion.minor == 7 && kotlinVersion.patch >= 20 || kotlinVersion.minor > 7)) { |
There was a problem hiding this comment.
You have at least three duplicating checks, each of them requires non-trivial effort to see if it's correct.
I suggest introducing something like if (kotlinVersion.atLeast(1, 7, 20) and use it everywhere
| @@ -109,7 +141,8 @@ private fun String.toBooleanStrict(): Boolean = when (this) { | |||
| } | |||
|
|
|||
| private fun Project.needsJsIrTransformation(target: KotlinTarget): Boolean = | |||
| rootProject.getBooleanProperty(ENABLE_IR_TRANSFORMATION) && target.isJsIrTarget() | |||
| (rootProject.getBooleanProperty(ENABLE_JS_IR_TRANSFORMATION) || rootProject.getBooleanProperty(ENABLE_JS_IR_TRANSFORMATION_LEGACY)) | |||
| && target.isJsIrTarget() | |||
|
|
|||
| private fun KotlinTarget.isJsIrTarget() = (this is KotlinJsTarget && this.irTarget != null) || this is KotlinJsIrTarget | |||
There was a problem hiding this comment.
Shouldn't addCompilerPluginDependency add dependency for JVM transformation as well?
There was a problem hiding this comment.
No, the atomicfu-runtime dependency is required by the JS plugin only
qwwdfsad
approved these changes
Oct 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
kotlinx.atomicfu.enableJsIrTransformationandkotlinx.atomicfu.enableJvmIrTransformationAtomicfuKotlinGradleExtensionWaiting to merge this PR after update to
1.7.20