Skip to content

Commit 813b905

Browse files
committed
Do not skip the new line character, we strip multiple empty lines later.
1 parent 5ce6b2e commit 813b905

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pipeline {
3838
}
3939
stage('buildandtest') {
4040
steps {
41-
sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue build' // test'
41+
sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue --stacktrace --info build' // test'
4242
script {
4343
env.MYVERSION = sh(returnStdout: true, script: './gradlew properties -q | grep "version:" | awk \'{print $2}\'').trim()
4444
}
@@ -62,7 +62,7 @@ pipeline {
6262
FORGE_MAVEN = credentials('forge-maven-forge-user')
6363
}
6464
steps {
65-
sh './gradlew ${GRADLE_ARGS} uploadArchives -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW}'
65+
sh './gradlew ${GRADLE_ARGS} --stacktrace --info uploadArchives -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW}'
6666
}
6767
}
6868
}

src/main/java/net/minecraftforge/gradle/util/mcp/McpCleanup.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ else if (state == CommentState.SINGLE_LINE_COMMENT)
8686
{
8787
i++;
8888
}
89-
i += 1; // skip the ending newline
89+
//i += 1; // skip the ending newline
90+
// Successive new lines will be fixed by our regex below.
9091
}
9192
else // state == CommentState.MULTI_LINE_COMMENT
9293
{

0 commit comments

Comments
 (0)