Remove java10 gradle package
Change-Id: Iaf27de61eb64531c2a402c8fe4ca623b215caa4d
diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index 931b10a..6fdc9f5 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -58,7 +58,6 @@
dependsOn(gradle.includedBuild("tests_bootstrap").task(":clean"))
dependsOn(gradle.includedBuild("tests_java_8").task(":clean"))
dependsOn(gradle.includedBuild("tests_java_9").task(":clean"))
- dependsOn(gradle.includedBuild("tests_java_10").task(":clean"))
dependsOn(gradle.includedBuild("tests_java_11").task(":clean"))
dependsOn(gradle.includedBuild("tests_java_17").task(":clean"))
dependsOn(gradle.includedBuild("tests_java_21").task(":clean"))
diff --git a/d8_r8/test/settings.gradle.kts b/d8_r8/test/settings.gradle.kts
index 3193722..c9bc4b4 100644
--- a/d8_r8/test/settings.gradle.kts
+++ b/d8_r8/test/settings.gradle.kts
@@ -33,7 +33,6 @@
includeBuild(root.resolve("test_modules").resolve("tests_bootstrap"))
includeBuild(root.resolve("test_modules").resolve("tests_java_8"))
includeBuild(root.resolve("test_modules").resolve("tests_java_9"))
-includeBuild(root.resolve("test_modules").resolve("tests_java_10"))
includeBuild(root.resolve("test_modules").resolve("tests_java_11"))
includeBuild(root.resolve("test_modules").resolve("tests_java_17"))
includeBuild(root.resolve("test_modules").resolve("tests_java_21"))
diff --git a/d8_r8/test_modules/tests_java_10/build.gradle.kts b/d8_r8/test_modules/tests_java_10/build.gradle.kts
deleted file mode 100644
index 7663224..0000000
--- a/d8_r8/test_modules/tests_java_10/build.gradle.kts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import org.gradle.api.JavaVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
- `kotlin-dsl`
- `java-library`
- id("dependencies-plugin")
-}
-
-val root = getRoot()
-
-java {
- sourceSets.test.configure {
- java.srcDir(root.resolveAll("src", "test", "examplesJava10"))
- }
- sourceCompatibility = JavaVersion.VERSION_1_10
- targetCompatibility = JavaVersion.VERSION_1_10
- toolchain {
- languageVersion = JavaLanguageVersion.of(JvmCompatibility.release)
- }
-}
-
-val testbaseJavaCompileTask = projectTask("testbase", "compileJava")
-val testbaseDepsJarTask = projectTask("testbase", "depsJar")
-val mainCompileTask = projectTask("main", "compileJava")
-
-dependencies {
- implementation(files(testbaseDepsJarTask.outputs.files.getSingleFile()))
- implementation(testbaseJavaCompileTask.outputs.files)
- implementation(mainCompileTask.outputs.files)
- implementation(projectTask("main", "processResources").outputs.files)
-}
-
-// We just need to register the examples jars for it to be referenced by other modules.
-val buildExampleJars = buildExampleJars("examplesJava10")
-
-tasks {
- withType<JavaCompile> {
- dependsOn(gradle.includedBuild("shared").task(":downloadDeps"))
- }
-
- withType<Test> {
- notCompatibleWithConfigurationCache(
- "Failure storing the configuration cache: cannot serialize object of type 'org.gradle.api.internal.project.DefaultProject', a subtype of 'org.gradle.api.Project', as these are not supported with the configuration cache")
- TestingState.setUpTestingState(this)
- systemProperty("TEST_DATA_LOCATION",
- // This should be
- // layout.buildDirectory.dir("classes/java/test").get().toString()
- // once the use of 'buildExampleJars' above is removed.
- getRoot().resolveAll("build", "test", "examplesJava10", "classes"))
- systemProperty("TESTBASE_DATA_LOCATION",
- testbaseJavaCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0])
- }
-}
-
diff --git a/d8_r8/test_modules/tests_java_10/settings.gradle.kts b/d8_r8/test_modules/tests_java_10/settings.gradle.kts
deleted file mode 100644
index f2e1c0d..0000000
--- a/d8_r8/test_modules/tests_java_10/settings.gradle.kts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-pluginManagement {
- repositories {
- maven {
- url = uri("file:../../../third_party/dependencies_plugin")
- }
- maven {
- url = uri("file:../../../third_party/dependencies")
- }
- }
-}
-
-dependencyResolutionManagement {
- repositories {
- maven {
- url = uri("file:../../../third_party/dependencies")
- }
- }
-}
-
-rootProject.name = "tests_java_10"
-val root = rootProject.projectDir.parentFile.parentFile
-
-includeBuild(root.resolve("shared"))
-includeBuild(root.resolve("main"))
-includeBuild(root.resolve("test_modules").resolve("testbase"))
diff --git a/d8_r8/test_modules/tests_java_8/settings.gradle.kts b/d8_r8/test_modules/tests_java_8/settings.gradle.kts
index fb4e7f7..e079b20 100644
--- a/d8_r8/test_modules/tests_java_8/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/settings.gradle.kts
@@ -34,7 +34,6 @@
includeBuild(root.resolve("main"))
includeBuild(root.resolve("test_modules").resolve("testbase"))
includeBuild(root.resolve("test_modules").resolve("tests_java_9"))
-includeBuild(root.resolve("test_modules").resolve("tests_java_10"))
includeBuild(root.resolve("test_modules").resolve("tests_java_11"))
includeBuild(root.resolve("test_modules").resolve("tests_java_17"))
includeBuild(root.resolve("test_modules").resolve("tests_java_21"))
diff --git a/src/test/examplesJava10/backport/ListBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/ListBackportJava10Test.java
similarity index 98%
rename from src/test/examplesJava10/backport/ListBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/ListBackportJava10Test.java
index f8abd84..06b11fa 100644
--- a/src/test/examplesJava10/backport/ListBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/ListBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/backport/MapBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/MapBackportJava10Test.java
similarity index 98%
rename from src/test/examplesJava10/backport/MapBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/MapBackportJava10Test.java
index fa9864e..142a5d6 100644
--- a/src/test/examplesJava10/backport/MapBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/MapBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/backport/OptionalBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalBackportJava10Test.java
similarity index 97%
rename from src/test/examplesJava10/backport/OptionalBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/OptionalBackportJava10Test.java
index 86165e5..35f864d 100644
--- a/src/test/examplesJava10/backport/OptionalBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/backport/OptionalDoubleBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalDoubleBackportJava10Test.java
similarity index 97%
rename from src/test/examplesJava10/backport/OptionalDoubleBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/OptionalDoubleBackportJava10Test.java
index 3f78ec2..e914d88 100644
--- a/src/test/examplesJava10/backport/OptionalDoubleBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalDoubleBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/backport/OptionalIntBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalIntBackportJava10Test.java
similarity index 97%
rename from src/test/examplesJava10/backport/OptionalIntBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/OptionalIntBackportJava10Test.java
index 1e2f17a..6e71380 100644
--- a/src/test/examplesJava10/backport/OptionalIntBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalIntBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/backport/OptionalLongBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalLongBackportJava10Test.java
similarity index 97%
rename from src/test/examplesJava10/backport/OptionalLongBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/OptionalLongBackportJava10Test.java
index 4c0ffe3..69b7f69 100644
--- a/src/test/examplesJava10/backport/OptionalLongBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/OptionalLongBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/backport/SetBackportJava10Test.java b/src/test/java11/com/android/tools/r8/jdk10/backport/SetBackportJava10Test.java
similarity index 98%
rename from src/test/examplesJava10/backport/SetBackportJava10Test.java
rename to src/test/java11/com/android/tools/r8/jdk10/backport/SetBackportJava10Test.java
index 8a4ffee..cab47c2 100644
--- a/src/test/examplesJava10/backport/SetBackportJava10Test.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/backport/SetBackportJava10Test.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package backport;
+package com.android.tools.r8.jdk10.backport;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
diff --git a/src/test/examplesJava10/desugaredlibrary/NewCollectorsTest.java b/src/test/java11/com/android/tools/r8/jdk10/desugaredlibrary/NewCollectorsTest.java
similarity index 98%
rename from src/test/examplesJava10/desugaredlibrary/NewCollectorsTest.java
rename to src/test/java11/com/android/tools/r8/jdk10/desugaredlibrary/NewCollectorsTest.java
index b36cbd0..f4136dd 100644
--- a/src/test/examplesJava10/desugaredlibrary/NewCollectorsTest.java
+++ b/src/test/java11/com/android/tools/r8/jdk10/desugaredlibrary/NewCollectorsTest.java
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package desugaredlibrary;
+package com.android.tools.r8.jdk10.desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11;
