luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303 from er1c/update-target-java-8 

Update javacOptions to target 1.8 & Add IntelliJ integrationTest/test run configuration
This commit is contained in:
eugene yokota 2019-10-19 17:54:12 -04:00 committed by GitHub
parent 832d94739b d7d780e16e
commit f1f114b15f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/runConfigurations/Run_integrationTest_test.xml Normal file
View File

@ -0,0 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run integrationTest/test" type="SbtRunConfiguration" factoryName="sbt Task" show_console_on_std_err="false" show_console_on_std_out="false">
<option name="allowRunningInParallel" value="false" />
<option name="tasks" value="-Dsbt.build.version=1.3.0 universal:packageBin universal:stage integrationTest/test" />
<option name="useSbtShell" value="true" />
<option name="vmparams" value="-Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled" />
<option name="workingDir" value="$PROJECT_DIR$" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

2
build.sbt
View File

@ -163,7 +163,7 @@ val root = (project in file(".")).
packageDescription in Windows := "The interactive build tool.",
wixProductId := "ce07be71-510d-414a-92d4-dff47631848a",
wixProductUpgradeId := Hash.toHex(Hash((version in Windows).value)).take(32),
javacOptions := Seq("-source", "1.5", "-target", "1.5"),
javacOptions := Seq("-source", "1.8", "-target", "1.8"),
// Universal ZIP download install.
packageName in Universal := packageName.value, // needs to be set explicitly due to a bug in native-packager