@@ -82,24 +82,31 @@ val scalaOpts = scalacOptions ++= ((isSnapshot.value, scalaVersion.value) match
82
82
" -Wvalue-discard" ,
83
83
" -Wunused:_" ,
84
84
)
85
+ case (_, ScalaVersions .scala_3) => Seq (
86
+ " -no-indent" ,
87
+ " -explain" ,
88
+ )
85
89
case (_, _) => Seq .empty
86
90
})
87
91
88
92
lazy val sbtmeta = (project in file(" sbtmeta" ))
89
93
.settings(
90
- crossScalaVersions := Seq (ScalaVersions .scala_213, ScalaVersions .scala_212),
94
+ crossScalaVersions := Seq (ScalaVersions .scala_3, ScalaVersions . scala_213, ScalaVersions .scala_212),
91
95
scalaVersion := crossScalaVersions.value.head,
92
- libraryDependencies += " org.scala-lang" % " scala-reflect" % scalaVersion.value % Provided ,
96
+ libraryDependencies ++= {
97
+ if (scalaVersion.value.startsWith(" 2" ))
98
+ Seq (" org.scala-lang" % " scala-reflect" % scalaVersion.value % Provided )
99
+ else Seq .empty
100
+ },
93
101
scalaOpts,
94
102
)
95
103
96
104
lazy val sbtgen = (project in file(" sbtgen" ))
97
105
.dependsOn(sbtmeta)
98
106
.settings(
99
- crossScalaVersions := Seq (ScalaVersions .scala_213, ScalaVersions .scala_212),
107
+ crossScalaVersions := Seq (ScalaVersions .scala_3, ScalaVersions . scala_213, ScalaVersions .scala_212),
100
108
scalaVersion := crossScalaVersions.value.head,
101
- // libraryDependencies += "com.github.scopt" %% "scopt" % "4.0.0-RC2",
102
- libraryDependencies += " com.github.scopt" %% " scopt" % " 3.7.1" ,
109
+ libraryDependencies += " com.github.scopt" %% " scopt" % " 4.1.0" ,
103
110
libraryDependencies += " org.scala-lang.modules" %% " scala-collection-compat" % " 2.11.0" ,
104
111
(ThisBuild / libraryDependencies) += " org.scalatest" %% " scalatest" % " 3.2.18" % Test ,
105
112
scalacOptions ++= Seq (
@@ -216,7 +223,7 @@ lazy val `izumi-sbtgen` = (project in file("."))
216
223
action = { st : State =>
217
224
val extracted = Project .extract(st)
218
225
val ref = extracted.get(`sbt-tests` / thisProjectRef)
219
- extracted.runInputTask(( ref / (Global / scripted) ), " " , st)._1
226
+ extracted.runInputTask(ref / (Global / scripted), " " , st)._1
220
227
}
221
228
),
222
229
setReleaseVersion, // : ReleaseStep
0 commit comments