From 0a8b275badde9b57fa18f1b55b478719085ec156 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 May 2024 12:43:20 -0700 Subject: [PATCH] this repo is under lightbend-labs org now --- README.md | 2 +- RELEASING.md | 14 +++++++------- build.sbt | 4 ++-- .../typesafe/tools/mima/core/Problems.scala | 2 +- .../src/it/scala/IntegrationTestSuite.scala | 2 +- .../problems.txt | 4 ++-- .../problems-3.txt | 2 +- .../problems.txt | 2 +- .../class-method-generics-nok/problems.txt | 18 +++++++++--------- .../v1/A.scala | 2 +- .../problems.txt | 2 +- .../problems.txt | 2 +- .../sbt-mima-plugin/pom-only-project/build.sbt | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index eddfdd49..83735811 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ full signature including generic parameters. This can catch real incompatibilities, but also sometimes triggers for a change in generics that would not in fact cause problems at run time. Notably, it will warn when updating your project to scala 2.12.9+ or 2.13.1+, -see [this issue](https://github.com/lightbend/mima/issues/423) for details. +see [this issue](https://github.com/lightbend-labs/mima/issues/423) for details. You can opt-in to this check by setting: diff --git a/RELEASING.md b/RELEASING.md index 7c71a3f2..568e4827 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -29,17 +29,17 @@ See the [prerequisites](#prerequisites) if this is your first release. * [ ] [Find and merge][prs/list] your update PR. * [ ] [Find and hit "Publish Release"][releases/list] on the draft GitHub release. -[compare/view]: https://github.com/lightbend/mima/compare/1.1.2...main -[issues/new]: https://github.com/lightbend/mima/issues/new -[prs/list]: https://github.com/lightbend/mima/pulls -[releases/list]: https://github.com/lightbend/mima/releases -[releases/new]: https://github.com/lightbend/mima/releases/new +[compare/view]: https://github.com/lightbend-labs/mima/compare/1.1.2...main +[issues/new]: https://github.com/lightbend-labs/mima/issues/new +[prs/list]: https://github.com/lightbend-labs/mima/pulls +[releases/list]: https://github.com/lightbend-labs/mima/releases +[releases/new]: https://github.com/lightbend-labs/mima/releases/new -[RELEASING.md]: https://raw.githubusercontent.com/lightbend/mima/main/RELEASING.md +[RELEASING.md]: https://raw.githubusercontent.com/lightbend-labs/mima/main/RELEASING.md [repo1/list]: https://repo1.maven.org/maven2/com/typesafe/mima-core_2.12/1.1.2/ [sonatype/guide]: https://central.sonatype.org/pages/releasing-the-deployment.html [sonatype/staging-repos]: https://oss.sonatype.org/#stagingRepositories -[ci]: https://github.com/lightbend/mima/actions/workflows/ci.yml +[ci]: https://github.com/lightbend-labs/mima/actions/workflows/ci.yml You are done! diff --git a/build.sbt b/build.sbt index 1a57059e..bd8ec301 100644 --- a/build.sbt +++ b/build.sbt @@ -3,13 +3,13 @@ import mimabuild._ inThisBuild(Seq( organization := "com.typesafe", licenses := Seq("Apache License v2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), - homepage := Some(url("http://github.com/lightbend/mima")), + homepage := Some(url("http://github.com/lightbend-labs/mima")), developers := List( Developer("mdotta", "Mirco Dotta", "@dotta", url("https://github.com/dotta")), Developer("jsuereth", "Josh Suereth", "@jsuereth", url("https://github.com/jsuereth")), Developer("dwijnand", "Dale Wijnand", "@dwijnand", url("https://github.com/dwijnand")), ), - scmInfo := Some(ScmInfo(url("https://github.com/lightbend/mima"), "scm:git:git@github.com:lightbend/mima.git")), + scmInfo := Some(ScmInfo(url("https://github.com/lightbend-labs/mima"), "scm:git:git@github.com:lightbend-labs/mima.git")), dynverVTagPrefix := false, versionScheme := Some("early-semver"), scalaVersion := scala212, diff --git a/core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala b/core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala index 804a2cd7..995ea230 100644 --- a/core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala +++ b/core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala @@ -41,7 +41,7 @@ sealed abstract class Problem extends ProblemRef { case ReversedMissingMethodProblem(ref) => s"${ref.memberString} is present only in $affectedVersion version" case FinalMethodProblem(ref) => s"${ref.methodString} is declared final in $affectedVersion version" case IncompatibleResultTypeProblem(ref, newmeth) => s"${ref.methodString} has a different result type in $affectedVersion version, where it is ${newmeth.tpe.resultType} rather than ${ref.tpe.resultType}" - case IncompatibleSignatureProblem(ref, newmeth) => s"${ref.methodString} has a different generic signature in $affectedVersion version, where it is ${newmeth.signature} rather than ${ref.signature}. See https://github.com/lightbend/mima#incompatiblesignatureproblem" + case IncompatibleSignatureProblem(ref, newmeth) => s"${ref.methodString} has a different generic signature in $affectedVersion version, where it is ${newmeth.signature} rather than ${ref.signature}. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem" case DirectAbstractMethodProblem(ref) => s"${ref.methodString} does not have a correspondent in $affectedVersion version" case ReversedAbstractMethodProblem(ref) => s"in $affectedVersion version there is ${ref.methodString}, which does not have a correspondent" case UpdateForwarderBodyProblem(ref) => s"in $affectedVersion version, classes mixing ${ref.owner.fullName} needs to update body of ${ref.shortMethodString}" diff --git a/functional-tests/src/it/scala/IntegrationTestSuite.scala b/functional-tests/src/it/scala/IntegrationTestSuite.scala index 5760876d..44de72a3 100644 --- a/functional-tests/src/it/scala/IntegrationTestSuite.scala +++ b/functional-tests/src/it/scala/IntegrationTestSuite.scala @@ -387,7 +387,7 @@ class IntegrationTestSuite extends munit.FunSuite { test("java-9-module-info") { // jaxb-api 2.3.0 introduced a module-info.class // which caused MiMa to blow up when parsing the class file - // https://github.com/lightbend/mima/issues/206 + // https://github.com/lightbend-labs/mima/issues/206 // this test checks it against 2.3.0-b170201.1204 (a beta release of 2.3.0?) // to assert MiMa doesn't blow up testIntegration("javax.xml.bind", "jaxb-api", "2.3.0", "2.3.0-b170201-1204")() diff --git a/functional-tests/src/test/class-constructor-generics-nok/problems.txt b/functional-tests/src/test/class-constructor-generics-nok/problems.txt index d353f46c..539ad551 100644 --- a/functional-tests/src/test/class-constructor-generics-nok/problems.txt +++ b/functional-tests/src/test/class-constructor-generics-nok/problems.txt @@ -1,3 +1,3 @@ -method source()scala.Tuple2 in class OptionPane has a different generic signature in new version, where it is ()Lscala/Tuple2;Ljava/lang/String;>; rather than ()Lscala/Tuple2;. See https://github.com/lightbend/mima#incompatiblesignatureproblem +method source()scala.Tuple2 in class OptionPane has a different generic signature in new version, where it is ()Lscala/Tuple2;Ljava/lang/String;>; rather than ()Lscala/Tuple2;. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem method show()java.lang.String in class OptionPane does not have a correspondent in new version -method this(scala.Tuple2)Unit in class OptionPane has a different generic signature in new version, where it is (Lscala/Tuple2;Ljava/lang/String;>;)V rather than (Lscala/Tuple2;)V. See https://github.com/lightbend/mima#incompatiblesignatureproblem +method this(scala.Tuple2)Unit in class OptionPane has a different generic signature in new version, where it is (Lscala/Tuple2;Ljava/lang/String;>;)V rather than (Lscala/Tuple2;)V. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem diff --git a/functional-tests/src/test/class-method-abstract-override-of-concrete-supertrait-method-nok/problems-3.txt b/functional-tests/src/test/class-method-abstract-override-of-concrete-supertrait-method-nok/problems-3.txt index be25cee7..53bb98af 100644 --- a/functional-tests/src/test/class-method-abstract-override-of-concrete-supertrait-method-nok/problems-3.txt +++ b/functional-tests/src/test/class-method-abstract-override-of-concrete-supertrait-method-nok/problems-3.txt @@ -3,4 +3,4 @@ in new version there is abstract method foo()Int in class B, which does not have # abstract method foo()Int in class B does not have a correspondent in new version # which is a `DirectAbstractMethodProblem`, rather than the above `ReversedAbstractMethodProblem` # not sure exactly what that means... ¯\_(ツ)_/¯ -# https://github.com/lightbend/mima/issues/590 +# https://github.com/lightbend-labs/mima/issues/590 diff --git a/functional-tests/src/test/class-method-del-override-from-Throwable-ok/problems.txt b/functional-tests/src/test/class-method-del-override-from-Throwable-ok/problems.txt index 83e6be1b..9950b37b 100644 --- a/functional-tests/src/test/class-method-del-override-from-Throwable-ok/problems.txt +++ b/functional-tests/src/test/class-method-del-override-from-Throwable-ok/problems.txt @@ -1,4 +1,4 @@ -# was: (https://github.com/lightbend/mima/issues/477) +# was: (https://github.com/lightbend-labs/mima/issues/477) # com.typesafe.tools.mima.lib.CollectProblemsTest$TestFailed: 'test-class-method-del-override-from-Throwable-ok' failed. # The following 1 problems were reported but not expected: # - method fillInStackTrace()java.lang.Throwable in class A does not have a correspondent in new version diff --git a/functional-tests/src/test/class-method-generics-nok/problems.txt b/functional-tests/src/test/class-method-generics-nok/problems.txt index ed9cc5be..cbe12e4b 100644 --- a/functional-tests/src/test/class-method-generics-nok/problems.txt +++ b/functional-tests/src/test/class-method-generics-nok/problems.txt @@ -1,11 +1,11 @@ -method backwardsCompatibleNarrowing()scala.Option in class A has a different generic signature in new version, where it is ()Lscala/Option; rather than ()Lscala/Option;. See https://github.com/lightbend/mima#incompatiblesignatureproblem +method backwardsCompatibleNarrowing()scala.Option in class A has a different generic signature in new version, where it is ()Lscala/Option; rather than ()Lscala/Option;. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem # -method cov1()java.lang.Object in class Api has a different generic signature in new version, where it is ()TT; rather than . See https://github.com/lightbend/mima#incompatiblesignatureproblem -method cov2()java.lang.Object in class Api has a different generic signature in new version, where it is rather than ()TT;. See https://github.com/lightbend/mima#incompatiblesignatureproblem -method con1(java.lang.Object)Unit in class Api has a different generic signature in new version, where it is (TT;)V rather than . See https://github.com/lightbend/mima#incompatiblesignatureproblem -method con2(java.lang.Object)Unit in class Api has a different generic signature in new version, where it is rather than (TT;)V. See https://github.com/lightbend/mima#incompatiblesignatureproblem +method cov1()java.lang.Object in class Api has a different generic signature in new version, where it is ()TT; rather than . See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem +method cov2()java.lang.Object in class Api has a different generic signature in new version, where it is rather than ()TT;. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem +method con1(java.lang.Object)Unit in class Api has a different generic signature in new version, where it is (TT;)V rather than . See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem +method con2(java.lang.Object)Unit in class Api has a different generic signature in new version, where it is rather than (TT;)V. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem # -abstract method cov1()java.lang.Object in class Abi has a different generic signature in new version, where it is ()TT; rather than . See https://github.com/lightbend/mima#incompatiblesignatureproblem -abstract method cov2()java.lang.Object in class Abi has a different generic signature in new version, where it is rather than ()TT;. See https://github.com/lightbend/mima#incompatiblesignatureproblem -abstract method con1(java.lang.Object)Unit in class Abi has a different generic signature in new version, where it is (TT;)V rather than . See https://github.com/lightbend/mima#incompatiblesignatureproblem -abstract method con2(java.lang.Object)Unit in class Abi has a different generic signature in new version, where it is rather than (TT;)V. See https://github.com/lightbend/mima#incompatiblesignatureproblem +abstract method cov1()java.lang.Object in class Abi has a different generic signature in new version, where it is ()TT; rather than . See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem +abstract method cov2()java.lang.Object in class Abi has a different generic signature in new version, where it is rather than ()TT;. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem +abstract method con1(java.lang.Object)Unit in class Abi has a different generic signature in new version, where it is (TT;)V rather than . See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem +abstract method con2(java.lang.Object)Unit in class Abi has a different generic signature in new version, where it is rather than (TT;)V. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem diff --git a/functional-tests/src/test/removing-method-with-special-characters-from-inner-class-nok/v1/A.scala b/functional-tests/src/test/removing-method-with-special-characters-from-inner-class-nok/v1/A.scala index 5b5562e2..760948fb 100644 --- a/functional-tests/src/test/removing-method-with-special-characters-from-inner-class-nok/v1/A.scala +++ b/functional-tests/src/test/removing-method-with-special-characters-from-inner-class-nok/v1/A.scala @@ -1,6 +1,6 @@ package foo -// See https://github.com/lightbend/mima/issues/158 +// See https://github.com/lightbend-labs/mima/issues/158 // `<` would be filtered out, therefore not reporting the missing method object A { abstract class < { diff --git a/functional-tests/src/test/tuple-parametric-type-change-nok/problems.txt b/functional-tests/src/test/tuple-parametric-type-change-nok/problems.txt index 3ff3fb18..a7afef9b 100644 --- a/functional-tests/src/test/tuple-parametric-type-change-nok/problems.txt +++ b/functional-tests/src/test/tuple-parametric-type-change-nok/problems.txt @@ -1 +1 @@ -method foo()scala.Tuple2 in class A has a different generic signature in new version, where it is ()Lscala/Tuple2; rather than ()Lscala/Tuple2;. See https://github.com/lightbend/mima#incompatiblesignatureproblem +method foo()scala.Tuple2 in class A has a different generic signature in new version, where it is ()Lscala/Tuple2; rather than ()Lscala/Tuple2;. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem diff --git a/functional-tests/src/test/value-class-generic-replacement-nok/problems.txt b/functional-tests/src/test/value-class-generic-replacement-nok/problems.txt index 5f0e427b..d4256c00 100644 --- a/functional-tests/src/test/value-class-generic-replacement-nok/problems.txt +++ b/functional-tests/src/test/value-class-generic-replacement-nok/problems.txt @@ -1 +1 @@ -method boxedStringy()scala.Option in class Bar has a different generic signature in new version, where it is ()Lscala/Option; rather than ()Lscala/Option;. See https://github.com/lightbend/mima#incompatiblesignatureproblem +method boxedStringy()scala.Option in class Bar has a different generic signature in new version, where it is ()Lscala/Option; rather than ()Lscala/Option;. See https://github.com/lightbend-labs/mima#incompatiblesignatureproblem diff --git a/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt b/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt index 7f916f4d..a782bff3 100644 --- a/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt +++ b/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt @@ -5,5 +5,5 @@ mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "1.0.0") scalaVersion := "2.13.14" // this is an arbitrary dependency, but one that's known to cause issues in POM-only projects -// see https://github.com/lightbend/mima/issues/768 for more context +// see https://github.com/lightbend-labs/mima/issues/768 for more context libraryDependencies += "com.twitter" %% "util-core" % "22.7.0"