From 196db66fa9c3059e819f9781458d95740fa672a0 Mon Sep 17 00:00:00 2001 From: James McDowell Date: Sun, 4 Oct 2020 20:14:21 +1100 Subject: [PATCH 1/7] Updated to use the new builder methods New builder methods should be used as the old method was deprecated. --- .../name/kropp/intellij/makefile/MakefileAnnotator.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/name/kropp/intellij/makefile/MakefileAnnotator.kt b/src/main/kotlin/name/kropp/intellij/makefile/MakefileAnnotator.kt index 64f7f69..9a62db1 100644 --- a/src/main/kotlin/name/kropp/intellij/makefile/MakefileAnnotator.kt +++ b/src/main/kotlin/name/kropp/intellij/makefile/MakefileAnnotator.kt @@ -3,6 +3,7 @@ package name.kropp.intellij.makefile import com.intellij.codeInspection.ProblemHighlightType import com.intellij.lang.annotation.AnnotationHolder import com.intellij.lang.annotation.Annotator +import com.intellij.lang.annotation.HighlightSeverity import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference @@ -49,9 +50,10 @@ class MakefileAnnotator : Annotator { } if (!targetReferences && !fileReferenceResolved) { - holder.createWeakWarningAnnotation(element, "Unresolved prerequisite").registerFix(CreateRuleFix(element)) + holder.newAnnotation(HighlightSeverity.WEAK_WARNING, "Unresolved prerequisite").range(element) + .withFix(CreateRuleFix(element)).create() } else if (unresolvedFile != null) { - holder.createWeakWarningAnnotation(unresolvedFile!!, "File not found") + holder.newAnnotation(HighlightSeverity.WEAK_WARNING, "File not found").range(unresolvedFile!!).create() } } } else if (element is MakefileVariable) { From e9b668eb89d081cf6bcadcef122833e32aba4a1c Mon Sep 17 00:00:00 2001 From: James McDowell Date: Sun, 4 Oct 2020 20:22:35 +1100 Subject: [PATCH 2/7] Updated to use the new extension list The extension list accessor was deprecated, we are now supposed to access the executor through the direct reference. --- .../kotlin/com/intuit/ddb/DockDockBuildRunTargetAction.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/intuit/ddb/DockDockBuildRunTargetAction.kt b/src/main/kotlin/com/intuit/ddb/DockDockBuildRunTargetAction.kt index 2d2cba9..97bfa12 100644 --- a/src/main/kotlin/com/intuit/ddb/DockDockBuildRunTargetAction.kt +++ b/src/main/kotlin/com/intuit/ddb/DockDockBuildRunTargetAction.kt @@ -1,6 +1,6 @@ package com.intuit.ddb -import com.intellij.execution.ExecutorRegistry +import com.intellij.execution.Executor import com.intellij.execution.Location import com.intellij.execution.PsiLocation import com.intellij.execution.RunManagerEx @@ -28,6 +28,6 @@ class DockDockBuildRunTargetAction(private val target: MakefileTarget) : AnActio val configuration = producer.findOrCreateConfigurationFromContext(context)?.configurationSettings ?: return (context.runManager as RunManagerEx).setTemporaryConfiguration(configuration) - ExecutionUtil.runConfiguration(configuration, ExecutorRegistry.getInstance().registeredExecutors.first()) + ExecutionUtil.runConfiguration(configuration, Executor.EXECUTOR_EXTENSION_NAME.extensionList.first()) } } \ No newline at end of file From aeabe230d8ca392bb5a90f94de4278cc392ed942 Mon Sep 17 00:00:00 2001 From: Piyali Banerjee Date: Sun, 4 Oct 2020 13:53:59 -0400 Subject: [PATCH 3/7] #17 updated deprecated class --- src/test/kotlin/MakefileCompletionTest.kt | 4 ++-- src/test/kotlin/MakefileCreateRuleQuickfixTest.kt | 4 ++-- src/test/kotlin/MakefileFindUsagesTest.kt | 4 ++-- src/test/kotlin/MakefileFoldingTest.kt | 4 ++-- src/test/kotlin/MakefileHighlightingTest.kt | 4 ++-- src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt | 4 ++-- src/test/kotlin/MakefileStructureViewTest.kt | 2 +- src/test/kotlin/MakefileTargetRenameTest.kt | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/test/kotlin/MakefileCompletionTest.kt b/src/test/kotlin/MakefileCompletionTest.kt index 3c7ec11..f94b7c7 100644 --- a/src/test/kotlin/MakefileCompletionTest.kt +++ b/src/test/kotlin/MakefileCompletionTest.kt @@ -1,6 +1,6 @@ -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileCompletionTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileCompletionTest : BasePlatformTestCase() { fun testSimple() = doTest("b", "c", "d", "${getTestName(true)}.mk") fun testTargets() = doTest("a", "${getTestName(true)}.mk") diff --git a/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt b/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt index f5d6cc2..2f6d51b 100644 --- a/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt +++ b/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt @@ -1,6 +1,6 @@ -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileCreateRuleQuickfixTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileCreateRuleQuickfixTest : BasePlatformTestCase() { fun testSimple() = doTest() fun testMiddle() = doTest() diff --git a/src/test/kotlin/MakefileFindUsagesTest.kt b/src/test/kotlin/MakefileFindUsagesTest.kt index 8e4d0f4..a0a5ad8 100644 --- a/src/test/kotlin/MakefileFindUsagesTest.kt +++ b/src/test/kotlin/MakefileFindUsagesTest.kt @@ -1,12 +1,12 @@ import com.intellij.codeInsight.TargetElementUtil import com.intellij.find.FindManager import com.intellij.find.impl.FindManagerImpl -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.hamcrest.collection.IsCollectionWithSize.hasSize import org.hamcrest.core.IsNull.nullValue import org.junit.Assert.assertThat -class MakefileFindUsagesTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileFindUsagesTest : BasePlatformTestCase() { fun testSimple() { val usages = myFixture.testFindUsages("$testDataPath/$basePath/${getTestName(true)}.mk") diff --git a/src/test/kotlin/MakefileFoldingTest.kt b/src/test/kotlin/MakefileFoldingTest.kt index 8de9da6..701ced2 100644 --- a/src/test/kotlin/MakefileFoldingTest.kt +++ b/src/test/kotlin/MakefileFoldingTest.kt @@ -1,6 +1,6 @@ -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileFoldingTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileFoldingTest : BasePlatformTestCase() { fun testRule() = doTest() fun testVariable() = doTest() fun testDefine() = doTest() diff --git a/src/test/kotlin/MakefileHighlightingTest.kt b/src/test/kotlin/MakefileHighlightingTest.kt index 01ac2a3..7db63a3 100644 --- a/src/test/kotlin/MakefileHighlightingTest.kt +++ b/src/test/kotlin/MakefileHighlightingTest.kt @@ -1,6 +1,6 @@ -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileHighlightingTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileHighlightingTest : BasePlatformTestCase() { fun testUnresolved() = doTest() fun testRedundant() = doTest(true) fun testTargetspecificvars() = doTest() diff --git a/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt b/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt index ad0a3d5..0f40149 100644 --- a/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt +++ b/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt @@ -1,6 +1,6 @@ -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileRemoveRuleQuickfixTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileRemoveRuleQuickfixTest : BasePlatformTestCase() { fun testSingle() = doTest() fun testTwo() = doTest() diff --git a/src/test/kotlin/MakefileStructureViewTest.kt b/src/test/kotlin/MakefileStructureViewTest.kt index 610415d..81bb76c 100644 --- a/src/test/kotlin/MakefileStructureViewTest.kt +++ b/src/test/kotlin/MakefileStructureViewTest.kt @@ -1,7 +1,7 @@ import com.intellij.testFramework.* import com.intellij.testFramework.fixtures.* -class MakefileStructureViewTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileStructureViewTest : BasePlatformTestCase() { fun testSimple() { val filename = "${getTestName(true)}.mk" myFixture.configureByFile("$testDataPath/$basePath/$filename") diff --git a/src/test/kotlin/MakefileTargetRenameTest.kt b/src/test/kotlin/MakefileTargetRenameTest.kt index 6e91421..755ff78 100644 --- a/src/test/kotlin/MakefileTargetRenameTest.kt +++ b/src/test/kotlin/MakefileTargetRenameTest.kt @@ -1,6 +1,6 @@ -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileTargetRenameTest : LightPlatformCodeInsightFixtureTestCase() { +class MakefileTargetRenameTest : BasePlatformTestCase() { fun testSimple() = doTest("qwerty") From d870ced546b348b2407b557b17c40ec56199bde8 Mon Sep 17 00:00:00 2001 From: Boris Tsirkin Date: Sun, 4 Oct 2020 21:37:52 +0200 Subject: [PATCH 4/7] Fixes #8. Replaced deprecated API call. --- .../kotlin/name/kropp/intellij/makefile/MakefileFileType.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/name/kropp/intellij/makefile/MakefileFileType.kt b/src/main/kotlin/name/kropp/intellij/makefile/MakefileFileType.kt index 88b3876..6ca6c12 100644 --- a/src/main/kotlin/name/kropp/intellij/makefile/MakefileFileType.kt +++ b/src/main/kotlin/name/kropp/intellij/makefile/MakefileFileType.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.fileTypes.* import com.intellij.openapi.util.IconLoader import javax.swing.Icon -val MakefileIcon = IconLoader.getIcon("/ddb/icon/DockDockBuild15pxl.png") +val MakefileIcon = IconLoader.getIcon("/ddb/icon/DockDockBuild15pxl.png", MakefileFileType::class.java) val MakefileTargetIcon = AllIcons.RunConfigurations.TestState.Run!! class MakefileFileType : LanguageFileType(MakefileLanguage) { From 1e651533abe3d64e6c3ca81e250a33a373aabf57 Mon Sep 17 00:00:00 2001 From: Boris Tsirkin Date: Sun, 4 Oct 2020 22:13:50 +0200 Subject: [PATCH 5/7] Fixes #16. Made tests green again. --- src/test/kotlin/DockDockTestCase.kt | 8 ++++++++ src/test/kotlin/MakefileCompletionTest.kt | 6 ++---- src/test/kotlin/MakefileCreateRuleQuickfixTest.kt | 6 ++---- src/test/kotlin/MakefileFindUsagesTest.kt | 8 +++----- src/test/kotlin/MakefileFoldingTest.kt | 4 +--- src/test/kotlin/MakefileHighlightingTest.kt | 9 +++++---- src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt | 6 ++---- src/test/kotlin/MakefileStructureViewTest.kt | 8 +++----- src/test/kotlin/MakefileTargetRenameTest.kt | 6 ++---- 9 files changed, 28 insertions(+), 33 deletions(-) create mode 100644 src/test/kotlin/DockDockTestCase.kt diff --git a/src/test/kotlin/DockDockTestCase.kt b/src/test/kotlin/DockDockTestCase.kt new file mode 100644 index 0000000..ccdbd0c --- /dev/null +++ b/src/test/kotlin/DockDockTestCase.kt @@ -0,0 +1,8 @@ +import com.intellij.testFramework.fixtures.BasePlatformTestCase + +/** + * Base test case for the DockDockBuild tests using fixtures. + */ +abstract class DockDockTestCase : BasePlatformTestCase() { + final override fun getTestDataPath() = "testData" +} diff --git a/src/test/kotlin/MakefileCompletionTest.kt b/src/test/kotlin/MakefileCompletionTest.kt index f94b7c7..3e062d2 100644 --- a/src/test/kotlin/MakefileCompletionTest.kt +++ b/src/test/kotlin/MakefileCompletionTest.kt @@ -1,11 +1,9 @@ -import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileCompletionTest : BasePlatformTestCase() { +class MakefileCompletionTest : DockDockTestCase() { fun testSimple() = doTest("b", "c", "d", "${getTestName(true)}.mk") fun testTargets() = doTest("a", "${getTestName(true)}.mk") - fun doTest(vararg variants: String) = myFixture.testCompletionVariants("$testDataPath/$basePath/${getTestName(true)}.mk", *variants) + fun doTest(vararg variants: String) = myFixture.testCompletionVariants("$basePath/${getTestName(true)}.mk", *variants) - override fun getTestDataPath() = "testData" override fun getBasePath() = "completion" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt b/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt index 2f6d51b..14abeea 100644 --- a/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt +++ b/src/test/kotlin/MakefileCreateRuleQuickfixTest.kt @@ -1,17 +1,15 @@ -import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileCreateRuleQuickfixTest : BasePlatformTestCase() { +class MakefileCreateRuleQuickfixTest : DockDockTestCase() { fun testSimple() = doTest() fun testMiddle() = doTest() fun doTest() { - myFixture.configureByFile("$testDataPath/$basePath/${getTestName(true)}.mk") + myFixture.configureByFile("$basePath/${getTestName(true)}.mk") val intention = myFixture.findSingleIntention("Create Rule") myFixture.launchAction(intention) myFixture.checkResultByFile("$basePath/${getTestName(true)}.gold.mk") } - override fun getTestDataPath() = "testData" override fun getBasePath() = "quickfix/createRule" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileFindUsagesTest.kt b/src/test/kotlin/MakefileFindUsagesTest.kt index a0a5ad8..685a2f5 100644 --- a/src/test/kotlin/MakefileFindUsagesTest.kt +++ b/src/test/kotlin/MakefileFindUsagesTest.kt @@ -1,14 +1,13 @@ import com.intellij.codeInsight.TargetElementUtil import com.intellij.find.FindManager import com.intellij.find.impl.FindManagerImpl -import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.hamcrest.collection.IsCollectionWithSize.hasSize import org.hamcrest.core.IsNull.nullValue import org.junit.Assert.assertThat -class MakefileFindUsagesTest : BasePlatformTestCase() { +class MakefileFindUsagesTest : DockDockTestCase() { fun testSimple() { - val usages = myFixture.testFindUsages("$testDataPath/$basePath/${getTestName(true)}.mk") + val usages = myFixture.testFindUsages("$basePath/${getTestName(true)}.mk") assertThat(usages, hasSize(2)) } @@ -17,13 +16,12 @@ class MakefileFindUsagesTest : BasePlatformTestCase() { fun testForce() = notSearchableForUsages() fun notSearchableForUsages() { - myFixture.configureByFiles("$testDataPath/$basePath/${getTestName(true)}.mk") + myFixture.configureByFiles("$basePath/${getTestName(true)}.mk") val targetElement = TargetElementUtil.findTargetElement(myFixture.editor, TargetElementUtil.ELEMENT_NAME_ACCEPTED or TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED) val handler = (FindManager.getInstance(project) as FindManagerImpl).findUsagesManager.getFindUsagesHandler(targetElement!!, false) assertThat(handler, nullValue()) } - override fun getTestDataPath() = "testData" override fun getBasePath() = "findUsages" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileFoldingTest.kt b/src/test/kotlin/MakefileFoldingTest.kt index 701ced2..a27e030 100644 --- a/src/test/kotlin/MakefileFoldingTest.kt +++ b/src/test/kotlin/MakefileFoldingTest.kt @@ -1,6 +1,5 @@ -import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileFoldingTest : BasePlatformTestCase() { +class MakefileFoldingTest : DockDockTestCase() { fun testRule() = doTest() fun testVariable() = doTest() fun testDefine() = doTest() @@ -8,6 +7,5 @@ class MakefileFoldingTest : BasePlatformTestCase() { fun doTest() = myFixture.testFolding("$testDataPath/$basePath/${getTestName(true)}.mk") - override fun getTestDataPath() = "testData" override fun getBasePath() = "folding" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileHighlightingTest.kt b/src/test/kotlin/MakefileHighlightingTest.kt index 7db63a3..bcbbff7 100644 --- a/src/test/kotlin/MakefileHighlightingTest.kt +++ b/src/test/kotlin/MakefileHighlightingTest.kt @@ -1,12 +1,13 @@ -import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileHighlightingTest : BasePlatformTestCase() { +class MakefileHighlightingTest : DockDockTestCase() { fun testUnresolved() = doTest() fun testRedundant() = doTest(true) fun testTargetspecificvars() = doTest() - fun doTest(checkInfos: Boolean = false) { myFixture.testHighlighting(true, checkInfos, true, "$testDataPath/$basePath/${getTestName(true)}.mk") } + fun doTest(checkInfos: Boolean = false) { + myFixture.testHighlighting(true, checkInfos, true, + "$basePath/${getTestName(true)}.mk") + } - override fun getTestDataPath() = "testData" override fun getBasePath() = "highlighting" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt b/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt index 0f40149..91ab41c 100644 --- a/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt +++ b/src/test/kotlin/MakefileRemoveRuleQuickfixTest.kt @@ -1,16 +1,14 @@ -import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileRemoveRuleQuickfixTest : BasePlatformTestCase() { +class MakefileRemoveRuleQuickfixTest : DockDockTestCase() { fun testSingle() = doTest() fun testTwo() = doTest() fun doTest() { - myFixture.configureByFile("$testDataPath/$basePath/${getTestName(true)}.mk") + myFixture.configureByFile("$basePath/${getTestName(true)}.mk") val intention = myFixture.findSingleIntention("Remove Empty Rule") myFixture.launchAction(intention) myFixture.checkResultByFile("$basePath/${getTestName(true)}.gold.mk") } - override fun getTestDataPath() = "testData" override fun getBasePath() = "quickfix/removeRule" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileStructureViewTest.kt b/src/test/kotlin/MakefileStructureViewTest.kt index 81bb76c..d750e74 100644 --- a/src/test/kotlin/MakefileStructureViewTest.kt +++ b/src/test/kotlin/MakefileStructureViewTest.kt @@ -1,16 +1,14 @@ -import com.intellij.testFramework.* -import com.intellij.testFramework.fixtures.* +import com.intellij.testFramework.PlatformTestUtil -class MakefileStructureViewTest : BasePlatformTestCase() { +class MakefileStructureViewTest : DockDockTestCase() { fun testSimple() { val filename = "${getTestName(true)}.mk" - myFixture.configureByFile("$testDataPath/$basePath/$filename") + myFixture.configureByFile("$basePath/$filename") myFixture.testStructureView { PlatformTestUtil.expandAll(it.tree) PlatformTestUtil.assertTreeEqual(it.tree, "-simple.mk\n all\n hello\n world\n") } } - override fun getTestDataPath() = "testData" override fun getBasePath() = "structure" } \ No newline at end of file diff --git a/src/test/kotlin/MakefileTargetRenameTest.kt b/src/test/kotlin/MakefileTargetRenameTest.kt index 755ff78..efbcc14 100644 --- a/src/test/kotlin/MakefileTargetRenameTest.kt +++ b/src/test/kotlin/MakefileTargetRenameTest.kt @@ -1,15 +1,13 @@ -import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MakefileTargetRenameTest : BasePlatformTestCase() { +class MakefileTargetRenameTest : DockDockTestCase() { fun testSimple() = doTest("qwerty") fun doTest(newName: String) { - myFixture.configureByFile("$testDataPath/$basePath/${getTestName(true)}.mk") + myFixture.configureByFile("$basePath/${getTestName(true)}.mk") myFixture.renameElementAtCaret(newName) myFixture.checkResultByFile("$basePath/${getTestName(true)}.gold.mk") } - override fun getTestDataPath() = "testData" override fun getBasePath() = "rename" } \ No newline at end of file From 17dcd5c494726850d8386d2a40a90596c359d784 Mon Sep 17 00:00:00 2001 From: James McDowell Date: Mon, 5 Oct 2020 08:09:04 +1100 Subject: [PATCH 6/7] Updated deprecated Gradle definitions Gradle requires the use of HTTPS The `compile` keyword has been replaced with `implementation`. Since we are collecting the file structure, use `runtimeClasspath`. --- build.gradle | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8a76f69..203c31a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' } + maven { url 'https://dl.bintray.com/jetbrains/intellij-plugin-service' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -60,17 +60,18 @@ jar { } from { - configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } dependencies { compileProcessBuilder - compile "com.fasterxml.jackson.core:jackson-core:2.9.9" - compile "com.fasterxml.jackson.core:jackson-databind:2.9.9" + implementation "com.fasterxml.jackson.core:jackson-core:2.9.9" + implementation "com.fasterxml.jackson.core:jackson-core:2.9.9" + implementation "com.fasterxml.jackson.core:jackson-databind:2.9.9" compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testCompile "org.hamcrest:hamcrest-all:1.3" + testImplementation "org.hamcrest:hamcrest-all:1.3" } From 3a7ce4603978e263bcd1bdf62bd4286054feb940 Mon Sep 17 00:00:00 2001 From: James McDowell Date: Mon, 5 Oct 2020 09:16:45 +1100 Subject: [PATCH 7/7] Removed duplicate jackson core import Duplicate imports are redundant and can be removed. --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 203c31a..7ab877a 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,6 @@ jar { dependencies { compileProcessBuilder implementation "com.fasterxml.jackson.core:jackson-core:2.9.9" - implementation "com.fasterxml.jackson.core:jackson-core:2.9.9" implementation "com.fasterxml.jackson.core:jackson-databind:2.9.9" compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testImplementation "org.hamcrest:hamcrest-all:1.3"