Skip to content

Commit baf6da1

Browse files
committed
Update base platform.
1 parent 0b13ef7 commit baf6da1

File tree

8 files changed

+23
-45
lines changed

8 files changed

+23
-45
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.gitlab-ci.yml

-14
This file was deleted.

build.gradle.kts

+16-28
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

4-
buildscript {
5-
dependencies {
6-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
7-
}
8-
}
9-
104
plugins {
11-
id("org.jetbrains.kotlin.jvm") version "1.3.72"
12-
id("org.jetbrains.intellij") version "0.4.21"
5+
id("org.jetbrains.kotlin.jvm").version("1.5.0")
6+
id("org.jetbrains.intellij").version("0.7.3")
137
}
148

159
group = "com.gitlab.lae.intellij.actions.tree"
@@ -20,31 +14,25 @@ repositories {
2014
}
2115

2216
dependencies {
17+
implementation(kotlin("stdlib-jdk8"))
2318
testImplementation("org.mockito:mockito-core:3.4.0")
2419
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
2520
}
2621

27-
tasks {
28-
withType<JavaCompile> {
29-
sourceCompatibility = "1.8"
30-
targetCompatibility = "1.8"
31-
options.compilerArgs.addAll(listOf("--release", "8"))
32-
}
33-
34-
withType<KotlinCompile> {
35-
kotlinOptions {
36-
jvmTarget = "1.8"
37-
}
38-
}
22+
tasks.withType<KotlinCompile> {
23+
kotlinOptions.jvmTarget = "11"
24+
kotlinOptions.jdkHome = javaToolchains
25+
.compilerFor { languageVersion.set(JavaLanguageVersion.of(11)) }
26+
.get().metadata.installationPath.asFile.absolutePath
27+
}
3928

40-
test {
41-
testLogging {
42-
exceptionFormat = TestExceptionFormat.FULL
43-
}
29+
tasks.withType<Test> {
30+
testLogging {
31+
exceptionFormat = TestExceptionFormat.FULL
4432
}
33+
}
4534

46-
intellij {
47-
version = project.properties["intellijVersion"] as String? ?: "2019.3"
48-
updateSinceUntilBuild = false
49-
}
35+
intellij {
36+
version = "2021.1"
37+
updateSinceUntilBuild = false
5038
}

gradle/wrapper/gradle-wrapper.jar

215 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
8484

8585
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8686

87+
8788
@rem Execute Gradle
8889
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
8990

src/main/kotlin/com/gitlab/lae/intellij/actions/tree/action/ExportIdeActions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ExportIdeActions : AnAction(), DumbAware {
1919
val descriptor = FileSaverDescriptor("Export IDE Actions", "")
2020
val result = FileChooserFactory.getInstance()
2121
.createSaveFileDialog(descriptor, null as Project?)
22-
.save(null, "actions.json")
22+
.save("actions.json")
2323
?: return
2424

2525
ApplicationManager.getApplication().runWriteAction {
@@ -36,7 +36,7 @@ class ExportIdeActions : AnAction(), DumbAware {
3636
JsonWriter(it).use { writer ->
3737
writer.setIndent(" ")
3838
writer.beginArray()
39-
mgr.getActionIds("").forEach { id ->
39+
mgr.getActionIdList("").forEach { id ->
4040
val action = mgr.getActionOrStub(id) ?: return@forEach
4141
val name = action.templatePresentation.text ?: ""
4242
writer.beginObject()

0 commit comments

Comments
 (0)