Skip to content

Commit 9ed2966

Browse files
committed
Merge branch 'develop' into release
2 parents 09fa116 + b924e7c commit 9ed2966

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import at.phatbl.shellexec.ShellExec
22

33
plugins {
44
kotlin("jvm") version "1.4.31" apply false
5-
id("at.phatbl.shellexec") version "1.1.3"
5+
id("at.phatbl.shellexec") version "1.5.2"
66
}
77

88
val htmlBuildDir = "$buildDir/spec/html"
@@ -101,5 +101,5 @@ tasks.create("buildPdf") {
101101

102102
tasks.create<ShellExec>("syncGrammarWithKotlinGrammarApache2Repo") {
103103
group = "internal"
104-
command = """echo -e Run the following commands: git checkout release; ...; git subtree push --prefix grammar/src/main/antlr git@github.com:Kotlin/kotlin-grammar-apache2 release"""
104+
command = """echo -e "Run the following commands: git checkout release; ...; git subtree push --prefix grammar/src/main/antlr git@github.com:Kotlin/kotlin-grammar-apache2 release""""
105105
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#!/bin/env bash
1+
#!/bin/bash
22
java -cp $PROJECT_DIR/build/libs/filters.jar org.jetbrains.kotlin.spec.CompoundFilterKt $* --embed $TODO_OPTION $STATIC_MATH_OPTION $KATEX_BIN_OPTION $IMAGE_DIR_OPTION

0 commit comments

Comments
 (0)