azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, native] Rename native distribution kind: regular -> light

Browse Source
This commit is contained in:
Ilya Matveev
2020-04-07 14:53:27 +07:00
parent 9c156c1a93
commit 7ee4f4853d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
+1 -1
View File
@@ -241,7 +241,7 @@ enum class ExplicitApiMode(private val cliOption: String) {
} }
enum class NativeDistributionType(val suffix: String?) { enum class NativeDistributionType(val suffix: String?) {
REGULAR(null) { LIGHT(null) {
override fun isAvailableFor(host: KonanTarget, version: CompilerVersion) = true override fun isAvailableFor(host: KonanTarget, version: CompilerVersion) = true
}, },
RESTRICTED("restricted") { RESTRICTED("restricted") {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+1 -1
View File
@@ -142,7 +142,7 @@ internal class PropertiesProvider private constructor(private val project: Proje
project, project,
"Project property 'kotlin.native.restrictedDistribution' is deprecated. Please use 'kotlin.native.distribution.type=restricted' instead" "Project property 'kotlin.native.restrictedDistribution' is deprecated. Please use 'kotlin.native.distribution.type=restricted' instead"
) )
result = if (deprecatedRestricted) NativeDistributionType.RESTRICTED else NativeDistributionType.REGULAR result = if (deprecatedRestricted) NativeDistributionType.RESTRICTED else NativeDistributionType.LIGHT
} }
return result return result
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
+2 -2
View File
@@ -13,7 +13,7 @@ import org.gradle.api.Project
import org.gradle.api.invocation.Gradle import org.gradle.api.invocation.Gradle
import org.jetbrains.kotlin.compilerRunner.konanHome import org.jetbrains.kotlin.compilerRunner.konanHome
import org.jetbrains.kotlin.compilerRunner.konanVersion import org.jetbrains.kotlin.compilerRunner.konanVersion
import org.jetbrains.kotlin.gradle.dsl.NativeDistributionType.REGULAR import org.jetbrains.kotlin.gradle.dsl.NativeDistributionType.LIGHT
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter
@@ -66,7 +66,7 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
val distributionType = PropertiesProvider(project).nativeDistributionType val distributionType = PropertiesProvider(project).nativeDistributionType
if (konanVersion.isAtLeast(1, 4, 0) && if (konanVersion.isAtLeast(1, 4, 0) &&
(distributionType == null || distributionType == REGULAR) (distributionType == null || distributionType == LIGHT)
) { ) {
PlatformLibrariesGenerator(project, konanTarget).generatePlatformLibsIfNeeded() PlatformLibrariesGenerator(project, konanTarget).generatePlatformLibsIfNeeded()
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerDownloader.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class NativeCompilerDownloader(
private val distributionType: NativeDistributionType private val distributionType: NativeDistributionType
get() = PropertiesProvider(project).nativeDistributionType?.takeIf { get() = PropertiesProvider(project).nativeDistributionType?.takeIf {
it.isAvailableFor(HostManager.host, compilerVersion) it.isAvailableFor(HostManager.host, compilerVersion)
} ?: NativeDistributionType.REGULAR } ?: NativeDistributionType.LIGHT
private val simpleOsName: String private val simpleOsName: String
get() = HostManager.simpleOsName() get() = HostManager.simpleOsName()