Skip to content

Commit 03ee03a

Browse files
authored
Merge pull request #109 from xuwei-k/slash-syntax
2 parents 2304544 + aaf6a94 commit 03ee03a

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

build.sbt

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ lazy val root = (project in file("."))
2929
.settings(nocomma {
3030
mimaPreviousArtifacts := Set.empty
3131
Compile / packageBin := (launchSub / Proguard / proguard).value.head
32-
packageSrc in Compile := (packageSrc in Compile in launchSub).value
33-
packageDoc in Compile := (packageDoc in Compile in launchSub).value
32+
Compile / packageSrc := (launchSub / Compile / packageSrc).value
33+
Compile / packageDoc := (launchSub / Compile / packageDoc).value
3434
commands += Command.command("release") { state =>
3535
"clean" ::
3636
"test" ::
@@ -50,7 +50,7 @@ lazy val root = (project in file("."))
5050
// the launcher is published with metadata so that the scripted plugin can pull it in
5151
// being proguarded, it shouldn't ever be on a classpath with other jars, however
5252
def proguardedLauncherSettings = Seq(
53-
publishArtifact in packageSrc := false,
53+
packageSrc / publishArtifact := false,
5454
moduleName := "sbt-launch",
5555
autoScalaLibrary := false,
5656
description := "sbt application launcher"
@@ -71,12 +71,12 @@ lazy val launchInterfaceSub = (project in file("launcher-interface"))
7171
.settings(javaOnly)
7272
.settings(nocomma {
7373
name := "Launcher Interface"
74-
resourceGenerators in Compile += Def.task {
74+
Compile / resourceGenerators += Def.task {
7575
generateVersionFile("sbt.launcher.version.properties")(
7676
version.value,
7777
resourceManaged.value,
7878
streams.value,
79-
(compile in Compile).value
79+
(Compile / compile).value
8080
)
8181
}.taskValue
8282
description := "Interfaces for launching projects with the sbt launcher"
@@ -112,7 +112,7 @@ lazy val launchSub = (project in file("launcher-implementation"))
112112
Test / compile := {
113113
val ignore = (testSamples / publishLocal).value
114114
val ignore2 = (launchInterfaceSub / publishLocal).value
115-
(compile in Test).value
115+
(Test / compile).value
116116
}
117117
Proguard / proguardOptions ++= Seq(
118118
"-keep,allowshrinking class * { *; }", // no obfuscation

project/Transform.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ object Transform {
1919

2020
def conscriptSettings(launch: Reference) = Seq(
2121
conscriptConfigs := {
22-
val res = (managedResources in launch in Compile).value
23-
val src = (sourceDirectory in Compile).value
22+
val res = (launch / Compile / managedResources).value
23+
val src = (Compile / sourceDirectory).value
2424
val source = res.filter(_.getName == "sbt.boot.properties").headOption getOrElse sys.error(
2525
"No managed boot.properties file."
2626
)
@@ -54,9 +54,9 @@ object Transform {
5454
inputSourceDirectory := sourceDirectory.value / "input_sources",
5555
inputSourceDirectories := Seq(inputSourceDirectory.value),
5656
inputSources := (inputSourceDirectories.value ** (-DirectoryFilter)).get,
57-
fileMappings in transformSources := transformSourceMappings.value,
57+
transformSources / fileMappings := transformSourceMappings.value,
5858
transformSources := {
59-
(fileMappings in transformSources).value.map {
59+
(transformSources / fileMappings).value.map {
6060
case (in, out) => transform(in, out, sourceProperties.value)
6161
}
6262
},
@@ -83,9 +83,9 @@ object Transform {
8383
inputResourceDirectory := sourceDirectory.value / "input_resources",
8484
inputResourceDirectories := Seq(inputResourceDirectory.value),
8585
inputResources := (inputResourceDirectories.value ** (-DirectoryFilter)).get,
86-
fileMappings in transformResources := transformResourceMappings.value,
86+
transformResources / fileMappings := transformResourceMappings.value,
8787
transformResources := {
88-
(fileMappings in transformResources).value.map {
88+
(transformResources / fileMappings).value.map {
8989
case (in, out) => transform(in, out, resourceProperties.value)
9090
}
9191
},

project/Util.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ object Licensed {
9191

9292
def settings: Seq[Setting[_]] = Seq(
9393
notice := baseDirectory.value / "NOTICE",
94-
unmanagedResources in Compile ++= (notice.value +: extractLicenses.value),
94+
Compile / unmanagedResources ++= (notice.value +: extractLicenses.value),
9595
extractLicenses := extractLicenses0(
96-
(baseDirectory in ThisBuild).value,
96+
(ThisBuild / baseDirectory).value,
9797
notice.value,
9898
streams.value
9999
)

0 commit comments

Comments
 (0)