Ignore test due to the bug in AGP on Gradle 6.8+.
It is not possible to make it work via reflection.
This commit is contained in:
+32
-24
@@ -2,8 +2,8 @@ package org.jetbrains.kotlin.gradle
|
||||
|
||||
import org.gradle.api.logging.LogLevel
|
||||
import org.gradle.api.logging.configuration.WarningMode
|
||||
import org.gradle.util.GradleVersion
|
||||
import org.jetbrains.kotlin.gradle.util.*
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||
import org.junit.Assume
|
||||
import org.junit.Test
|
||||
@@ -24,33 +24,41 @@ open class KotlinAndroid36GradleIT : KotlinAndroid33GradleIT() {
|
||||
get() = GradleVersionRequired.AtLeast("6.0")
|
||||
|
||||
@Test
|
||||
fun testAndroidMppSourceSets(): Unit = with(Project("new-mpp-android-source-sets")) {
|
||||
build("sourceSets") {
|
||||
assertSuccessful()
|
||||
fun testAndroidMppSourceSets(): Unit = with(
|
||||
Project("new-mpp-android-source-sets")
|
||||
) {
|
||||
// AbstractReportTask#generate() task action was removed in Gradle 6.8+,
|
||||
// that SourceSetTask is using: https://github.com/gradle/gradle/commit/4dac91ab87ea33ee8689d2a62b691b119198e7c7
|
||||
// leading to the issue that ":sourceSets" task is always in 'UP-TO-DATE' state.
|
||||
// Skipping this check until test will start using AGP 7.0-alpha03+
|
||||
if (GradleVersion.version(chooseWrapperVersionOrFinishTest()) < GradleVersion.version("6.8")) {
|
||||
build("sourceSets", options = defaultBuildOptions().copy(debug = true)) {
|
||||
assertSuccessful()
|
||||
|
||||
assertContains("Android resources: [lib/src/main/res, lib/src/androidMain/res]")
|
||||
assertContains("Assets: [lib/src/main/assets, lib/src/androidMain/assets]")
|
||||
assertContains("AIDL sources: [lib/src/main/aidl, lib/src/androidMain/aidl]")
|
||||
assertContains("RenderScript sources: [lib/src/main/rs, lib/src/androidMain/rs]")
|
||||
assertContains("JNI sources: [lib/src/main/jni, lib/src/androidMain/jni]")
|
||||
assertContains("JNI libraries: [lib/src/main/jniLibs, lib/src/androidMain/jniLibs]")
|
||||
assertContains("Java-style resources: [lib/src/main/resources, lib/src/androidMain/resources]")
|
||||
assertContains("Android resources: [lib/src/main/res, lib/src/androidMain/res]")
|
||||
assertContains("Assets: [lib/src/main/assets, lib/src/androidMain/assets]")
|
||||
assertContains("AIDL sources: [lib/src/main/aidl, lib/src/androidMain/aidl]")
|
||||
assertContains("RenderScript sources: [lib/src/main/rs, lib/src/androidMain/rs]")
|
||||
assertContains("JNI sources: [lib/src/main/jni, lib/src/androidMain/jni]")
|
||||
assertContains("JNI libraries: [lib/src/main/jniLibs, lib/src/androidMain/jniLibs]")
|
||||
assertContains("Java-style resources: [lib/src/main/resources, lib/src/androidMain/resources]")
|
||||
|
||||
assertContains("Android resources: [lib/src/androidTestDebug/res, lib/src/androidAndroidTestDebug/res]")
|
||||
assertContains("Assets: [lib/src/androidTestDebug/assets, lib/src/androidAndroidTestDebug/assets]")
|
||||
assertContains("AIDL sources: [lib/src/androidTestDebug/aidl, lib/src/androidAndroidTestDebug/aidl]")
|
||||
assertContains("RenderScript sources: [lib/src/androidTestDebug/rs, lib/src/androidAndroidTestDebug/rs]")
|
||||
assertContains("JNI sources: [lib/src/androidTestDebug/jni, lib/src/androidAndroidTestDebug/jni]")
|
||||
assertContains("JNI libraries: [lib/src/androidTestDebug/jniLibs, lib/src/androidAndroidTestDebug/jniLibs]")
|
||||
assertContains("Java-style resources: [lib/src/androidTestDebug/resources, lib/src/androidAndroidTestDebug/resources]")
|
||||
assertContains("Android resources: [lib/src/androidTestDebug/res, lib/src/androidAndroidTestDebug/res]")
|
||||
assertContains("Assets: [lib/src/androidTestDebug/assets, lib/src/androidAndroidTestDebug/assets]")
|
||||
assertContains("AIDL sources: [lib/src/androidTestDebug/aidl, lib/src/androidAndroidTestDebug/aidl]")
|
||||
assertContains("RenderScript sources: [lib/src/androidTestDebug/rs, lib/src/androidAndroidTestDebug/rs]")
|
||||
assertContains("JNI sources: [lib/src/androidTestDebug/jni, lib/src/androidAndroidTestDebug/jni]")
|
||||
assertContains("JNI libraries: [lib/src/androidTestDebug/jniLibs, lib/src/androidAndroidTestDebug/jniLibs]")
|
||||
assertContains("Java-style resources: [lib/src/androidTestDebug/resources, lib/src/androidAndroidTestDebug/resources]")
|
||||
|
||||
assertContains("Java-style resources: [lib/betaSrc/paidBeta/resources, lib/src/androidPaidBeta/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/paidBetaDebug/resources, lib/src/androidPaidBetaDebug/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/paidBetaRelease/resources, lib/src/androidPaidBetaRelease/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/paidBeta/resources, lib/src/androidPaidBeta/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/paidBetaDebug/resources, lib/src/androidPaidBetaDebug/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/paidBetaRelease/resources, lib/src/androidPaidBetaRelease/resources]")
|
||||
|
||||
assertContains("Java-style resources: [lib/betaSrc/freeBeta/resources, lib/src/androidFreeBeta/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/freeBetaDebug/resources, lib/src/androidFreeBetaDebug/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/freeBetaRelease/resources, lib/src/androidFreeBetaRelease/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/freeBeta/resources, lib/src/androidFreeBeta/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/freeBetaDebug/resources, lib/src/androidFreeBetaDebug/resources]")
|
||||
assertContains("Java-style resources: [lib/betaSrc/freeBetaRelease/resources, lib/src/androidFreeBetaRelease/resources]")
|
||||
}
|
||||
}
|
||||
|
||||
build("testFreeBetaDebug") {
|
||||
|
||||
Reference in New Issue
Block a user