From b8e5578705663e16721c927cef4557e658390069 Mon Sep 17 00:00:00 2001
From: pmendelski <mendelski.pawel@gmail.com>
Date: Sun, 11 Apr 2021 20:21:18 +0200
Subject: [PATCH] Update dependencies for gradle v7

---
 .idea/codeStyles/Project.xml                  | 10 +++++-
 CHANGELOG.md                                  |  9 +++--
 README.md                                     |  2 +-
 build.gradle.kts                              | 12 +++----
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle.kts                           |  2 +-
 ...anifestSpec.kt => GenerateManifestTest.kt} |  8 ++---
 ...eManifestWithoutDisabledAttributesTest.kt} |  6 ++--
 ...{PluginSetupSpec.kt => PluginSetupTest.kt} |  4 +--
 ...Spec.kt => SetupManifestAttributesTest.kt} |  6 ++--
 ...ceSpec.kt => CommandLineAcceptanceTest.kt} | 10 +++---
 ...sspathSpec.kt => GenerateClasspathTest.kt} | 34 +++++--------------
 ...kt => GenerateWithCustomAttributesTest.kt} | 12 +++----
 ...ceSpec.kt => MultiModuleAcceptanceTest.kt} | 14 ++++----
 ...rojectBuilder.kt => TestProjectBuilder.kt} | 30 ++++++++--------
 .../{SpecRepository.kt => TestRepository.kt}  | 10 +++---
 16 files changed, 83 insertions(+), 88 deletions(-)
 rename src/test/kotlin/com/coditory/gradle/manifest/{GenerateManifestSpec.kt => GenerateManifestTest.kt} (93%)
 rename src/test/kotlin/com/coditory/gradle/manifest/{GenerateManifestWithoutDisabledAttributesSpec.kt => GenerateManifestWithoutDisabledAttributesTest.kt} (89%)
 rename src/test/kotlin/com/coditory/gradle/manifest/{PluginSetupSpec.kt => PluginSetupTest.kt} (90%)
 rename src/test/kotlin/com/coditory/gradle/manifest/{SetupManifestAttributesSpec.kt => SetupManifestAttributesTest.kt} (97%)
 rename src/test/kotlin/com/coditory/gradle/manifest/acceptance/{CommandLineAcceptanceSpec.kt => CommandLineAcceptanceTest.kt} (92%)
 rename src/test/kotlin/com/coditory/gradle/manifest/acceptance/{GenerateClasspathSpec.kt => GenerateClasspathTest.kt} (62%)
 rename src/test/kotlin/com/coditory/gradle/manifest/acceptance/{GenerateWithCustomAttributesSpec.kt => GenerateWithCustomAttributesTest.kt} (85%)
 rename src/test/kotlin/com/coditory/gradle/manifest/acceptance/{MultiModuleAcceptanceSpec.kt => MultiModuleAcceptanceTest.kt} (91%)
 rename src/test/kotlin/com/coditory/gradle/manifest/base/{SpecProjectBuilder.kt => TestProjectBuilder.kt} (75%)
 rename src/test/kotlin/com/coditory/gradle/manifest/base/{SpecRepository.kt => TestRepository.kt} (92%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c23569c..90fa311 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -19,13 +19,21 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa1dc23..8f38ccc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.14] - 2021-04-11
+### Changed
+- Updated dependencies for Gradle v7
+
 ## [0.1.13] - 2021-02-23
 ### Changed
 - Support Java 1.8 [#9](https://github.com/coditory/gradle-manifest-plugin/issues/9)
@@ -27,8 +31,9 @@
 ### Changed
 - Fix SCM attributes generated in multi-module projects [#1](https://github.com/coditory/gradle-manifest-plugin/issues/1).
 
-[Unreleased]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.13...HEAD
-[0.1.12]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.12...v0.1.13
+[Unreleased]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.14...HEAD
+[0.1.14]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.13...v0.1.14
+[0.1.13]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.12...v0.1.13
 [0.1.12]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.11...v0.1.12
 [0.1.11]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.10...v0.1.11
 [0.1.10]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.9...v0.1.10
diff --git a/README.md b/README.md
index 6aac9f3..9bce6d6 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,6 @@ on [Adding Classes and Jars to Jar File's Classpath](https://docs.oracle.com/jav
 Take a look at a [gradle-manifest-plugin-sample](https://github.com/coditory/gradle-manifest-plugin-sample).
 You can copy [ManifestReader.java](https://github.com/coditory/gradle-manifest-plugin-sample/blob/master/src/main/java/com/coditory/sandbox/ManifestReader.java) (with [tests](https://github.com/coditory/gradle-manifest-plugin-sample/blob/master/src/test/groovy/com/coditory/sandbox/ManifestReaderTest.groovy)) to you own project.
 
-Reading `MANIFEST.MF` is tricky. There can be mupltiple `MANIFEST.MF` files on the classpath that comes from libraries.
+Reading `MANIFEST.MF` is tricky. There can be multiple `MANIFEST.MF` files on the classpath that comes from libraries.
 To read the correct `MANIFEST.MF` you need to filter them. Most often `Implementation-Title` is used to find the correct one.
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 81429dd..e342e5b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,21 +1,21 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.20"
+    kotlin("jvm") version "1.4.31"
     id("jacoco")
-    id("com.github.kt3k.coveralls") version "2.10.2"
-    id("com.gradle.plugin-publish") version "0.12.0"
+    id("com.github.kt3k.coveralls") version "2.12.0"
+    id("com.gradle.plugin-publish") version "0.14.0"
     id("java-gradle-plugin")
     id("maven-publish")
-    id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
+    id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 ktlint {
-    version.set("0.39.0")
+    version.set("0.41.0")
 }
 
 dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 25d3265..3c4101c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4e217f0..dff4a11 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise").version("3.5.2")
+    id("com.gradle.enterprise").version("3.6.1")
 }
 
 gradleEnterprise {
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestTest.kt
similarity index 93%
rename from src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestTest.kt
index a778d2b..051ab04 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestTest.kt
@@ -1,14 +1,14 @@
 package com.coditory.gradle.manifest
 
-import com.coditory.gradle.manifest.base.SpecProjectBuilder
-import com.coditory.gradle.manifest.base.SpecProjectBuilder.Companion.projectWithPlugins
 import com.coditory.gradle.manifest.base.SystemOutputCapturer.Companion.captureSystemOutput
+import com.coditory.gradle.manifest.base.TestProjectBuilder
+import com.coditory.gradle.manifest.base.TestProjectBuilder.Companion.projectWithPlugins
 import com.coditory.gradle.manifest.base.getManifestTask
 import com.coditory.gradle.manifest.base.readFile
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
-class GenerateManifestSpec {
+class GenerateManifestTest {
     private val expectedManifestKeys = listOf(
         "Manifest-Version:",
         "Main-Class:",
@@ -95,7 +95,7 @@ class GenerateManifestSpec {
         assertThat(output).contains(expectedManifestKeys)
     }
 
-    private fun projectBuilder(): SpecProjectBuilder {
+    private fun projectBuilder(): TestProjectBuilder {
         return projectWithPlugins("sample-project")
             .withGroup("com.coditory")
             .withGitRepository()
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestWithoutDisabledAttributesSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestWithoutDisabledAttributesTest.kt
similarity index 89%
rename from src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestWithoutDisabledAttributesSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestWithoutDisabledAttributesTest.kt
index 4410827..31df1d3 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestWithoutDisabledAttributesSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/GenerateManifestWithoutDisabledAttributesTest.kt
@@ -1,12 +1,12 @@
 package com.coditory.gradle.manifest
 
-import com.coditory.gradle.manifest.base.SpecProjectBuilder
+import com.coditory.gradle.manifest.base.TestProjectBuilder
 import com.coditory.gradle.manifest.base.generateManifest
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.api.Project
 import org.junit.jupiter.api.Test
 
-class GenerateManifestWithoutDisabledAttributesSpec {
+class GenerateManifestWithoutDisabledAttributesTest {
     @Test
     fun `should generate manifest without scm attributes`() {
         // when
@@ -41,7 +41,7 @@ class GenerateManifestWithoutDisabledAttributesSpec {
     }
 
     private fun project(): Project {
-        return SpecProjectBuilder.projectWithPlugins()
+        return TestProjectBuilder.projectWithPlugins()
             .withGroup("com.coditory")
             .withGitRepository()
             .withExtProperty("mainClassName", "com.coditory.MainClass")
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/PluginSetupSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/PluginSetupTest.kt
similarity index 90%
rename from src/test/kotlin/com/coditory/gradle/manifest/PluginSetupSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/PluginSetupTest.kt
index 2ae1f84..853bfe4 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/PluginSetupSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/PluginSetupTest.kt
@@ -1,13 +1,13 @@
 package com.coditory.gradle.manifest
 
 import com.coditory.gradle.manifest.ManifestPlugin.Companion.GENERATE_MANIFEST_TASK
-import com.coditory.gradle.manifest.base.SpecProjectBuilder.Companion.projectWithPlugins
+import com.coditory.gradle.manifest.base.TestProjectBuilder.Companion.projectWithPlugins
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.language.jvm.tasks.ProcessResources
 import org.junit.jupiter.api.Test
 
-class PluginSetupSpec {
+class PluginSetupTest {
     private val project = projectWithPlugins()
         .build()
 
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/SetupManifestAttributesSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/SetupManifestAttributesTest.kt
similarity index 97%
rename from src/test/kotlin/com/coditory/gradle/manifest/SetupManifestAttributesSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/SetupManifestAttributesTest.kt
index 2b965d6..d307f7b 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/SetupManifestAttributesSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/SetupManifestAttributesTest.kt
@@ -2,14 +2,14 @@ package com.coditory.gradle.manifest
 
 import com.coditory.gradle.manifest.base.ManifestExtractor.extractManifestAttributes
 import com.coditory.gradle.manifest.base.ManifestExtractor.extractManifestMap
-import com.coditory.gradle.manifest.base.SpecProjectBuilder.Companion.projectWithPlugins
-import com.coditory.gradle.manifest.base.SpecRepository.Companion.repository
 import com.coditory.gradle.manifest.base.SystemProperties.withSystemProperties
 import com.coditory.gradle.manifest.base.SystemProperties.withoutSystemProperties
+import com.coditory.gradle.manifest.base.TestProjectBuilder.Companion.projectWithPlugins
+import com.coditory.gradle.manifest.base.TestRepository.Companion.repository
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
-class SetupManifestAttributesSpec {
+class SetupManifestAttributesTest {
     @Test
     fun `should generate basic attributes for bare bone project with no git and no system properties`() {
         // given
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/CommandLineAcceptanceSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/CommandLineAcceptanceTest.kt
similarity index 92%
rename from src/test/kotlin/com/coditory/gradle/manifest/acceptance/CommandLineAcceptanceSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/acceptance/CommandLineAcceptanceTest.kt
index d01a4e4..3ab53ee 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/CommandLineAcceptanceSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/CommandLineAcceptanceTest.kt
@@ -1,7 +1,7 @@
 package com.coditory.gradle.manifest.acceptance
 
-import com.coditory.gradle.manifest.base.SpecProjectBuilder
-import com.coditory.gradle.manifest.base.SpecRepository.Companion.COMMIT_MESSAGE
+import com.coditory.gradle.manifest.base.TestProjectBuilder
+import com.coditory.gradle.manifest.base.TestRepository.Companion.COMMIT_MESSAGE
 import com.coditory.gradle.manifest.base.readFile
 import com.coditory.gradle.manifest.base.runGradle
 import org.assertj.core.api.Assertions.assertThat
@@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
-class CommandLineAcceptanceSpec {
-    private val project = SpecProjectBuilder.project("sample-project")
+class CommandLineAcceptanceTest {
+    private val project = TestProjectBuilder.project("sample-project")
         .withBuildGradle(
             """
             plugins {
@@ -69,7 +69,7 @@ class CommandLineAcceptanceSpec {
 
     @AfterEach
     fun removeProjectDir() {
-        SpecProjectBuilder.removeProjectDirs()
+        TestProjectBuilder.removeProjectDirs()
     }
 
     @ParameterizedTest(name = "should generate manifest on processResources command for gradle {0}")
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateClasspathSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateClasspathTest.kt
similarity index 62%
rename from src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateClasspathSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateClasspathTest.kt
index 0eaa85c..92df0ea 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateClasspathSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateClasspathTest.kt
@@ -1,7 +1,7 @@
 package com.coditory.gradle.manifest.acceptance
 
-import com.coditory.gradle.manifest.base.SpecProjectBuilder
-import com.coditory.gradle.manifest.base.SpecProjectBuilder.Companion.projectWithPlugins
+import com.coditory.gradle.manifest.base.TestProjectBuilder
+import com.coditory.gradle.manifest.base.TestProjectBuilder.Companion.projectWithPlugins
 import com.coditory.gradle.manifest.base.readFile
 import com.coditory.gradle.manifest.base.runGradle
 import org.assertj.core.api.Assertions.assertThat
@@ -12,10 +12,10 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 import java.util.regex.Pattern.DOTALL
 
-class GenerateClasspathSpec {
+class GenerateClasspathTest {
     @AfterEach
     fun removeProjectDir() {
-        SpecProjectBuilder.removeProjectDirs()
+        TestProjectBuilder.removeProjectDirs()
     }
 
     @ParameterizedTest(name = "should generate manifest with classpath for gradle {0}")
@@ -40,10 +40,9 @@ class GenerateClasspathSpec {
                 }
 
                 dependencies {
-                    compile 'org.springframework.boot:spring-boot-starter:2.4.2'
                     implementation 'com.github.slugify:slugify:2.4'
-                    runtime 'org.hashids:hashids:1.0.3'
-                    testCompile 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+                    runtimeOnly 'org.hashids:hashids:1.0.3'
+                    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
                 }
             """
             )
@@ -59,24 +58,7 @@ class GenerateClasspathSpec {
         // and
         val manifest = project.readFile("build/resources/main/META-INF/MANIFEST.MF")
         assertThat(manifest.replace("\r\n ", ""))
-            .contains("my/jars/slugify-2.4.jar")
-            .contains("my/jars/hashids-1.0.3.jar")
-            .contains("my/jars/spring-boot-starter-2.4.2.jar")
-
-        // and:
-        assertThat(manifest)
-            .contains(
-                "Class-Path: my/jars/spring-boot-starter-2.4.2.jar my/jars/slugify-2.4.\r\n" +
-                    " jar my/jars/hashids-1.0.3.jar my/jars/spring-boot-autoconfigure-2.4.2\r\n" +
-                    " .jar my/jars/spring-boot-2.4.2.jar my/jars/spring-boot-starter-loggin\r\n" +
-                    " g-2.4.2.jar my/jars/jakarta.annotation-api-1.3.5.jar my/jars/spring-c\r\n" +
-                    " ontext-5.3.3.jar my/jars/spring-aop-5.3.3.jar my/jars/spring-beans-5.\r\n" +
-                    " 3.3.jar my/jars/spring-expression-5.3.3.jar my/jars/spring-core-5.3.3\r\n" +
-                    " .jar my/jars/snakeyaml-1.27.jar my/jars/icu4j-64.2.jar my/jars/logbac\r\n" +
-                    " k-classic-1.2.3.jar my/jars/log4j-to-slf4j-2.13.3.jar my/jars/jul-to-\r\n" +
-                    " slf4j-1.7.30.jar my/jars/spring-jcl-5.3.3.jar my/jars/logback-core-1.\r\n" +
-                    " 2.3.jar my/jars/slf4j-api-1.7.30.jar my/jars/log4j-api-2.13.3.jar\r\n"
-            )
+            .contains("Class-Path: my/jars/slugify-2.4.jar my/jars/hashids-1.0.3.jar my/jars/icu4j-64.2.jar\r\n")
             .matches(".*Class-Path: [^:]+(Built-JDK: [^:]+)?$".toPattern(DOTALL))
     }
 
@@ -101,7 +83,7 @@ class GenerateClasspathSpec {
                 }
 
                 dependencies {
-                    compile 'com.github.slugify:slugify:2.4'
+                    implementation 'com.github.slugify:slugify:2.4'
                 }
             """
             )
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateWithCustomAttributesSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateWithCustomAttributesTest.kt
similarity index 85%
rename from src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateWithCustomAttributesSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateWithCustomAttributesTest.kt
index fdf2e41..e506c14 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateWithCustomAttributesSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/GenerateWithCustomAttributesTest.kt
@@ -1,7 +1,7 @@
 package com.coditory.gradle.manifest.acceptance
 
-import com.coditory.gradle.manifest.base.SpecProjectBuilder
-import com.coditory.gradle.manifest.base.SpecProjectBuilder.Companion.projectWithPlugins
+import com.coditory.gradle.manifest.base.TestProjectBuilder
+import com.coditory.gradle.manifest.base.TestProjectBuilder.Companion.projectWithPlugins
 import com.coditory.gradle.manifest.base.readFile
 import com.coditory.gradle.manifest.base.runGradle
 import org.assertj.core.api.Assertions.assertThat
@@ -10,10 +10,10 @@ import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
-class GenerateWithCustomAttributesSpec {
+class GenerateWithCustomAttributesTest {
     @AfterEach
     fun removeProjectDir() {
-        SpecProjectBuilder.removeProjectDirs()
+        TestProjectBuilder.removeProjectDirs()
     }
 
     @ParameterizedTest(name = "should generate manifest with custom attributes for gradle {0}")
@@ -47,8 +47,8 @@ class GenerateWithCustomAttributesSpec {
                 }
 
                 dependencies {
-                    compile 'org.springframework.boot:spring-boot-starter:2.4.2'
-                    testCompile 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+                    compileOnly 'org.springframework.boot:spring-boot-starter:2.4.2'
+                    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
                 }
             """
             )
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/MultiModuleAcceptanceSpec.kt b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/MultiModuleAcceptanceTest.kt
similarity index 91%
rename from src/test/kotlin/com/coditory/gradle/manifest/acceptance/MultiModuleAcceptanceSpec.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/acceptance/MultiModuleAcceptanceTest.kt
index 0e70b79..85c7c67 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/acceptance/MultiModuleAcceptanceSpec.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/acceptance/MultiModuleAcceptanceTest.kt
@@ -1,15 +1,15 @@
 package com.coditory.gradle.manifest.acceptance
 
-import com.coditory.gradle.manifest.base.SpecProjectBuilder
-import com.coditory.gradle.manifest.base.SpecRepository.Companion.COMMIT_MESSAGE
+import com.coditory.gradle.manifest.base.TestProjectBuilder
+import com.coditory.gradle.manifest.base.TestRepository.Companion.COMMIT_MESSAGE
 import com.coditory.gradle.manifest.base.readFile
 import com.coditory.gradle.manifest.base.runGradle
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
-class MultiModuleAcceptanceSpec {
-    private val parentProject = SpecProjectBuilder.project("parent-project")
+class MultiModuleAcceptanceTest {
+    private val parentProject = TestProjectBuilder.project("parent-project")
         .withBuildGradle(
             """
             plugins {
@@ -38,7 +38,7 @@ class MultiModuleAcceptanceSpec {
         .withGitRepository()
         .build()
 
-    private val projectA = SpecProjectBuilder.project("project-a", parentProject.projectDir.resolve("project-a"))
+    private val projectA = TestProjectBuilder.project("project-a", parentProject.projectDir.resolve("project-a"))
         .withBuildGradle(
             """
             plugins {
@@ -69,7 +69,7 @@ class MultiModuleAcceptanceSpec {
         )
         .build()
 
-    private val projectB = SpecProjectBuilder.project("project-b", parentProject.projectDir.resolve("project-b"))
+    private val projectB = TestProjectBuilder.project("project-b", parentProject.projectDir.resolve("project-b"))
         .withBuildGradle(
             """
             plugins {
@@ -121,7 +121,7 @@ class MultiModuleAcceptanceSpec {
 
     @AfterEach
     fun removeProjectDir() {
-        SpecProjectBuilder.removeProjectDirs()
+        TestProjectBuilder.removeProjectDirs()
     }
 
     @Test
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/base/SpecProjectBuilder.kt b/src/test/kotlin/com/coditory/gradle/manifest/base/TestProjectBuilder.kt
similarity index 75%
rename from src/test/kotlin/com/coditory/gradle/manifest/base/SpecProjectBuilder.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/base/TestProjectBuilder.kt
index c00b298..83ae7fd 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/base/SpecProjectBuilder.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/base/TestProjectBuilder.kt
@@ -1,6 +1,6 @@
 package com.coditory.gradle.manifest.base
 
-import com.coditory.gradle.manifest.base.SpecRepository.Companion.repository
+import com.coditory.gradle.manifest.base.TestRepository.Companion.repository
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
@@ -11,28 +11,28 @@ import kotlin.io.path.createTempDirectory
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSuperclassOf
 
-class SpecProjectBuilder private constructor(projectDir: File, name: String) {
+class TestProjectBuilder private constructor(projectDir: File, name: String) {
     private val project = ProjectBuilder.builder()
         .withProjectDir(projectDir)
         .withName(name)
         .build()
 
-    fun withGroup(group: String): SpecProjectBuilder {
+    fun withGroup(group: String): TestProjectBuilder {
         project.group = group
         return this
     }
 
-    fun withVersion(version: String): SpecProjectBuilder {
+    fun withVersion(version: String): TestProjectBuilder {
         project.version = version
         return this
     }
 
-    fun withExtProperty(name: String, value: String): SpecProjectBuilder {
+    fun withExtProperty(name: String, value: String): TestProjectBuilder {
         project.extensions.extraProperties[name] = value
         return this
     }
 
-    fun withPlugins(vararg plugins: KClass<out Plugin<*>>): SpecProjectBuilder {
+    fun withPlugins(vararg plugins: KClass<out Plugin<*>>): TestProjectBuilder {
         plugins
             .toList()
             .onEach { if (it.isSuperclassOf(ManifestPluginWithStubs::class)) ManifestPluginWithStubs.clock.reset() }
@@ -40,25 +40,25 @@ class SpecProjectBuilder private constructor(projectDir: File, name: String) {
         return this
     }
 
-    fun withGitRepository(): SpecProjectBuilder {
+    fun withGitRepository(): TestProjectBuilder {
         repository(project)
             .withRemote()
             .withCommit()
         return this
     }
 
-    fun withIdeaProjectFiles(): SpecProjectBuilder {
+    fun withIdeaProjectFiles(): TestProjectBuilder {
         project.rootDir.resolve(".idea").createNewFile()
         return this
     }
 
-    fun withBuildGradle(content: String): SpecProjectBuilder {
+    fun withBuildGradle(content: String): TestProjectBuilder {
         val buildFile = project.rootDir.resolve("build.gradle")
         buildFile.writeText(content.trimIndent().trim())
         return this
     }
 
-    fun withFile(path: String, content: String): SpecProjectBuilder {
+    fun withFile(path: String, content: String): TestProjectBuilder {
         val filePath = project.rootDir.resolve(path).toPath()
         Files.createDirectories(filePath.parent)
         val testFile = Files.createFile(filePath).toFile()
@@ -73,17 +73,17 @@ class SpecProjectBuilder private constructor(projectDir: File, name: String) {
     companion object {
         private var projectDirs = mutableListOf<File>()
 
-        fun project(name: String = "sample-project", projectDir: File): SpecProjectBuilder {
+        fun project(name: String = "sample-project", projectDir: File): TestProjectBuilder {
             projectDir.mkdir()
             projectDirs.add(projectDir)
-            return SpecProjectBuilder(projectDir, name)
+            return TestProjectBuilder(projectDir, name)
         }
 
-        fun project(name: String = "sample-project"): SpecProjectBuilder {
-            return SpecProjectBuilder(createProjectDir(name), name)
+        fun project(name: String = "sample-project"): TestProjectBuilder {
+            return TestProjectBuilder(createProjectDir(name), name)
         }
 
-        fun projectWithPlugins(name: String = "sample-project"): SpecProjectBuilder {
+        fun projectWithPlugins(name: String = "sample-project"): TestProjectBuilder {
             return project(name)
                 .withPlugins(JavaPlugin::class, ManifestPluginWithStubs::class)
         }
diff --git a/src/test/kotlin/com/coditory/gradle/manifest/base/SpecRepository.kt b/src/test/kotlin/com/coditory/gradle/manifest/base/TestRepository.kt
similarity index 92%
rename from src/test/kotlin/com/coditory/gradle/manifest/base/SpecRepository.kt
rename to src/test/kotlin/com/coditory/gradle/manifest/base/TestRepository.kt
index cb0b8b8..929c38e 100644
--- a/src/test/kotlin/com/coditory/gradle/manifest/base/SpecRepository.kt
+++ b/src/test/kotlin/com/coditory/gradle/manifest/base/TestRepository.kt
@@ -12,7 +12,7 @@ import java.util.Date
 import java.util.TimeZone
 import java.util.UUID
 
-class SpecRepository private constructor(
+class TestRepository private constructor(
     private val project: Project,
     private val git: Git
 ) {
@@ -20,7 +20,7 @@ class SpecRepository private constructor(
     fun withRemote(
         name: String = REMOTE_NAME,
         url: String = REMOTE_URL
-    ): SpecRepository {
+    ): TestRepository {
         val config = git.repository.config
         val remoteConfig = RemoteConfig(config, name)
         remoteConfig.addURI(URIish(url))
@@ -34,7 +34,7 @@ class SpecRepository private constructor(
         authorName: String = AUTHOR_NAME,
         authorEmail: String = AUTHOR_EMAIL,
         authorTime: ZonedDateTime = AUTHOR_TIME
-    ): SpecRepository {
+    ): TestRepository {
         val uuid = UUID.randomUUID().toString()
         val filePath = project.rootDir.resolve("samples/$uuid")
         filePath.parentFile.mkdirs()
@@ -64,11 +64,11 @@ class SpecRepository private constructor(
         const val AUTHOR_EMAIL = "john.doe@acme.com"
         val AUTHOR_TIME: ZonedDateTime = ZonedDateTime.parse("2020-03-24T20:46:03.242102+01:00")
 
-        fun repository(project: Project): SpecRepository {
+        fun repository(project: Project): TestRepository {
             val git = Git.init()
                 .setDirectory(project.rootDir)
                 .call()
-            return SpecRepository(project, git)
+            return TestRepository(project, git)
         }
     }
 }