Skip to content
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.

Sign up for GitHub

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

Use old version-string scheme for Scala compiler target #1528

Merged
merged 2 commits into from
Oct 29, 2020
Merged

Use old version-string scheme for Scala compiler target #1528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f9c64
Use old-style version scheme for Scala compiler target version
rshkv Oct 29, 2020
774334c
Add changelog
rshkv Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-1528.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: fix
fix:
description: Use old version-string scheme for Scala compiler target (`jvm-1.8` instead of `jvm-8`).
links:
- https://github.com/palantir/gradle-baseline/pull/1528
2 changes: 1 addition & 1 deletion gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineScalastyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.gradle.plugins.ide.idea.model.IdeaModel;

public final class BaselineScalastyle extends AbstractBaselinePlugin {
private static final String SCALA_TARGET_VERSION = "jvm-8";
private static final String SCALA_TARGET_VERSION = "jvm-1.8";

@Override
public void apply(Project project) {
Expand Down
2 changes: 1 addition & 1 deletion gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineScalastyleTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ final class BaselineScalastyleTest extends Specification {
expect:
def tasks = project.tasks.withType(ScalaCompile.class)
for (ScalaCompile task : tasks) {
assert task.getScalaCompileOptions().getAdditionalParameters().contains("-target:jvm-8")
assert task.getScalaCompileOptions().getAdditionalParameters().contains("-target:jvm-1.8")
}
}

Expand Down