Skip to content

Replace org name to mitigate chance of clash between our fork and maven version #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Replace org name to mitigate chance of clash between our fork and maven version #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Installation
**Step 1: create `project/protoc.sbt` with:**

```scala
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")
addSbtPlugin("com.whisk" % "sbt-protoc" % "1.0.7")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.10"
```
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pluginCrossBuild / sbtVersion := "1.2.8"

inThisBuild(
List(
organization := "com.thesamet",
organization := "com.whisk",
homepage := Some(url("https://github.com/thesamet/sbt-protoc")),
licenses := List(
"Apache-2.0" ->
Expand Down
2 changes: 1 addition & 1 deletion examples/google-apis-external-jar/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.27")
addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.27")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.4"
2 changes: 1 addition & 1 deletion examples/grpc-java/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.25")
2 changes: 1 addition & 1 deletion examples/java-only/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.25")
2 changes: 1 addition & 1 deletion examples/multi-with-external-jar/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.30")
addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.30")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.2"
2 changes: 1 addition & 1 deletion examples/scalajs-multiproject/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
addSbtPlugin("com.whisk" % "sbt-protoc" % "1.0.6")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.10"

Expand Down
2 changes: 1 addition & 1 deletion examples/scalapb-crossproject/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15")

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")

addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
addSbtPlugin("com.whisk" % "sbt-protoc" % "1.0.6")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.13"
2 changes: 1 addition & 1 deletion examples/scalapb-dotty/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.0-RC4")
addSbtPlugin("com.whisk" % "sbt-protoc" % "1.0.0-RC4")

addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")

Expand Down
2 changes: 1 addition & 1 deletion examples/scalapb-java-conversions/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.15")
addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.15")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.0"
2 changes: 1 addition & 1 deletion examples/scalapb/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.25")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.0"
2 changes: 1 addition & 1 deletion src/sbt-test/compat/scalapb-0.10.3/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/compat/scalapb-0.10.6/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/compat/scalapb-0.9/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/delete/clear-dir/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/delete/single-file/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/integration/common-protos/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/settings/caching/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.9"
2 changes: 1 addition & 1 deletion src/sbt-test/settings/cross-platform/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/settings/depends-on/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/disable/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/include-protos-in-jar/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/itconfig/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/lazy-protoc-resolution/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/native/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/non-jvm/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/protobuf-src/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/settings/sandboxed/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}

libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/settings/testconfig/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
)
else addSbtPlugin("com.thesamet" % "sbt-protoc" % pluginVersion)
else addSbtPlugin("com.whisk" % "sbt-protoc" % pluginVersion)
}
Loading