diff --git a/buildSrc/quality/pmd.xml b/buildSrc/quality/pmd.xml index 1d49f901..5e0e88e3 100644 --- a/buildSrc/quality/pmd.xml +++ b/buildSrc/quality/pmd.xml @@ -1,7 +1,7 @@ io.spine.tools tool-base -2.0.0-SNAPSHOT.396 +2.0.0-SNAPSHOT.397 2015 @@ -408,11 +408,6 @@ all modules and does not describe the project structure per-subproject. templating-plugin 2.2.0 - - org.jetbrains.kotlin - abi-tools - 2.3.21 - org.jetbrains.kotlin kotlin-assignment-compiler-plugin-embeddable @@ -434,11 +429,6 @@ all modules and does not describe the project structure per-subproject. 2.3.21 provided - - org.jetbrains.kotlin - kotlin-klib-commonizer-embeddable - 2.3.21 - org.jetbrains.kotlin kotlin-reflect diff --git a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt index eeec002d..bfb583d6 100644 --- a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt +++ b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/GradleTaskTest.kt @@ -45,7 +45,7 @@ class GradleTaskTest { @Test fun `create an instance from an existing Gradle task`() { val project = ProjectBuilder.builder().build() - val task = project.tasks.create("existingTask") + val task = project.tasks.register("existingTask").get() val gradleTask = GradleTask.from(task) @@ -58,7 +58,7 @@ class GradleTaskTest { @Test fun `provide a string representation`() { val project = ProjectBuilder.builder().build() - val task = project.tasks.create("aTask") + val task = project.tasks.register("aTask").get() GradleTask.from(task).toString() shouldContain "GradleTask" } @@ -66,8 +66,8 @@ class GradleTaskTest { @Test fun `support equality`() { val project = ProjectBuilder.builder().build() - val taskA = project.tasks.create("taskA") - val taskB = project.tasks.create("taskB") + val taskA = project.tasks.register("taskA").get() + val taskB = project.tasks.register("taskB").get() EqualsTester() .addEqualityGroup(GradleTask.from(taskA), GradleTask.from(taskA)) diff --git a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt index 5241cf3d..5e289285 100644 --- a/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt +++ b/plugin-base/src/test/kotlin/io/spine/tools/gradle/task/TaskDependenciesSpec.kt @@ -43,8 +43,8 @@ internal class TaskDependenciesSpec { @BeforeEach fun setUp() { val project = ProjectBuilder.builder().build() - ontoTask = project.tasks.create("ontoTask") - task = project.tasks.create("dependent") + ontoTask = project.tasks.register("ontoTask").get() + task = project.tasks.register("dependent").get() } @Test diff --git a/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt b/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt index 78462898..0d22624c 100644 --- a/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt +++ b/psi-java/src/test/kotlin/io/spine/tools/psi/PsiElementExtsSpec.kt @@ -49,9 +49,9 @@ internal class PsiElementExtsSpec { * to a member of `PsiFile`. */ private fun loadClass(tempDir: Path) = - (FileSystem.load(tempDir.resolve("Stub.java").apply { + FileSystem.load(tempDir.resolve("Stub.java").apply { writeText("class Stub {}") - }) as PsiJavaFile).topLevelClass + }).topLevelClass @Test fun `obtain the virtual file of an element`(@TempDir tempDir: Path) { diff --git a/version.gradle.kts b/version.gradle.kts index 14087738..776291ac 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -24,4 +24,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -val versionToPublish: String by extra("2.0.0-SNAPSHOT.396") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.397")