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

[Gradle] Fix warnings in KotlinJvmAndroidCompilation

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2023-12-28 10:37:49 +01:00
committed by Space Team
parent 327085e026
commit 77830cc46a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilationToRunnableFiles.kt
+3 -1
View File
@@ -24,4 +24,6 @@ internal constructor(compilation: KotlinCompilationImpl) : AbstractKotlinCompila
set(value) { set(value) {
compilation.runtimeDependencyFiles = value compilation.runtimeDependencyFiles = value
} }
} }
internal typealias DeprecatedAbstractKotlinCompilationToRunnableFiles<T> = AbstractKotlinCompilationToRunnableFiles<T>
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt
+4 -3
View File
@@ -6,7 +6,6 @@
@file:Suppress("PackageDirectoryMismatch") // Old package for compatibility @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
package org.jetbrains.kotlin.gradle.plugin.mpp package org.jetbrains.kotlin.gradle.plugin.mpp
import com.android.build.gradle.api.BaseVariant
import org.gradle.api.Action import org.gradle.api.Action
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
@@ -17,12 +16,14 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationImpl import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationImpl
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.utils.*
import javax.inject.Inject import javax.inject.Inject
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
open class KotlinJvmAndroidCompilation @Inject internal constructor( open class KotlinJvmAndroidCompilation @Inject internal constructor(
compilation: KotlinCompilationImpl, compilation: KotlinCompilationImpl,
val androidVariant: BaseVariant val androidVariant: DeprecatedAndroidBaseVariant
) : AbstractKotlinCompilationToRunnableFiles<KotlinJvmOptions>(compilation) { ) : DeprecatedAbstractKotlinCompilationToRunnableFiles<KotlinJvmOptions>(compilation) {
override val target: KotlinAndroidTarget = compilation.target as KotlinAndroidTarget override val target: KotlinAndroidTarget = compilation.target as KotlinAndroidTarget