Skip to content

Commit 05498d9

Browse files
Knut Arne VedaaKnut Arne Vedaa
authored andcommitted
Juggled some wrapper classes for compb with older versions of SBT (max
num of apply parameters).
1 parent 0e88d6b commit 05498d9

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/main/scala/no/vedaadata/sbtjavafx/JavaFXPlugin.scala

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ case class JFX(
3434
permissions: Permissions,
3535
info: Info,
3636
signing: Signing,
37-
misc: Misc,
38-
platform: Platform)
37+
misc: Misc)
3938

4039
case class Paths(devKit: Option[DevKit], jfxrt: Option[String], antLib: Option[String], pkgResourcesDir: String)
4140

@@ -49,7 +48,7 @@ case class Signing(keyStore: Option[File], storePass: Option[String], alias: Opt
4948

5049
case class Dimensions(width: Int, height: Int, embeddedWidth: String, embeddedHeight: String)
5150

52-
case class Misc(cssToBin: Boolean, verbose: Boolean)
51+
case class Misc(platform: Platform, cssToBin: Boolean, verbose: Boolean)
5352

5453
case class Info(vendor: String, title: String, appVersion: String, category: String, copyright: String, description: String, license: String)
5554

@@ -213,20 +212,20 @@ object JavaFXPlugin extends Plugin {
213212
}
214213
}
215214
<fx:application id={ name } name={ name } version={ appVersion } mainClass={ jfx.mainClass getOrElse sys.error("JFX.mainClass not defined") }/>
216-
<fx:platform id="platform" javafx={ jfx.platform.javafx getOrElse "" } j2se={ jfx.platform.j2se getOrElse "" }>
215+
<fx:platform id="platform" javafx={ jfx.misc.platform.javafx getOrElse "" } j2se={ jfx.misc.platform.j2se getOrElse "" }>
217216
{
218-
jfx.platform.jvmargs map { value =>
217+
jfx.misc.platform.jvmargs map { value =>
219218
<fx:jvmarg value={ value }/>
220219
}
221220
}
222221
{
223-
jfx.platform.jvmuserargs map {
222+
jfx.misc.platform.jvmuserargs map {
224223
case (name, value) =>
225224
<fx:jvmuserarg name={ name } value={ value }/>
226225
}
227226
}
228227
{
229-
jfx.platform.properties map {
228+
jfx.misc.platform.properties map {
230229
case (name, value) =>
231230
<fx:property name={ name } value={ value }/>
232231
}
@@ -333,15 +332,15 @@ object JavaFXPlugin extends Plugin {
333332
JFX.keyPass := None,
334333
JFX.storeType := None,
335334
JFX.signing <<= (JFX.keyStore, JFX.storePass, JFX.alias, JFX.keyPass, JFX.storeType) apply Signing.apply,
336-
JFX.cssToBin := false,
337-
JFX.verbose := false,
338-
JFX.misc <<= (JFX.cssToBin, JFX.verbose) apply Misc.apply,
339335
JFX.javafx := None,
340336
JFX.j2se := None,
341337
JFX.jvmargs := Nil,
342338
JFX.jvmuserargs := Nil,
343339
JFX.properties := Nil,
344-
JFX.platform <<= (JFX.javafx, JFX.j2se, JFX.jvmargs, JFX.jvmuserargs, JFX.properties) apply Platform.apply)
340+
JFX.platform <<= (JFX.javafx, JFX.j2se, JFX.jvmargs, JFX.jvmuserargs, JFX.properties) apply Platform.apply,
341+
JFX.cssToBin := false,
342+
JFX.verbose := false,
343+
JFX.misc <<= (JFX.platform, JFX.cssToBin, JFX.verbose) apply Misc.apply)
345344

346345
// Settings that must be manually loaded
347346

@@ -354,5 +353,5 @@ object JavaFXPlugin extends Plugin {
354353
crossPaths <<= JFX.javaOnly(x => !x),
355354
fork in run := true,
356355
JFX.packageJavaFx <<= packageJavaFxTask,
357-
jfx <<= (JFX.paths, JFX.mainClass, JFX.output, JFX.template, JFX.dimensions, JFX.permissions, JFX.info, JFX.signing, JFX.misc, JFX.platform) apply { new JFX(_, _, _, _, _, _, _, _, _, _) })
356+
jfx <<= (JFX.paths, JFX.mainClass, JFX.output, JFX.template, JFX.dimensions, JFX.permissions, JFX.info, JFX.signing, JFX.misc) apply { new JFX(_, _, _, _, _, _, _, _, _) })
358357
}

0 commit comments

Comments
 (0)