-
Notifications
You must be signed in to change notification settings - Fork 135
Add baseline-encoding plugin to force UTF-8 during compilation #1600
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| type: feature | ||
| feature: | ||
| description: Baseline now provides a `com.palantir.baseline-encoding` plugin to | ||
| force UTF-8 in compilation tasks. | ||
| links: | ||
| - https://github.com/palantir/gradle-baseline/pull/1600 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineEncoding.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.baseline.plugins; | ||
|
|
||
| import org.gradle.api.Plugin; | ||
| import org.gradle.api.Project; | ||
| import org.gradle.api.tasks.compile.JavaCompile; | ||
|
|
||
| public final class BaselineEncoding implements Plugin<Project> { | ||
|
|
||
| @Override | ||
| public void apply(Project project) { | ||
| project.getTasks().withType(JavaCompile.class).configureEach(javaCompileTask -> { | ||
| javaCompileTask.getOptions().setEncoding("UTF-8"); | ||
| }); | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
...java/src/main/resources/META-INF/gradle-plugins/com.palantir.baseline-encoding.properties
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| implementation-class=com.palantir.baseline.plugins.BaselineEncoding |
84 changes: 84 additions & 0 deletions
84
...aseline-java/src/test/groovy/com/palantir/baseline/BaselineEncodingIntegrationTest.groovy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.baseline | ||
|
|
||
|
|
||
| import org.gradle.testkit.runner.BuildResult | ||
| import org.gradle.testkit.runner.TaskOutcome | ||
|
|
||
| class BaselineEncodingIntegrationTest extends AbstractPluginTest { | ||
|
|
||
| def standardBuildFile = ''' | ||
| plugins { | ||
| id 'java' | ||
| id 'com.palantir.baseline-encoding' | ||
| } | ||
|
|
||
| sourceCompatibility = 1.8 | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| jcenter() | ||
| } | ||
| '''.stripIndent() | ||
|
|
||
| def otherEncodingBuildFile = ''' | ||
| plugins { | ||
| id 'java' | ||
| } | ||
|
|
||
| sourceCompatibility = 1.8 | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| jcenter() | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding = 'US-ASCII' | ||
| } | ||
| '''.stripIndent() | ||
|
|
||
| def javaFile = ''' | ||
| package test; | ||
| public class Test { | ||
| private static final String VALUE = "•"; | ||
| } | ||
| '''.stripIndent() | ||
|
|
||
| def 'compileJava succeeds with baseline-encoding'() { | ||
| when: | ||
| buildFile << standardBuildFile | ||
| file('src/main/java/test/Test.java').text = javaFile | ||
|
|
||
| then: | ||
| BuildResult result = with('compileJava').build() | ||
| result.task(":compileJava").outcome == TaskOutcome.SUCCESS | ||
| !result.output.contains("unmappable character") | ||
| } | ||
|
|
||
| def 'compileJava fails with other encoding'() { | ||
| when: | ||
| buildFile << otherEncodingBuildFile | ||
| file('src/main/java/test/Test.java').text = javaFile | ||
|
|
||
| then: | ||
| BuildResult result = with('compileJava').build() | ||
| result.task(":compileJava").outcome == TaskOutcome.SUCCESS | ||
| result.output.contains("unmappable character") | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compilation doesn't actually fail when encountering unmappable characters - those characters are just replaced with the unicode replacement character.