Revert "Fix java 25 tests" This reverts commit a307d54583e3a9e965d7cd8fcd246345892beb9f. Reason for revert: broke bots Change-Id: I1820a4417fd059db79dbde84120faf842d9b7e2c
diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts index d5bde39..8dec807 100644 --- a/d8_r8/test/build.gradle.kts +++ b/d8_r8/test/build.gradle.kts
@@ -35,7 +35,6 @@ testJarsScope(project(":tests_java_11", "testJar")) testJarsScope(project(":tests_java_17", "testJar")) testJarsScope(project(":tests_java_21", "testJar")) - testJarsScope(project(":tests_java_25", "testJar")) testJarsScope(project(":tests_bootstrap", "testJar")) testbaseTestJarsScope(project(":testbase", "testJar")) testDepsJarsScope(project(":tests_bootstrap", "depsJar")) @@ -584,7 +583,6 @@ dependsOn(":tests_java_11:test") dependsOn(":tests_java_17:test") dependsOn(":tests_java_21:test") - dependsOn(":tests_java_25:test") dependsOn(":tests_bootstrap:test") } }
diff --git a/d8_r8/test_modules/tests_java_25/build.gradle.kts b/d8_r8/test_modules/tests_java_25/build.gradle.kts index b614a8bb..49b16ca 100644 --- a/d8_r8/test_modules/tests_java_25/build.gradle.kts +++ b/d8_r8/test_modules/tests_java_25/build.gradle.kts
@@ -33,10 +33,7 @@ } tasks { - withType<JavaCompile> { - dependsOn(sharedDownloadDepsTask) - options.compilerArgs.add("--enable-preview") - } + withType<JavaCompile> { dependsOn(sharedDownloadDepsTask) } withType<Test> { notCompatibleWithConfigurationCache( @@ -44,7 +41,6 @@ ) TestingState.setUpTestingState(this) javaLauncher = getJavaLauncher(Jdk.JDK_25) - jvmArgs("--enable-preview") systemProperty( "TEST_DATA_LOCATION", layout.buildDirectory.dir("classes/java/test").get().toString(), @@ -61,18 +57,4 @@ .split(File.pathSeparator)[0], ) } - - val assembleTestJar by - registering(Jar::class) { - from(sourceSets.test.get().output) - // TODO(b/296486206): Seems like IntelliJ has a problem depending on test source sets. - // Renaming - // this from the default name (tests_java_8.jar) will allow IntelliJ to find the resources in - // the jar and not show red underlines. However, navigation to base classes will not work. - archiveFileName.set("not_named_tests_java_25.jar") - } } - -val testJar by configurations.consumable("testJar") - -artifacts { add(testJar.name, tasks.named("assembleTestJar")) }