diff --git a/build.gradle.kts b/build.gradle.kts index b161f47..eb13a58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { // Kotlin support id("org.jetbrains.kotlin.jvm") version "1.6.10" // Gradle IntelliJ Plugin - id("org.jetbrains.intellij") version "1.5.3" + id("org.jetbrains.intellij") version "1.7.0" // Gradle Changelog Plugin id("org.jetbrains.changelog") version "1.3.1" // Gradle Qodana Plugin @@ -17,7 +17,7 @@ plugins { // detekt linter - read more: https://detekt.github.io/detekt/gradle.html id("io.gitlab.arturbosch.detekt") version "1.14.2" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "9.4.1" + //id("org.jlleitschuh.gradle.ktlint") version "10.3.0" // id("com.x5dev.chunk.templates") version "3.5.0" } @@ -50,7 +50,7 @@ intellij { version.set(properties("platformVersion")) type.set(properties("platformType")) - //localPath.set("/home/patrickjaja/.local/share/JetBrains/Toolbox/apps/PhpStorm/ch-0/213.6777.58") + // localPath.set("/home/patrickjaja/.local/share/JetBrains/Toolbox/apps/PhpStorm/ch-0/213.6777.58") // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty)) } @@ -113,7 +113,7 @@ tasks { runIde { jvmArgs("-Xmx2024m", "-Xms512m", "-XX:MaxPermSize=500m", "-ea") - ideDir.set(file(properties("platformIdeDir"))) + //ideDir.set(file(properties("platformIdeDir"))) } // Configure UI tests plugin diff --git a/build_twig_cache.sh b/build_twig_cache.sh index 0642456..017923e 100755 --- a/build_twig_cache.sh +++ b/build_twig_cache.sh @@ -1,2 +1,3 @@ #!/bin/bash -tree -J ./src/main/resources/templates > ./src/main/resources/template-map.json \ No newline at end of file +cd ./src/main/resources +tree -J templates/ > template-map.json \ No newline at end of file diff --git a/src/test/java/mock/ProjectMock.java b/src/test/java/mock/ProjectMock.java index 112dd11..6f91aca 100644 --- a/src/test/java/mock/ProjectMock.java +++ b/src/test/java/mock/ProjectMock.java @@ -127,22 +127,22 @@ public T instantiateClassWithConstructorInjection(@NotNull Class aClass, @Override public @NotNull RuntimeException createError(@NotNull Throwable error, @NotNull PluginId pluginId) { - return null; + return new RuntimeException(); } @Override public @NotNull RuntimeException createError(@NotNull @NonNls String message, @NotNull PluginId pluginId) { - return null; + return new RuntimeException(); } @Override public @NotNull RuntimeException createError(@NotNull @NonNls String message, @Nullable Throwable error, @NotNull PluginId pluginId, @Nullable Map attachments) { - return null; + return new RuntimeException(); } @Override public @NotNull Class loadClass(@NotNull String className, @NotNull PluginDescriptor pluginDescriptor) throws ClassNotFoundException { - return null; + return (Class) ProjectMock.class.getClassLoader().loadClass(className); } @Override