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

[Gradle] Fix warnings in Agp7AddKotlinSourcesToAndroidSourceSetConfigurator

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-19 20:59:01 +01:00
committed by Space Team
parent 7165d15d59
commit 1c7f2b3066
2 changed files with 9 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/sources/android/configurator/Agp7AddKotlinSourcesToAndroidSourceSetConfigurator.kt
+8 -4
View File
@@ -5,15 +5,19 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator
import com.android.build.gradle.api.AndroidSourceDirectorySet
import com.android.build.gradle.api.AndroidSourceSet
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.utils.*
object Agp7AddKotlinSourcesToAndroidSourceSetConfigurator: KotlinAndroidSourceSetConfigurator { object Agp7AddKotlinSourcesToAndroidSourceSetConfigurator: KotlinAndroidSourceSetConfigurator {
override fun configure(target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, androidSourceSet: AndroidSourceSet) { override fun configure(
target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
) {
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
val androidKotlinSourceDirectorySet = androidSourceSet.javaClass.getMethod("getKotlin") val androidKotlinSourceDirectorySet = androidSourceSet.javaClass.getMethod("getKotlin")
.invoke(androidSourceSet) as AndroidSourceDirectorySet .invoke(androidSourceSet) as DeprecatedAndroidSourceDirectorySet
androidKotlinSourceDirectorySet.setSrcDirs(listOf(target.project.provider { kotlinSourceSet.kotlin.srcDirs })) androidKotlinSourceDirectorySet.setSrcDirs(listOf(target.project.provider { kotlinSourceSet.kotlin.srcDirs }))
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
+1
View File
@@ -8,6 +8,7 @@
package org.jetbrains.kotlin.gradle.utils package org.jetbrains.kotlin.gradle.utils
internal typealias DeprecatedAndroidSourceSet = com.android.build.gradle.api.AndroidSourceSet internal typealias DeprecatedAndroidSourceSet = com.android.build.gradle.api.AndroidSourceSet
internal typealias DeprecatedAndroidSourceDirectorySet = com.android.build.gradle.api.AndroidSourceDirectorySet
internal typealias DeprecatedAndroidBaseVariant = com.android.build.gradle.api.BaseVariant internal typealias DeprecatedAndroidBaseVariant = com.android.build.gradle.api.BaseVariant
internal typealias DeprecatedAndroidApplicationVariant = com.android.build.gradle.api.ApplicationVariant internal typealias DeprecatedAndroidApplicationVariant = com.android.build.gradle.api.ApplicationVariant
internal typealias DeprecatedAndroidLibraryVariant = com.android.build.gradle.api.LibraryVariant internal typealias DeprecatedAndroidLibraryVariant = com.android.build.gradle.api.LibraryVariant