[Gradle, Wasm] Fix mismatch report message for upgradeLockFile
^KT-65870 fixed
This commit is contained in:
committed by
Space Team
parent
8365915b3f
commit
eabd2f0fc7
+7
-2
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.npm
|
||||
import org.gradle.api.GradleException
|
||||
import org.gradle.api.provider.Property
|
||||
import org.gradle.api.tasks.Input
|
||||
import org.gradle.api.tasks.Internal
|
||||
import org.gradle.work.DisableCachingByDefault
|
||||
import org.jetbrains.kotlin.gradle.utils.contentEquals
|
||||
|
||||
@@ -22,6 +23,10 @@ abstract class LockStoreTask : LockCopyTask() {
|
||||
@get:Input
|
||||
abstract val lockFileAutoReplace: Property<Boolean>
|
||||
|
||||
@get:Internal
|
||||
internal open val mismatchMessage: String
|
||||
get() = PACKAGE_LOCK_MISMATCH_MESSAGE
|
||||
|
||||
override fun copy() {
|
||||
val outputFile = outputDirectory.get().asFile.resolve(fileName.get())
|
||||
|
||||
@@ -49,9 +54,9 @@ abstract class LockStoreTask : LockCopyTask() {
|
||||
when (lockFileMismatchReport.get()) {
|
||||
LockFileMismatchReport.NONE -> {}
|
||||
LockFileMismatchReport.WARNING -> {
|
||||
logger.warn(PACKAGE_LOCK_MISMATCH_MESSAGE)
|
||||
logger.warn(mismatchMessage)
|
||||
}
|
||||
LockFileMismatchReport.FAIL -> throw GradleException(PACKAGE_LOCK_MISMATCH_MESSAGE)
|
||||
LockFileMismatchReport.FAIL -> throw GradleException(mismatchMessage)
|
||||
else -> error("Unknown mismatch report kind")
|
||||
}
|
||||
}
|
||||
|
||||
+13
-6
@@ -11,20 +11,27 @@ import org.gradle.work.DisableCachingByDefault
|
||||
import org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask
|
||||
import org.jetbrains.kotlin.gradle.targets.js.npm.LockFileMismatchReport
|
||||
import org.jetbrains.kotlin.gradle.targets.js.npm.LockStoreTask
|
||||
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin.Companion.YARN_LOCK_MISMATCH_MESSAGE
|
||||
|
||||
@DisableCachingByDefault
|
||||
abstract class YarnLockCopyTask : LockCopyTask()
|
||||
|
||||
@DisableCachingByDefault
|
||||
abstract class YarnLockStoreTask : LockStoreTask() {
|
||||
@Internal
|
||||
val yarnLockMismatchReport: Provider<YarnLockMismatchReport> = lockFileMismatchReport.map { it.fromLockFileMismatchReport() }
|
||||
@get:Internal
|
||||
val yarnLockMismatchReport: Provider<YarnLockMismatchReport>
|
||||
get() = lockFileMismatchReport.map { it.fromLockFileMismatchReport() }
|
||||
|
||||
@Internal
|
||||
val reportNewYarnLock: Provider<Boolean> = reportNewLockFile
|
||||
@get:Internal
|
||||
val reportNewYarnLock: Provider<Boolean>
|
||||
get() = reportNewLockFile
|
||||
|
||||
@Internal
|
||||
val yarnLockAutoReplace: Provider<Boolean> = lockFileAutoReplace
|
||||
@get:Internal
|
||||
val yarnLockAutoReplace: Provider<Boolean>
|
||||
get() = lockFileAutoReplace
|
||||
|
||||
override val mismatchMessage: String
|
||||
get() = YARN_LOCK_MISMATCH_MESSAGE
|
||||
}
|
||||
|
||||
enum class YarnLockMismatchReport {
|
||||
|
||||
+1
@@ -118,5 +118,6 @@ open class YarnPlugin : Plugin<Project> {
|
||||
const val STORE_YARN_LOCK_NAME = "kotlinStoreYarnLock"
|
||||
const val RESTORE_YARN_LOCK_NAME = "kotlinRestoreYarnLock"
|
||||
const val UPGRADE_YARN_LOCK = "kotlinUpgradeYarnLock"
|
||||
const val YARN_LOCK_MISMATCH_MESSAGE = "Lock file was changed. Run the `${UPGRADE_YARN_LOCK}` task to actualize lock file"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user