From 429267997aca2f3f15bfaa18fc16a5b3046a51f0 Mon Sep 17 00:00:00 2001 From: Aleksandr Mikhailov Date: Thu, 14 Nov 2024 15:23:56 +0200 Subject: [PATCH] Replace org name to mitigate chance of clash between our fork and maven version (#3) --- README.md | 2 +- build.sbt | 2 +- examples/google-apis-external-jar/project/plugins.sbt | 2 +- examples/grpc-java/project/plugins.sbt | 2 +- examples/java-only/project/plugins.sbt | 2 +- examples/multi-with-external-jar/project/plugins.sbt | 2 +- examples/scalajs-multiproject/project/plugins.sbt | 2 +- examples/scalapb-crossproject/project/plugins.sbt | 2 +- examples/scalapb-dotty/project/plugins.sbt | 2 +- examples/scalapb-java-conversions/project/plugins.sbt | 2 +- examples/scalapb/project/plugins.sbt | 2 +- src/sbt-test/compat/scalapb-0.10.3/project/plugins.sbt | 2 +- src/sbt-test/compat/scalapb-0.10.6/project/plugins.sbt | 2 +- src/sbt-test/compat/scalapb-0.9/project/plugins.sbt | 2 +- src/sbt-test/delete/clear-dir/project/plugins.sbt | 2 +- src/sbt-test/delete/single-file/project/plugins.sbt | 2 +- src/sbt-test/integration/common-protos/project/plugins.sbt | 2 +- src/sbt-test/settings/caching/project/plugins.sbt | 2 +- src/sbt-test/settings/cross-platform/project/plugins.sbt | 2 +- src/sbt-test/settings/depends-on/project/plugins.sbt | 2 +- src/sbt-test/settings/disable/project/plugins.sbt | 2 +- src/sbt-test/settings/include-protos-in-jar/project/plugins.sbt | 2 +- src/sbt-test/settings/itconfig/project/plugins.sbt | 2 +- .../settings/lazy-protoc-resolution/project/plugins.sbt | 2 +- src/sbt-test/settings/native/project/plugins.sbt | 2 +- src/sbt-test/settings/non-jvm/project/plugins.sbt | 2 +- src/sbt-test/settings/protobuf-src/project/plugins.sbt | 2 +- src/sbt-test/settings/sandboxed/project/plugins.sbt | 2 +- src/sbt-test/settings/testconfig/project/plugins.sbt | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 213e1219..d36d7315 100644 --- a/README.md +++ b/README.md @@ -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" ``` diff --git a/build.sbt b/build.sbt index 349a9e2e..6cd85c32 100644 --- a/build.sbt +++ b/build.sbt @@ -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" -> diff --git a/examples/google-apis-external-jar/project/plugins.sbt b/examples/google-apis-external-jar/project/plugins.sbt index 4ac26130..b1209222 100644 --- a/examples/google-apis-external-jar/project/plugins.sbt +++ b/examples/google-apis-external-jar/project/plugins.sbt @@ -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" diff --git a/examples/grpc-java/project/plugins.sbt b/examples/grpc-java/project/plugins.sbt index 24335e9c..b1ce31f6 100644 --- a/examples/grpc-java/project/plugins.sbt +++ b/examples/grpc-java/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25") +addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.25") diff --git a/examples/java-only/project/plugins.sbt b/examples/java-only/project/plugins.sbt index 24335e9c..b1ce31f6 100644 --- a/examples/java-only/project/plugins.sbt +++ b/examples/java-only/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25") +addSbtPlugin("com.whisk" % "sbt-protoc" % "0.99.25") diff --git a/examples/multi-with-external-jar/project/plugins.sbt b/examples/multi-with-external-jar/project/plugins.sbt index e629743a..cb4b39a4 100644 --- a/examples/multi-with-external-jar/project/plugins.sbt +++ b/examples/multi-with-external-jar/project/plugins.sbt @@ -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" diff --git a/examples/scalajs-multiproject/project/plugins.sbt b/examples/scalajs-multiproject/project/plugins.sbt index 25b3ff45..8f512ccd 100644 --- a/examples/scalajs-multiproject/project/plugins.sbt +++ b/examples/scalajs-multiproject/project/plugins.sbt @@ -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" diff --git a/examples/scalapb-crossproject/project/plugins.sbt b/examples/scalapb-crossproject/project/plugins.sbt index 9c89950f..342647f7 100644 --- a/examples/scalapb-crossproject/project/plugins.sbt +++ b/examples/scalapb-crossproject/project/plugins.sbt @@ -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" diff --git a/examples/scalapb-dotty/project/plugins.sbt b/examples/scalapb-dotty/project/plugins.sbt index 6afc5f57..0a97648a 100644 --- a/examples/scalapb-dotty/project/plugins.sbt +++ b/examples/scalapb-dotty/project/plugins.sbt @@ -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") diff --git a/examples/scalapb-java-conversions/project/plugins.sbt b/examples/scalapb-java-conversions/project/plugins.sbt index 69f05b61..c0e6fd1a 100644 --- a/examples/scalapb-java-conversions/project/plugins.sbt +++ b/examples/scalapb-java-conversions/project/plugins.sbt @@ -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" diff --git a/examples/scalapb/project/plugins.sbt b/examples/scalapb/project/plugins.sbt index 3a86b8ba..fb72ef4b 100644 --- a/examples/scalapb/project/plugins.sbt +++ b/examples/scalapb/project/plugins.sbt @@ -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" diff --git a/src/sbt-test/compat/scalapb-0.10.3/project/plugins.sbt b/src/sbt-test/compat/scalapb-0.10.3/project/plugins.sbt index 017ae960..50296aea 100644 --- a/src/sbt-test/compat/scalapb-0.10.3/project/plugins.sbt +++ b/src/sbt-test/compat/scalapb-0.10.3/project/plugins.sbt @@ -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( diff --git a/src/sbt-test/compat/scalapb-0.10.6/project/plugins.sbt b/src/sbt-test/compat/scalapb-0.10.6/project/plugins.sbt index 6626c913..b4b6c19f 100644 --- a/src/sbt-test/compat/scalapb-0.10.6/project/plugins.sbt +++ b/src/sbt-test/compat/scalapb-0.10.6/project/plugins.sbt @@ -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( diff --git a/src/sbt-test/compat/scalapb-0.9/project/plugins.sbt b/src/sbt-test/compat/scalapb-0.9/project/plugins.sbt index 9e898fba..03ce624e 100644 --- a/src/sbt-test/compat/scalapb-0.9/project/plugins.sbt +++ b/src/sbt-test/compat/scalapb-0.9/project/plugins.sbt @@ -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( diff --git a/src/sbt-test/delete/clear-dir/project/plugins.sbt b/src/sbt-test/delete/clear-dir/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/delete/clear-dir/project/plugins.sbt +++ b/src/sbt-test/delete/clear-dir/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/delete/single-file/project/plugins.sbt b/src/sbt-test/delete/single-file/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/delete/single-file/project/plugins.sbt +++ b/src/sbt-test/delete/single-file/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/integration/common-protos/project/plugins.sbt b/src/sbt-test/integration/common-protos/project/plugins.sbt index 5de50199..7e1ceef7 100644 --- a/src/sbt-test/integration/common-protos/project/plugins.sbt +++ b/src/sbt-test/integration/common-protos/project/plugins.sbt @@ -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( diff --git a/src/sbt-test/settings/caching/project/plugins.sbt b/src/sbt-test/settings/caching/project/plugins.sbt index 23f5c235..bc9bb1e2 100644 --- a/src/sbt-test/settings/caching/project/plugins.sbt +++ b/src/sbt-test/settings/caching/project/plugins.sbt @@ -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" diff --git a/src/sbt-test/settings/cross-platform/project/plugins.sbt b/src/sbt-test/settings/cross-platform/project/plugins.sbt index 9b57c262..ac523095 100644 --- a/src/sbt-test/settings/cross-platform/project/plugins.sbt +++ b/src/sbt-test/settings/cross-platform/project/plugins.sbt @@ -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") diff --git a/src/sbt-test/settings/depends-on/project/plugins.sbt b/src/sbt-test/settings/depends-on/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/depends-on/project/plugins.sbt +++ b/src/sbt-test/settings/depends-on/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/disable/project/plugins.sbt b/src/sbt-test/settings/disable/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/disable/project/plugins.sbt +++ b/src/sbt-test/settings/disable/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/include-protos-in-jar/project/plugins.sbt b/src/sbt-test/settings/include-protos-in-jar/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/include-protos-in-jar/project/plugins.sbt +++ b/src/sbt-test/settings/include-protos-in-jar/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/itconfig/project/plugins.sbt b/src/sbt-test/settings/itconfig/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/itconfig/project/plugins.sbt +++ b/src/sbt-test/settings/itconfig/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/lazy-protoc-resolution/project/plugins.sbt b/src/sbt-test/settings/lazy-protoc-resolution/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/lazy-protoc-resolution/project/plugins.sbt +++ b/src/sbt-test/settings/lazy-protoc-resolution/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/native/project/plugins.sbt b/src/sbt-test/settings/native/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/native/project/plugins.sbt +++ b/src/sbt-test/settings/native/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/non-jvm/project/plugins.sbt b/src/sbt-test/settings/non-jvm/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/non-jvm/project/plugins.sbt +++ b/src/sbt-test/settings/non-jvm/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/protobuf-src/project/plugins.sbt b/src/sbt-test/settings/protobuf-src/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/protobuf-src/project/plugins.sbt +++ b/src/sbt-test/settings/protobuf-src/project/plugins.sbt @@ -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) } diff --git a/src/sbt-test/settings/sandboxed/project/plugins.sbt b/src/sbt-test/settings/sandboxed/project/plugins.sbt index 3b763021..f6d4580a 100644 --- a/src/sbt-test/settings/sandboxed/project/plugins.sbt +++ b/src/sbt-test/settings/sandboxed/project/plugins.sbt @@ -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( diff --git a/src/sbt-test/settings/testconfig/project/plugins.sbt b/src/sbt-test/settings/testconfig/project/plugins.sbt index 2e6a423e..7b12566e 100644 --- a/src/sbt-test/settings/testconfig/project/plugins.sbt +++ b/src/sbt-test/settings/testconfig/project/plugins.sbt @@ -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) }