Skip to content

Commit fe263a7

Browse files
committed
update sbt v2
1 parent a2fe216 commit fe263a7

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ lazy val `sbt-avro`: Project = project
115115
(pluginCrossBuild / sbtVersion) := {
116116
scalaBinaryVersion.value match {
117117
case "2.12" => "1.5.0"
118-
case _ => "2.0.0-M3"
118+
case _ => "2.0.0"
119119
}
120120
},
121121
scriptedSbt := {
122122
scalaBinaryVersion.value match {
123123
case "2.12" => "1.10.7"
124-
case _ => "2.0.0-M3"
124+
case _ => "2.0.7"
125125
}
126126
},
127127
buildInfoKeys := Seq[BuildInfoKey](name, version),

plugin/src/main/scala/com/github/sbt/avro/SbtAvro.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ object SbtAvro extends AutoPlugin {
6262
avroStringType := "CharSequence",
6363

6464
// addArtifact doesn't take publishArtifact setting in account
65-
artifacts ++= Classpaths.artifactDefs(avroArtifactTasks).value,
66-
packagedArtifacts ++= Classpaths.packaged(avroArtifactTasks).value,
65+
artifacts ++= Def.uncached(Classpaths.artifactDefs(avroArtifactTasks).value),
66+
packagedArtifacts ++= Def.uncached(Classpaths.packaged(avroArtifactTasks).value),
6767
// use a custom folders to avoid potential conflict with other generators
6868
avroProjectIncludeFilter := inDependencies(ThisProject),
6969
avroUnpackDependencies / target := sourceManaged.value / "avro",
@@ -96,16 +96,18 @@ object SbtAvro extends AutoPlugin {
9696
avroUnpackDependencies / includeFilter := AllPassFilter,
9797
avroUnpackDependencies / excludeFilter := HiddenFileFilter,
9898
avroUnpackDependencies / target := configSrcSub(avroUnpackDependencies / target).value,
99-
avroUnpackDependencies := unpackDependenciesTask(avroUnpackDependencies).value,
99+
avroUnpackDependencies := Def.uncached(unpackDependenciesTask(avroUnpackDependencies).value),
100100
// source generation
101101
avroGenerate / target := configSrcSub(avroGenerate / target).value,
102102
managedSourceDirectories += (avroGenerate / target).value,
103-
avroGenerate := sourceGeneratorTask(avroGenerate)
103+
avroGenerate := Def.uncached(
104+
sourceGeneratorTask(avroGenerate)
104105
.dependsOn(avroUnpackDependencies)
105106
.dependsOn(avroUnpackDependencies.?.all(filterDependsOn))
106-
.value,
107+
.value
108+
),
107109
sourceGenerators += avroGenerate.taskValue,
108-
compile := compile.dependsOn(avroGenerate).value,
110+
compile := compile.dependsOn(Def.uncached(avroGenerate)).value,
109111
// packaging
110112
packageAvro / artifactClassifier := Some(AvroClassifier),
111113
packageAvro / publishArtifact := false
@@ -148,7 +150,7 @@ object SbtAvro extends AutoPlugin {
148150
): Seq[File] = {
149151
def cachedExtractDep(jar: File): Seq[File] = {
150152
val cached = FileFunction.cached(
151-
cacheBaseDirectory / jar.name,
153+
cacheBaseDirectory / jar.getName,
152154
inStyle = FilesInfo.lastModified,
153155
outStyle = FilesInfo.exists
154156
) { deps =>

0 commit comments

Comments
 (0)