Skip to content

Commit 1646145

Browse files
Merge pull request #107 from typelevel/migrate-to-scalac-options
Migrate to scalac-options library
2 parents cec7d97 + 784c515 commit 1646145

File tree

17 files changed

+85
-1167
lines changed

17 files changed

+85
-1167
lines changed

build.sbt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import com.typesafe.tools.mima.core._
22

3-
ThisBuild / organization := "io.github.davidgregory084"
4-
ThisBuild / organizationName := "David Gregory"
3+
ThisBuild / organization := "org.typelevel"
4+
ThisBuild / organizationName := "Typelevel"
55

66
ThisBuild / startYear := Some(2022)
77
ThisBuild / licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
@@ -57,12 +57,12 @@ lazy val `sbt-tpolecat-plugin` = project
5757
Test / headerCreate := { (Test / headerCreate).triggeredBy(Test / compile).value },
5858
scalacOptions += "-Xlint:unused",
5959
libraryDependencies ++= Seq(
60+
"org.typelevel" %% "scalac-options" % "0.1.3",
6061
"org.scalatest" %% "scalatest" % "3.2.16" % Test,
6162
"org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
6263
"org.scalatestplus" %% "scalacheck-1-16" % "3.2.14.0" % Test
6364
),
6465
mimaPreviousArtifacts := Set(
65-
projectID.value.withRevision("0.4.0").withExplicitArtifacts(Vector.empty)
6666
),
6767
mimaBinaryIssueFilters ++= Seq(
6868
),
@@ -81,11 +81,8 @@ lazy val `sbt-tpolecat-scalafix` = scalafixProject("sbt-tpolecat")
8181
.rulesConfigure(project =>
8282
project.settings(
8383
mimaPreviousArtifacts := Set(
84-
(project / projectID).value.withRevision("0.4.1").withExplicitArtifacts(Vector.empty)
8584
)
8685
)
8786
)
88-
.inputSettings(
89-
libraryDependencies += (`sbt-tpolecat-plugin` / projectID).value.withRevision("0.4.0")
90-
)
87+
.inputSettings(addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.0"))
9188
.outputConfigure(_.dependsOn(`sbt-tpolecat-plugin`))

plugin/src/main/scala/io/github/davidgregory084/JavaMajorVersion.scala

Lines changed: 0 additions & 25 deletions
This file was deleted.

plugin/src/main/scala/io/github/davidgregory084/OptionsMode.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 David Gregory
2+
* Copyright 2022 Typelevel
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.github.davidgregory084
17+
package org.typelevel.sbt.tpolecat
1818

1919
sealed abstract class OptionsMode extends Product with Serializable
2020

plugin/src/main/scala/io/github/davidgregory084/ScalaVersion.scala

Lines changed: 0 additions & 47 deletions
This file was deleted.

plugin/src/main/scala/io/github/davidgregory084/ScalacOption.scala

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)