@@ -149,7 +149,6 @@ lazy val binaryCompat = project
149
149
scalaVersion := scala212,
150
150
libraryDependencies += " com.typesafe" %% " mima-core" % " 0.8.0" % Test ,
151
151
junit,
152
- versionPolicyIntention := Compatibility .None ,
153
152
buildInfoPackage := " build" ,
154
153
buildInfoKeys := Seq [BuildInfoKey ](
155
154
" oldClasses" -> (binaryCompatOld / Compile / classDirectory).value.toString,
@@ -171,9 +170,8 @@ lazy val scalafixRules = project
171
170
.settings(commonSettings)
172
171
.settings(
173
172
scalaModuleAutomaticModuleName := None ,
174
- organization := (compat212JVM / organization).value,
175
- publishTo := (compat212JVM / publishTo).value,
176
173
versionPolicyIntention := Compatibility .None ,
174
+ versionCheck := {}, // I don't understand why this fails otherwise?! oh well
177
175
name := " scala-collection-migrations" ,
178
176
scalaVersion := scalafixScala212,
179
177
libraryDependencies += " ch.epfl.scala" %% " scalafix-core" % scalafixVersion
@@ -292,7 +290,6 @@ lazy val scalafixTests = project
292
290
.enablePlugins(BuildInfoPlugin , ScalafixTestkitPlugin )
293
291
294
292
val ciScalaVersion = sys.env.get(" CI_SCALA_VERSION" ).flatMap(Version .parse)
295
- val isTravisTag = sys.env.get(" CI_TAG" ).exists(_.nonEmpty)
296
293
val isScalaJs = sys.env.get(" CI_PLATFORM" ) == Some (" js" )
297
294
val isScalaNative = sys.env.get(" CI_PLATFORM" ) == Some (" native" )
298
295
val isScalafix = sys.env.get(" CI_MODE" ) == Some (" testScalafix" )
@@ -322,7 +319,6 @@ inThisBuild {
322
319
else {
323
320
List (
324
321
" CI_SCALA_VERSION" ,
325
- " CI_TAG" ,
326
322
" CI_PLATFORM" ,
327
323
" CI_MODE" ,
328
324
" CI_JDK" ,
@@ -352,31 +348,11 @@ inThisBuild {
352
348
compatProject
353
349
}
354
350
355
- val publishTask =
356
- if (isTravisTag && ! isBinaryCompat && jdkVersion == Some (8 )) {
357
- // we cannot run "ci-release" because that reads the `CI_RELEASE` / `CI_SONATYPE_RELEASE`
358
- // env vars, which we cannot modify from java (easily). so we inline what this command does.
359
- CiReleasePlugin .setupGpg()
360
- List (
361
- // same fix as https://github.com/olafurpg/sbt-ci-release/pull/66
362
- // need to replicate it here since we're not using the `ci-release` command
363
- " set pgpSecretRing := pgpSecretRing.value" ,
364
- " set pgpPublicRing := pgpPublicRing.value" ,
365
- s " $projectPrefix/publishSigned " ,
366
- " sonatypePrepare" ,
367
- " sonatypeBundleUpload" ,
368
- " sonatypeClose"
369
- )
370
- } else {
371
- Nil
372
- }
373
-
374
351
Seq (
375
352
List (s """ ++ ${sys.env.get(" CI_SCALA_VERSION" ).get}! """ ),
376
353
List (s " $projectPrefix/clean " ),
377
354
List (s " $testProjectPrefix/test " ),
378
355
List (s " $projectPrefix/publishLocal " ),
379
- publishTask
380
356
).flatten
381
357
}
382
358
0 commit comments