@@ -149,7 +149,6 @@ lazy val binaryCompat = project
149149 scalaVersion := scala212,
150150 libraryDependencies += " com.typesafe" %% " mima-core" % " 0.8.0" % Test ,
151151 junit,
152- versionPolicyIntention := Compatibility .None ,
153152 buildInfoPackage := " build" ,
154153 buildInfoKeys := Seq [BuildInfoKey ](
155154 " oldClasses" -> (binaryCompatOld / Compile / classDirectory).value.toString,
@@ -171,9 +170,8 @@ lazy val scalafixRules = project
171170 .settings(commonSettings)
172171 .settings(
173172 scalaModuleAutomaticModuleName := None ,
174- organization := (compat212JVM / organization).value,
175- publishTo := (compat212JVM / publishTo).value,
176173 versionPolicyIntention := Compatibility .None ,
174+ versionCheck := {}, // I don't understand why this fails otherwise?! oh well
177175 name := " scala-collection-migrations" ,
178176 scalaVersion := scalafixScala212,
179177 libraryDependencies += " ch.epfl.scala" %% " scalafix-core" % scalafixVersion
@@ -292,7 +290,6 @@ lazy val scalafixTests = project
292290 .enablePlugins(BuildInfoPlugin , ScalafixTestkitPlugin )
293291
294292val ciScalaVersion = sys.env.get(" CI_SCALA_VERSION" ).flatMap(Version .parse)
295- val isTravisTag = sys.env.get(" CI_TAG" ).exists(_.nonEmpty)
296293val isScalaJs = sys.env.get(" CI_PLATFORM" ) == Some (" js" )
297294val isScalaNative = sys.env.get(" CI_PLATFORM" ) == Some (" native" )
298295val isScalafix = sys.env.get(" CI_MODE" ) == Some (" testScalafix" )
@@ -322,7 +319,6 @@ inThisBuild {
322319 else {
323320 List (
324321 " CI_SCALA_VERSION" ,
325- " CI_TAG" ,
326322 " CI_PLATFORM" ,
327323 " CI_MODE" ,
328324 " CI_JDK" ,
@@ -352,31 +348,11 @@ inThisBuild {
352348 compatProject
353349 }
354350
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-
374351 Seq (
375352 List (s """ ++ ${sys.env.get(" CI_SCALA_VERSION" ).get}! """ ),
376353 List (s " $projectPrefix/clean " ),
377354 List (s " $testProjectPrefix/test " ),
378355 List (s " $projectPrefix/publishLocal " ),
379- publishTask
380356 ).flatten
381357 }
382358
0 commit comments