Skip to content

Commit c8d05f8

Browse files
Remove most of Gradle tests with Jack
Jack is deprecated and Kotlin Gradle plugin throws, so one test checking that build is failing with the exception is enough.
1 parent 0cb67b4 commit c8d05f8

File tree

42 files changed

+3
-851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3
-851
lines changed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt

Lines changed: 3 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -222,176 +222,13 @@ abstract class AbstractKotlinAndroidWithJackGradleTests(
222222
super.defaultBuildOptions().copy(androidHome = File("../../../dependencies/android-sdk-for-tests"),
223223
androidGradlePluginVersion = androidGradlePluginVersion, javaHome = File(getEnvJDK_18()))
224224

225-
@Test
226-
fun testAndroidTestCompilation() {
227-
val project = Project("AndroidJackProject", gradleVersion)
228-
229-
project.build("assembleAndroidTest") {
230-
assertSuccessful()
231-
assertFileExists("Android/build/tmp/kotlin-classes/flavor1Debug.jar")
232-
assertFileExists("Android/build/tmp/kotlin-classes/flavor2Debug.jar")
233-
assertFileExists("Android/build/tmp/kotlin-classes/flavor1DebugAndroidTest.jar")
234-
assertFileExists("Android/build/tmp/kotlin-classes/flavor2DebugAndroidTest.jar")
235-
assertFileExists("Android/build/outputs/apk/Android-flavor1-debug-androidTest.apk")
236-
assertFileExists("Android/build/outputs/apk/Android-flavor2-debug-androidTest.apk")
237-
}
238-
}
239-
240225
@Test
241226
fun testSimpleCompile() {
242227
val project = Project("AndroidJackProject", gradleVersion)
243228

244-
project.build("build", "test") {
245-
assertSuccessful()
246-
assertContains(
247-
":Lib:compileReleaseKotlin",
248-
249-
":compileFlavor1DebugKotlin",
250-
":zipKotlinClassesForFlavor1Debug",
251-
":transformKotlinClassesWithJillForFlavor1Debug",
252-
253-
":compileFlavor2DebugKotlin",
254-
":zipKotlinClassesForFlavor2Debug",
255-
":transformKotlinClassesWithJillForFlavor2Debug",
256-
257-
":compileFlavor1JnidebugKotlin",
258-
":zipKotlinClassesForFlavor1Jnidebug",
259-
":transformKotlinClassesWithJillForFlavor1Jnidebug",
260-
261-
":compileFlavor1ReleaseKotlin",
262-
":zipKotlinClassesForFlavor1Release",
263-
":transformKotlinClassesWithJillForFlavor1Release",
264-
265-
":compileFlavor2JnidebugKotlin",
266-
":zipKotlinClassesForFlavor2Jnidebug",
267-
":transformKotlinClassesWithJillForFlavor2Jnidebug",
268-
269-
":compileFlavor2ReleaseKotlin",
270-
":zipKotlinClassesForFlavor2Release",
271-
":transformKotlinClassesWithJillForFlavor2Release",
272-
273-
":compileFlavor1DebugUnitTestKotlin",
274-
"InternalDummyTest PASSED"
275-
)
276-
checkKotlinGradleBuildServices()
277-
}
278-
279-
// Run the build second time, assert everything is up-to-date
280-
project.build("build") {
281-
assertSuccessful()
282-
assertContains(
283-
":Lib:compileReleaseKotlin UP-TO-DATE",
284-
285-
":compileFlavor1DebugKotlin UP-TO-DATE",
286-
":zipKotlinClassesForFlavor1Debug UP-TO-DATE",
287-
":transformKotlinClassesWithJillForFlavor1Debug UP-TO-DATE",
288-
289-
":compileFlavor2DebugKotlin UP-TO-DATE",
290-
":zipKotlinClassesForFlavor2Debug UP-TO-DATE",
291-
":transformKotlinClassesWithJillForFlavor2Debug UP-TO-DATE",
292-
293-
":compileFlavor1JnidebugKotlin UP-TO-DATE",
294-
":zipKotlinClassesForFlavor1Jnidebug UP-TO-DATE",
295-
":transformKotlinClassesWithJillForFlavor1Jnidebug UP-TO-DATE",
296-
297-
":compileFlavor1ReleaseKotlin UP-TO-DATE",
298-
":zipKotlinClassesForFlavor1Release UP-TO-DATE",
299-
":transformKotlinClassesWithJillForFlavor1Release UP-TO-DATE",
300-
301-
":compileFlavor2JnidebugKotlin UP-TO-DATE",
302-
":zipKotlinClassesForFlavor2Jnidebug UP-TO-DATE",
303-
":transformKotlinClassesWithJillForFlavor2Jnidebug UP-TO-DATE",
304-
305-
":compileFlavor2ReleaseKotlin UP-TO-DATE",
306-
":zipKotlinClassesForFlavor2Release UP-TO-DATE",
307-
":transformKotlinClassesWithJillForFlavor2Release UP-TO-DATE"
308-
)
309-
}
310-
311-
project.build("build", "--rerun-tasks") {
312-
assertSuccessful()
313-
assertContains(
314-
":Lib:compileReleaseKotlin",
315-
316-
":compileFlavor1DebugKotlin",
317-
":zipKotlinClassesForFlavor1Debug",
318-
":transformKotlinClassesWithJillForFlavor1Debug",
319-
320-
":compileFlavor2DebugKotlin",
321-
":zipKotlinClassesForFlavor2Debug",
322-
":transformKotlinClassesWithJillForFlavor2Debug",
323-
324-
":compileFlavor1JnidebugKotlin",
325-
":zipKotlinClassesForFlavor1Jnidebug",
326-
":transformKotlinClassesWithJillForFlavor1Jnidebug",
327-
328-
":compileFlavor1ReleaseKotlin",
329-
":zipKotlinClassesForFlavor1Release",
330-
":transformKotlinClassesWithJillForFlavor1Release",
331-
332-
":compileFlavor2JnidebugKotlin",
333-
":zipKotlinClassesForFlavor2Jnidebug",
334-
":transformKotlinClassesWithJillForFlavor2Jnidebug",
335-
336-
":compileFlavor2ReleaseKotlin",
337-
":zipKotlinClassesForFlavor2Release",
338-
":transformKotlinClassesWithJillForFlavor2Release",
339-
340-
":compileFlavor1DebugUnitTestKotlin",
341-
"InternalDummyTest PASSED"
342-
)
343-
checkKotlinGradleBuildServices()
344-
}
345-
346-
}
347-
348-
@Test
349-
fun testDagger() {
350-
val project = Project("AndroidDaggerJackProject", gradleVersion)
351-
val options = defaultBuildOptions().copy(incremental = false)
352-
353-
project.build("assembleDebug", options = options) {
354-
assertSuccessful()
355-
assertContains(
356-
":kaptDebugKotlin",
357-
":compileDebugKotlin",
358-
":zipKotlinClassesForDebug",
359-
":transformKotlinClassesWithJillForDebug",
360-
":transformJackWithJackForDebug"
361-
)
362-
}
363-
}
364-
365-
@Test
366-
fun testAndroidExtensions() {
367-
val project = Project("AndroidExtensionsJackProject", gradleVersion)
368-
val options = defaultBuildOptions().copy(incremental = false)
369-
370-
project.build("assembleDebug", options = options) {
371-
assertSuccessful()
372-
assertContains(
373-
":compileDebugKotlin",
374-
":zipKotlinClassesForDebug",
375-
":transformKotlinClassesWithJillForDebug",
376-
":transformJackWithJackForDebug"
377-
)
378-
}
379-
}
380-
381-
@Test
382-
fun testIcepick() {
383-
val project = Project("AndroidIcepickJackProject", gradleVersion)
384-
val options = defaultBuildOptions().copy(incremental = false)
385-
386-
project.build("assembleDebug", options = options) {
387-
assertSuccessful()
388-
assertContains(
389-
":kaptDebugKotlin",
390-
":compileDebugKotlin",
391-
":zipKotlinClassesForDebug",
392-
":transformKotlinClassesWithJillForDebug",
393-
":transformJackWithJackForDebug"
394-
)
229+
project.build("assemble") {
230+
assertFailed()
231+
assertContains("Kotlin Gradle plugin does not support the deprecated Jack toolchain")
395232
}
396233
}
397234
}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/build.gradle

Lines changed: 0 additions & 41 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/proguard-rules.pro

Lines changed: 0 additions & 17 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/AndroidModule.kt

Lines changed: 0 additions & 44 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ApplicationComponent.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/BaseApplication.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoActivity.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/DemoApplication.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/ForApplication.kt

Lines changed: 0 additions & 6 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerJackProject/app/src/main/java/com/example/dagger/kotlin/UseRJavaActivity.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)