From 4367acdcfb36567aa7b9e5585a588872512b1660 Mon Sep 17 00:00:00 2001 From: friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:15:07 -0700 Subject: [PATCH 01/30] Add check contraband sources consistency job --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dff02a4de..96b99d952 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,8 @@ jobs: if: ${{ matrix.jobtype == 3 }} shell: bash run: | - sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck + sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck generateContrabands + git diff --exit-code - name: Benchmark (Scalac) (4) if: ${{ matrix.jobtype == 4 }} shell: bash From f6a433f8847cb2b4c682a2452a5c5fb72a003c4f Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:52:16 -0700 Subject: [PATCH 02/30] Bump sbt to 1.10.3 --- build.sbt | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 4f2dea499..5657218bd 100644 --- a/build.sbt +++ b/build.sbt @@ -46,7 +46,7 @@ ThisBuild / version := { nightlyVersion match { case Some(v) => v case _ => - if ((ThisBuild / isSnapshot).value) "1.10.0-SNAPSHOT" + if ((ThisBuild / isSnapshot).value) "1.10.4-SNAPSHOT" else old } } diff --git a/project/build.properties b/project/build.properties index 0b699c305..bc7390601 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.3 From 78af2d914ff1225b65f483ee2b1f65cb8a6a3ca8 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:56:06 -0700 Subject: [PATCH 03/30] Bump Scala 3 to 3.3.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 259959d15..791f7c141 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,7 +9,7 @@ object Dependencies { val scala211 = "2.11.12" val scala212 = "2.12.20" val scala213 = "2.13.15" - val scala3ForBridge = "3.3.1" + val scala3ForBridge = "3.3.4" val scala213ForBridge = "2.13.15" val defaultScalaVersion = scala212 val compilerBridgeVersions = Seq(scala212, scala210, scala211, scala213) From 5212aa32b859c551b3feffae43fbcc95c78004f8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Oct 2024 22:12:51 +0000 Subject: [PATCH 04/30] Update sbt-dynver to 5.1.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index fa32260e7..0417d849f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ scalacOptions += "-feature" -addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") +addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.6.0") From e66e59c58c405fae84fb1d2149188cff48eca949 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Oct 2024 22:13:00 +0000 Subject: [PATCH 05/30] Update sbt-protobuf to 0.8.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index fa32260e7..f1066aa75 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.6.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") From b106f64c0ee992e4837151e9e3ed775465d115c1 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Tue, 22 Oct 2024 15:43:39 -0700 Subject: [PATCH 06/30] Add missing copyright headers --- .github/workflows/ci.yml | 2 +- .../src/main/scala/scala/reflect/ReflectAccess.scala | 11 +++++++++++ .../compiler-bridge/src/main/scala/xsbt/trace.scala | 11 +++++++++++ .../sbt/internal/inc/consistent/Compat.scala | 11 +++++++++++ .../sbt/internal/inc/consistent/Compat.scala | 11 +++++++++++ .../inc/consistent/ConsistentAnalysisFormat.scala | 11 +++++++++++ .../inc/consistent/ConsistentFileAnalysisStore.scala | 11 +++++++++++ .../inc/consistent/ParallelGzipOutputStream.scala | 11 +++++++++++ .../sbt/internal/inc/consistent/Serializer.scala | 11 +++++++++++ 9 files changed, 89 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96b99d952..1a8e4788a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: if: ${{ matrix.jobtype == 3 }} shell: bash run: | - sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck generateContrabands + sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck headerCheck generateContrabands git diff --exit-code - name: Benchmark (Scalac) (4) if: ${{ matrix.jobtype == 4 }} diff --git a/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala b/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala index bdf8f342e..30de6319e 100644 --- a/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala +++ b/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.reflect import scala.tools.nsc.Global diff --git a/internal/compiler-bridge/src/main/scala/xsbt/trace.scala b/internal/compiler-bridge/src/main/scala/xsbt/trace.scala index c219b1a44..d71fe4b2f 100644 --- a/internal/compiler-bridge/src/main/scala/xsbt/trace.scala +++ b/internal/compiler-bridge/src/main/scala/xsbt/trace.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package xsbt object trace extends TraceSyntax { diff --git a/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala b/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala index 22a8fbf8e..7e3d6af4d 100644 --- a/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala +++ b/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.internal.inc.consistent import java.util.Arrays diff --git a/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala b/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala index 8fa921934..aea1a9950 100644 --- a/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala +++ b/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.internal.inc.consistent object Compat { diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala index 2a2cc46fc..78aea1106 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.internal.inc.consistent import java.nio.file.Paths diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala index 418eae932..2cec0baa3 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + // Based on zinc's FileAnalysisStore: package sbt.internal.inc.consistent diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala index 0419abf82..39be1419c 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + // Original code by Stefan Zeiger (see https://github.com/szeiger/zinc/blob/1d296b2fbeaae1cf14e4c00db0bbc2203f9783a4/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/NewParallelGzipOutputStream.scala) // Modified by Rex Kerr to use Java threads directly rather than Future package sbt.internal.inc.consistent diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala index 8f111a9b6..709d53380 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.internal.inc.consistent import java.io.{ From b46639b488043cf774ca238f7da24d2b3ef9a434 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:10:21 -0700 Subject: [PATCH 07/30] Add copyright headers for test scope --- .github/workflows/ci.yml | 2 +- .../sbt/internal/inc/ClassCanonicalNameSpec.scala | 4 ++-- .../sbt/internal/inc/ClassToAPISpecification.scala | 4 ++-- .../src/test/scala/xsbt/api/ClassLikeHelpers.scala | 4 ++-- .../test/scala/xsbt/api/HashAPISpecification.scala | 4 ++-- .../scala/xsbt/api/NameHashingSpecification.scala | 4 ++-- .../src/test/scala/xsbt/AnalysisFormatBenchmark.scala | 11 +++++++++++ .../src/test/scala/xsbt/BenchmarkBase.scala | 4 ++-- .../src/test/scala/xsbt/BenchmarkProjects.scala | 4 ++-- .../src/test/scala/xsbt/GlobalBenchmarkSetup.scala | 4 ++-- .../src/test/scala/xsbt/ScalacBenchmark.scala | 4 ++-- .../src/test/scala/xsbt/ShapelessBenchmark.scala | 4 ++-- .../src/test/scala/xsbt/ZincBenchmark.scala | 4 ++-- .../internal/inc/classfile/AnalyzeSpecification.scala | 4 ++-- .../inc/classfile/IndexBasedZipFsOpsSpec.scala | 11 +++++++++++ .../inc/classfile/JavaCompilerForUnitTesting.scala | 4 ++-- .../internal/inc/classfile/ParserSpecification.scala | 4 ++-- .../test/resources/sbt/internal/inc/javac/bad.java | 4 ++-- .../test/resources/sbt/internal/inc/javac/good.java | 4 ++-- .../sbt/internal/inc/javac/hasstaticfinal.java | 4 ++-- .../test/resources/sbt/internal/inc/javac/test1.java | 4 ++-- .../internal/inc/ClassFileManagerDefaultsSpec.scala | 4 ++-- .../scala/sbt/internal/inc/TestClassFileManager.scala | 4 ++-- .../scala/sbt/internal/inc/VirtualDirectoryTest.scala | 4 ++-- .../sbt/internal/inc/javac/CollectingLogger.scala | 4 ++-- .../sbt/internal/inc/javac/CollectingReporter.scala | 4 ++-- .../sbt/internal/inc/javac/JavaCompilerSpec.scala | 4 ++-- .../sbt/internal/inc/javac/JavaErrorParserSpec.scala | 4 ++-- .../inc/javac/JavaErrorPositionTranslator.scala | 4 ++-- .../internal/inc/javac/JavacProcessLoggerSpec.scala | 4 ++-- .../src/test/scala/sbt/internal/inc/HashSpec.scala | 4 ++-- .../scala/sbt/internal/inc/MiniSetupUtilSpec.scala | 4 ++-- .../test/scala/sbt/inc/AnalysisFormatHelpers.scala | 4 ++-- .../src/test/scala/sbt/inc/AnalysisGenerators.scala | 4 ++-- .../binary/BinaryAnalysisFormatSpecification.scala | 4 ++-- .../sbt/inc/binary/BinaryMappersSpecification.scala | 4 ++-- .../converter/InternalApiProxySpecification.scala | 4 ++-- .../ConsistentAnalysisFormatIntegrationSuite.scala | 11 +++++++++++ .../consistent/ConsistentAnalysisFormatSuite.scala | 11 +++++++++++ .../ParallelGzipOutputStreamSpecification.scala | 11 +++++++++++ .../test/scala/sbt/inc/text/Base64Specification.scala | 4 ++-- .../sbt/inc/text/TextAnalysisFormatHelpers.scala | 4 ++-- .../inc/text/TextAnalysisFormatSpecification.scala | 4 ++-- .../scala/sbt/inc/text/TextMappersSpecification.scala | 4 ++-- zinc-compile/src/test/scala/inc/DocSpec.scala | 4 ++-- zinc/src/test/resources/sbt/inc/Depender.scala | 4 ++-- zinc/src/test/resources/sbt/inc/Ext1.scala | 4 ++-- zinc/src/test/resources/sbt/inc/Ext2.scala | 4 ++-- zinc/src/test/resources/sources/Foo.scala | 4 ++-- zinc/src/test/resources/sources/Good.scala | 4 ++-- .../src/test/resources/sources/NestedJavaClasses.java | 4 ++-- zinc/src/test/resources/sources/NoopMacroUsed.scala | 4 ++-- zinc/src/test/resources/sources/a/A.scala | 4 ++-- zinc/src/test/resources/sources/a/AA.scala | 4 ++-- zinc/src/test/resources/sources/b/B.scala | 4 ++-- zinc/src/test/resources/sources/b/c/C.scala | 4 ++-- zinc/src/test/resources/sources/foo/NoopMacro.scala | 4 ++-- .../sources/naha/ClientWithImplicitNotUsed.scala | 4 ++-- .../sources/naha/ClientWithImplicitUsed.scala | 4 ++-- .../sources/naha/ClientWithoutAnythingUsed.scala | 4 ++-- .../sources/naha/ClientWithoutImplicit.scala | 4 ++-- .../test/resources/sources/naha/NormalDependecy.scala | 4 ++-- zinc/src/test/resources/sources/naha/Other.scala | 4 ++-- zinc/src/test/resources/sources/naha/Other2.scala | 4 ++-- zinc/src/test/resources/sources/naha/Other3.scala | 4 ++-- .../test/resources/sources/naha/WithImplicits.scala | 4 ++-- .../test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala | 4 ++-- zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala | 4 ++-- zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala | 4 ++-- .../test/scala/sbt/inc/ClassFileManagerHookSpec.scala | 4 ++-- .../test/scala/sbt/inc/ClasspathHashingHookSpec.scala | 4 ++-- .../test/scala/sbt/inc/ConstantBridgeProvider.scala | 4 ++-- .../test/scala/sbt/inc/IncrementalCompilerSpec.scala | 4 ++-- .../scala/sbt/inc/MultiProjectIncrementalSpec.scala | 4 ++-- .../test/scala/sbt/inc/NameHashingCompilerSpec.scala | 4 ++-- zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala | 4 ++-- zinc/src/test/scala/sbt/inc/OutputSpec.scala | 4 ++-- zinc/src/test/scala/sbt/inc/SourceFiles.scala | 4 ++-- zinc/src/test/scala/sbt/inc/TestProjectSetup.scala | 4 ++-- zinc/src/test/scala/sbt/inc/TestResource.scala | 4 ++-- .../test/scala/sbt/inc/cached/CachedHashingSpec.scala | 4 ++-- .../internal/inc/BridgeProviderSpecification.scala | 4 ++-- 82 files changed, 208 insertions(+), 153 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a8e4788a..34a2a9f92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: if: ${{ matrix.jobtype == 3 }} shell: bash run: | - sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck headerCheck generateContrabands + sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck headerCheck "Test/headerCheck" generateContrabands git diff --exit-code - name: Benchmark (Scalac) (4) if: ${{ matrix.jobtype == 4 }} diff --git a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala index a33250cca..fa155f689 100644 --- a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala +++ b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala index 5cacd1fde..73f91f779 100644 --- a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala +++ b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala b/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala index cfd3a2f58..38347bc6b 100644 --- a/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala +++ b/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala b/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala index 507d7e7a6..ed2cf24c5 100644 --- a/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala +++ b/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala b/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala index 9c010e2f0..754283908 100644 --- a/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala +++ b/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala index 2c219c79c..53f768423 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package xsbt import java.io.File diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala index 7acf62ea7..fda6b06f3 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala index 3ad7e0fa4..dd39f883b 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala index 59eecf109..e7dfd8401 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala index 0b85d31bb..4ffd685d9 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala index cd1028281..45e90fb06 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala index 72e6dfeb3..3d63d6047 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala index dd116930b..9386d8f78 100644 --- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala +++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala index 3402d1871..7080ba7e8 100644 --- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala +++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.internal.inc package classfile diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala index 591e239df..08ca81770 100644 --- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala +++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala index 430584670..9ac6dff08 100644 --- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala +++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java index 401fe111d..72b0ed06d 100644 --- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java +++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java index 8a1ca5236..e3b2107f5 100644 --- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java +++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java index 8b00b1eed..a8f480fdc 100644 --- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java +++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java index 9c31e8d21..ba68925f7 100644 --- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java +++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala index 610a9184f..afc40cdda 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala index 17eb20adc..fb4ecbc81 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala index 867bed431..fe3effa91 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala index 837e771e2..952c52eb8 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala index b71efa7bc..8d29b3c17 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala index b320c8a5d..63eefd4bd 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala index b092adfff..15c8bd23d 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala index f56d6aa8e..e7adbddfd 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala index e0ab4ab8f..6e8841663 100644 --- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala +++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala b/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala index 5b5920195..b5c371c01 100644 --- a/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala +++ b/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala b/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala index 7ae876500..f4368d779 100644 --- a/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala +++ b/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala index e4d1e23f9..fd9a37bcb 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala index 9ce08dfed..bcd6b8333 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala index 66aa67923..5b88ee2ce 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala index 1e63afb3f..b586e7651 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala index b7e776b49..161a734d3 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala index 4317db355..efb1e6159 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.inc.consistent import java.io.{ File, FileInputStream } diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala index 00a604cb0..be417c4fc 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.inc.consistent import org.scalatest.funsuite.AnyFunSuite diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala index b2bbe8913..5330115d0 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala @@ -1,3 +1,14 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package sbt.inc.consistent import org.scalatest.flatspec.AnyFlatSpec diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala index 9073b3159..2753b3e9a 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala index aedd0ab6f..220672a49 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala index 16d3d237e..4e3cea4c1 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala index d286b73f5..fea4f2b95 100644 --- a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala +++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc-compile/src/test/scala/inc/DocSpec.scala b/zinc-compile/src/test/scala/inc/DocSpec.scala index 16704e2f7..8d244e690 100644 --- a/zinc-compile/src/test/scala/inc/DocSpec.scala +++ b/zinc-compile/src/test/scala/inc/DocSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sbt/inc/Depender.scala b/zinc/src/test/resources/sbt/inc/Depender.scala index 814c2dcd2..6f0229005 100644 --- a/zinc/src/test/resources/sbt/inc/Depender.scala +++ b/zinc/src/test/resources/sbt/inc/Depender.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sbt/inc/Ext1.scala b/zinc/src/test/resources/sbt/inc/Ext1.scala index 7835ce493..cd61d8202 100644 --- a/zinc/src/test/resources/sbt/inc/Ext1.scala +++ b/zinc/src/test/resources/sbt/inc/Ext1.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sbt/inc/Ext2.scala b/zinc/src/test/resources/sbt/inc/Ext2.scala index 921443e80..f423ece5a 100644 --- a/zinc/src/test/resources/sbt/inc/Ext2.scala +++ b/zinc/src/test/resources/sbt/inc/Ext2.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/Foo.scala b/zinc/src/test/resources/sources/Foo.scala index 5b547c9af..7162c0dca 100644 --- a/zinc/src/test/resources/sources/Foo.scala +++ b/zinc/src/test/resources/sources/Foo.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/Good.scala b/zinc/src/test/resources/sources/Good.scala index 76cdc9667..d59346a26 100644 --- a/zinc/src/test/resources/sources/Good.scala +++ b/zinc/src/test/resources/sources/Good.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/NestedJavaClasses.java b/zinc/src/test/resources/sources/NestedJavaClasses.java index 13f58336c..f155f24da 100644 --- a/zinc/src/test/resources/sources/NestedJavaClasses.java +++ b/zinc/src/test/resources/sources/NestedJavaClasses.java @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/NoopMacroUsed.scala b/zinc/src/test/resources/sources/NoopMacroUsed.scala index 09f1fe3d0..900ae0137 100644 --- a/zinc/src/test/resources/sources/NoopMacroUsed.scala +++ b/zinc/src/test/resources/sources/NoopMacroUsed.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/a/A.scala b/zinc/src/test/resources/sources/a/A.scala index 5a8d6e9ce..23733eed1 100644 --- a/zinc/src/test/resources/sources/a/A.scala +++ b/zinc/src/test/resources/sources/a/A.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/a/AA.scala b/zinc/src/test/resources/sources/a/AA.scala index 4c04258cb..e2ad13f6f 100644 --- a/zinc/src/test/resources/sources/a/AA.scala +++ b/zinc/src/test/resources/sources/a/AA.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/b/B.scala b/zinc/src/test/resources/sources/b/B.scala index 20cfe2148..767a53daf 100644 --- a/zinc/src/test/resources/sources/b/B.scala +++ b/zinc/src/test/resources/sources/b/B.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/b/c/C.scala b/zinc/src/test/resources/sources/b/c/C.scala index 1832934d5..81e8837a4 100644 --- a/zinc/src/test/resources/sources/b/c/C.scala +++ b/zinc/src/test/resources/sources/b/c/C.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/foo/NoopMacro.scala b/zinc/src/test/resources/sources/foo/NoopMacro.scala index 3fd9e8f46..106bee2b4 100644 --- a/zinc/src/test/resources/sources/foo/NoopMacro.scala +++ b/zinc/src/test/resources/sources/foo/NoopMacro.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala index 75303301a..f3c66062a 100644 --- a/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala +++ b/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala index 2a6f4eaba..7030c523f 100644 --- a/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala +++ b/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala index 317d5c70b..d44f837e5 100644 --- a/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala +++ b/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala b/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala index 813a5be28..326dde8b4 100644 --- a/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala +++ b/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/NormalDependecy.scala b/zinc/src/test/resources/sources/naha/NormalDependecy.scala index ec596886d..f37f65a2f 100644 --- a/zinc/src/test/resources/sources/naha/NormalDependecy.scala +++ b/zinc/src/test/resources/sources/naha/NormalDependecy.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/Other.scala b/zinc/src/test/resources/sources/naha/Other.scala index de0e5cc49..bfc79b2ce 100644 --- a/zinc/src/test/resources/sources/naha/Other.scala +++ b/zinc/src/test/resources/sources/naha/Other.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/Other2.scala b/zinc/src/test/resources/sources/naha/Other2.scala index d09f2f656..7e8f82088 100644 --- a/zinc/src/test/resources/sources/naha/Other2.scala +++ b/zinc/src/test/resources/sources/naha/Other2.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/Other3.scala b/zinc/src/test/resources/sources/naha/Other3.scala index 3818ef95e..b4aabffa4 100644 --- a/zinc/src/test/resources/sources/naha/Other3.scala +++ b/zinc/src/test/resources/sources/naha/Other3.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/resources/sources/naha/WithImplicits.scala b/zinc/src/test/resources/sources/naha/WithImplicits.scala index 0b50c077c..df8ca9085 100644 --- a/zinc/src/test/resources/sources/naha/WithImplicits.scala +++ b/zinc/src/test/resources/sources/naha/WithImplicits.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala b/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala index 96079a979..96ce9d646 100644 --- a/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala +++ b/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala index 01619430f..759774010 100644 --- a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala +++ b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala b/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala index 4038d495b..1a79e1db5 100644 --- a/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala +++ b/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala b/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala index 9947ea66c..e2c0a9d1e 100644 --- a/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala +++ b/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala b/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala index bc749adfa..5063c11a9 100644 --- a/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala +++ b/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala b/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala index e9bb08621..8bcc528fc 100644 --- a/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala +++ b/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala index ff1a4c7b3..1ca060a87 100644 --- a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala +++ b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala b/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala index 5b611f35e..8f369ce29 100644 --- a/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala +++ b/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala index fafada071..19e37b8ff 100644 --- a/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala +++ b/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala b/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala index 8b4f9c2f9..d859f62cc 100644 --- a/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala +++ b/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/OutputSpec.scala b/zinc/src/test/scala/sbt/inc/OutputSpec.scala index cddfb568e..3f299595d 100644 --- a/zinc/src/test/scala/sbt/inc/OutputSpec.scala +++ b/zinc/src/test/scala/sbt/inc/OutputSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/SourceFiles.scala b/zinc/src/test/scala/sbt/inc/SourceFiles.scala index 183fdec71..28200d4e7 100644 --- a/zinc/src/test/scala/sbt/inc/SourceFiles.scala +++ b/zinc/src/test/scala/sbt/inc/SourceFiles.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala b/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala index 667bf26fa..8eb3a143d 100644 --- a/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala +++ b/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/TestResource.scala b/zinc/src/test/scala/sbt/inc/TestResource.scala index 71060e303..feaa162ba 100644 --- a/zinc/src/test/scala/sbt/inc/TestResource.scala +++ b/zinc/src/test/scala/sbt/inc/TestResource.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala b/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala index 58107ab9e..abe63a313 100644 --- a/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala +++ b/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. diff --git a/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala b/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala index c47834896..b0762b48e 100644 --- a/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala +++ b/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala @@ -1,9 +1,9 @@ /* * Zinc - The incremental compiler for Scala. - * Copyright Lightbend, Inc. and Mark Harrah + * Copyright Scala Center, Lightbend, and Mark Harrah * * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). + * SPDX-License-Identifier: Apache-2.0 * * See the NOTICE file distributed with this work for * additional information regarding copyright ownership. From e0a085c5d00dc37b7bfc86a829d3a62b13cd7917 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 28 Oct 2024 03:28:23 -0400 Subject: [PATCH 08/30] util 1.10.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 791f7c141..ad2c8000f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,7 +16,7 @@ object Dependencies { val scala212_213 = Seq(defaultScalaVersion, scala213) private val ioVersion = nightlyVersion.getOrElse("1.10.1") - private val utilVersion = nightlyVersion.getOrElse("1.10.3") + private val utilVersion = nightlyVersion.getOrElse("1.10.4") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From e9f2bc2ff1916e8ae6a5caf77f312c8e7dd60761 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:36:26 -0800 Subject: [PATCH 09/30] Surface clean cache --- .../main/java/xsbti/compile/AnalysisStore.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/internal/compiler-interface/src/main/java/xsbti/compile/AnalysisStore.java b/internal/compiler-interface/src/main/java/xsbti/compile/AnalysisStore.java index db0185fa5..d04adc3da 100644 --- a/internal/compiler-interface/src/main/java/xsbti/compile/AnalysisStore.java +++ b/internal/compiler-interface/src/main/java/xsbti/compile/AnalysisStore.java @@ -100,6 +100,11 @@ static AnalysisStore sync(AnalysisStore analysisStore) { */ void set(AnalysisContents analysisContents); + /** + * Resets in memory cached {@link AnalysisContents} + */ + default void clearCache() {} + final class CachedAnalysisStore implements AnalysisStore { private AnalysisStore underlying; private Optional lastStore = Optional.empty(); @@ -121,6 +126,10 @@ public void set(AnalysisContents analysisContents) { underlying.set(analysisContents); lastStore = Optional.of(analysisContents); } + + public void clearCache() { + lastStore = Optional.empty(); + } } final class SyncedAnalysisStore implements AnalysisStore { @@ -141,5 +150,11 @@ public void set(AnalysisContents analysisContents) { underlying.set(analysisContents); } } + + public void clearCache() { + if (underlying instanceof CachedAnalysisStore) { + underlying.clearCache(); + } + } } } From f846042a59d81a7b4ab0a11b043634b5f8dd1206 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:02:29 -0800 Subject: [PATCH 10/30] Replace deprecated AnyRefMap --- .../src/main/scala/sbt/internal/inc/ReflectUtilities.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ReflectUtilities.scala b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ReflectUtilities.scala index 06b9e2aec..85bdb0e32 100644 --- a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ReflectUtilities.scala +++ b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ReflectUtilities.scala @@ -37,7 +37,7 @@ object ReflectUtilities { else clazz :: ancestry(clazz.getSuperclass) def fields(clazz: Class[?]): mutable.Map[String, Field] = - mutable.AnyRefMap(ancestry(clazz).flatMap(_.getDeclaredFields).map(f => (f.getName, f)): _*) + mutable.HashMap(ancestry(clazz).flatMap(_.getDeclaredFields).map(f => (f.getName, f)): _*) /** * Collects all `val`s of type `T` defined on value `self`. From 3c500672e5b32d9450482b7496766f8970a96a79 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Nov 2024 01:32:25 +0000 Subject: [PATCH 11/30] Update sbt, scripted-plugin to 1.10.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bc7390601..db1723b08 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.3 +sbt.version=1.10.5 From cb46a0a0590cc1a43ed2e7346410cb176b48724e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Nov 2024 01:32:34 +0000 Subject: [PATCH 12/30] Update sbt-contraband to 0.7.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 37861bdfb..60fcf1422 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ scalacOptions += "-feature" addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.6.0") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.7.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.1") From 3aa135307c02454eaa4fb60de8c18793c07ed53c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Nov 2024 01:32:45 +0000 Subject: [PATCH 13/30] Update util-control, util-interface, ... to 1.10.5 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ad2c8000f..ab76968e5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,7 +16,7 @@ object Dependencies { val scala212_213 = Seq(defaultScalaVersion, scala213) private val ioVersion = nightlyVersion.getOrElse("1.10.1") - private val utilVersion = nightlyVersion.getOrElse("1.10.4") + private val utilVersion = nightlyVersion.getOrElse("1.10.5") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 49adbf71eb9c510cb8b153c43c8f47b95ef6dd93 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 6 Nov 2024 14:06:58 +0000 Subject: [PATCH 14/30] Better memory efficiency for Analysis --- .../src/main/java/xsbti/api/SafeLazy.java | 15 +++--- .../src/main/scala/xsbt/api/APIUtil.scala | 46 +++++++++++++------ .../main/scala/xsbt/api/SafeLazyProxy.scala | 5 +- 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/internal/compiler-interface/src/main/java/xsbti/api/SafeLazy.java b/internal/compiler-interface/src/main/java/xsbti/api/SafeLazy.java index 65ae4a55c..318f75d06 100644 --- a/internal/compiler-interface/src/main/java/xsbti/api/SafeLazy.java +++ b/internal/compiler-interface/src/main/java/xsbti/api/SafeLazy.java @@ -15,7 +15,7 @@ /** * Implement a Scala `lazy val` in Java for the facing sbt interface. - * + *

* It holds a reference to a thunk that is lazily evaluated and then * its reference is clear to avoid memory leaks in memory-intensive code. * It needs to be defined in [[xsbti]] or a subpackage, see [[xsbti.api.Lazy]] @@ -34,12 +34,7 @@ public static xsbti.api.Lazy apply(Supplier sbtThunk) { /** Return a sbt [[xsbti.api.Lazy]] from a strict value. */ public static xsbti.api.Lazy strict(T value) { // Convert strict parameter to sbt function returning it - return apply(new Supplier() { - @Override - public T get() { - return value; - } - }); + return new StrictImpl(value); } private static final class Thunky { @@ -68,4 +63,10 @@ public T get() { return t.result; } } + + private static final class StrictImpl extends xsbti.api.AbstractLazy { + private final T value; + StrictImpl(T value) { this.value = value; } + public T get() { return value; } + } } diff --git a/internal/zinc-apiinfo/src/main/scala/xsbt/api/APIUtil.scala b/internal/zinc-apiinfo/src/main/scala/xsbt/api/APIUtil.scala index 567e0f44f..578bd6aab 100644 --- a/internal/zinc-apiinfo/src/main/scala/xsbt/api/APIUtil.scala +++ b/internal/zinc-apiinfo/src/main/scala/xsbt/api/APIUtil.scala @@ -62,7 +62,7 @@ object APIUtil { def minimizeDefinition(d: Definition): Array[Definition] = d match { case c: ClassLike => Array(minimizeClass(c)) - case _ => Array() + case _ => emptyDefs } def minimizeClass(c: ClassLike): ClassLike = { val savedAnnotations = Discovery.defAnnotations(c.structure, (_: Any) => true).toArray[String] @@ -73,7 +73,7 @@ object APIUtil { c.modifiers, c.annotations, c.definitionType, - lzy(emptyType), + emptyTypeLzy, lzy(struct), savedAnnotations, c.childrenOfSealedClass, @@ -91,8 +91,10 @@ object APIUtil { def filterDefinitions( ds: Array[ClassDefinition], isModule: Boolean - ): Lazy[Array[ClassDefinition]] = - lzy(if (isModule) ds filter Discovery.isMainMethod else Array()) + ): Lazy[Array[ClassDefinition]] = { + val mains = if (isModule) ds.filter(Discovery.isMainMethod) else emptyClassDefs + if (mains.isEmpty) emptyClassDefsLzy else lzy(mains) + } def isNonPrivate(d: Definition): Boolean = isNonPrivate(d.access) @@ -104,23 +106,41 @@ object APIUtil { } private val emptyModifiers = new Modifiers(false, false, false, false, false, false, false, false) - private val emptyStructure = Structure.of(lzy(Array.empty), lzy(Array.empty), lzy(Array.empty)) - def emptyClassLike(name: String, definitionType: DefinitionType): ClassLike = - xsbti.api.ClassLike.of( - name, + private[this] val emptyType = EmptyType.of() + private val emptyTypeLzy = lzy(emptyType: Type) + private val emptyDefs = Array.empty[Definition] + private val emptyClassDefs = Array.empty[ClassDefinition] + private val emptyClassDefsLzy = lzy(emptyClassDefs) + private val emptyStructure = Structure.of(lzy(Array.empty), emptyClassDefsLzy, emptyClassDefsLzy) + private val emptyStructureLzy = lzy(emptyStructure) + private val emptyClassLikeTemplate = + ClassLike.of( + null, Public.of(), emptyModifiers, Array.empty, - definitionType, - lzy(emptyType), - lzy(emptyStructure), + null, + emptyTypeLzy, + emptyStructureLzy, Array.empty, Array.empty, true, Array.empty ) + def emptyClassLike(name: String, definitionType: DefinitionType): ClassLike = + ClassLike.of( + name, + emptyClassLikeTemplate.access, + emptyClassLikeTemplate.modifiers, + emptyClassLikeTemplate.annotations, + definitionType, + emptyTypeLzy, + emptyStructureLzy, + emptyClassLikeTemplate.savedAnnotations, + emptyClassLikeTemplate.childrenOfSealedClass, + emptyClassLikeTemplate.topLevel, + emptyClassLikeTemplate.typeParameters, + ) private[this] def lzy[T <: AnyRef](t: T): Lazy[T] = SafeLazyProxy.strict(t) - - private[this] val emptyType = EmptyType.of() } diff --git a/internal/zinc-apiinfo/src/main/scala/xsbt/api/SafeLazyProxy.scala b/internal/zinc-apiinfo/src/main/scala/xsbt/api/SafeLazyProxy.scala index 996255e10..efc22150a 100644 --- a/internal/zinc-apiinfo/src/main/scala/xsbt/api/SafeLazyProxy.scala +++ b/internal/zinc-apiinfo/src/main/scala/xsbt/api/SafeLazyProxy.scala @@ -15,7 +15,7 @@ import java.util.function.Supplier /** * Proxy `SafeLazy` functionality from the Java implementation - * implementation in xsbt.api.SafeLazy to Scala helpers. + * in xsbt.api.SafeLazy to Scala helpers. * * The implementation of these helpers are not reused between each * other because they create intermediate anonymous functions and @@ -35,7 +35,6 @@ object SafeLazyProxy { * Return a lazy implementation of a strict value. */ def strict[T](s: T): Lazy[T] = { - val sbtThunk = new Supplier[T] { override def get() = s } - SafeLazy.apply(sbtThunk) + SafeLazy.strict(s) } } From 29b8eb3e44f5e7175697ea41f79748f3d93129e9 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 9 Nov 2024 04:39:39 -0500 Subject: [PATCH 15/30] ci: sbt-buildinfo 0.13.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 60fcf1422..c22f84ac1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2") From ac27bfbe4312df0f1cca15f9b236b51a13ac3d5e Mon Sep 17 00:00:00 2001 From: friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:56:41 -0800 Subject: [PATCH 16/30] Print javac options in debug log --- .../internal/inc/javac/AnalyzingJavaCompiler.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zinc/src/main/scala/sbt/internal/inc/javac/AnalyzingJavaCompiler.scala b/zinc/src/main/scala/sbt/internal/inc/javac/AnalyzingJavaCompiler.scala index 2ae4c34cd..a7b6faa78 100644 --- a/zinc/src/main/scala/sbt/internal/inc/javac/AnalyzingJavaCompiler.scala +++ b/zinc/src/main/scala/sbt/internal/inc/javac/AnalyzingJavaCompiler.scala @@ -32,6 +32,7 @@ import xsbti.{ import sbt.util.InterfaceUtil import sbt.util.Logger +import xsbt.Log.debug /** * Define a Java compiler that reports on any discovered source dependencies or @@ -165,18 +166,19 @@ final class AnalyzingJavaCompiler private[sbt] ( options, scalaInstance, classpathOptions - ) + ).toArray val javaSources: Array[VirtualFile] = sources.sortBy(_.id).toArray + debug(log, prettyPrintCompilationArguments(args)) val success = - javac.run(javaSources, args.toArray, output, incToolOptions, reporter, log) + javac.run(javaSources, args, output, incToolOptions, reporter, log) if (!success) { /* Assume that no Scalac problems are reported for a Javac-related * reporter. This relies on the incremental compiler will not run * Javac compilation if Scala compilation fails, which means that * the same reporter won't be used for `AnalyzingJavaCompiler`. */ val msg = "javac returned non-zero exit code" - throw new CompileFailed(args.toArray, msg, reporter.problems()) + throw new CompileFailed(args, msg, reporter.problems()) } } @@ -264,4 +266,7 @@ final class AnalyzingJavaCompiler private[sbt] ( log.debug(label + " took " + (elapsed / 1e9) + " s") result } + + private def prettyPrintCompilationArguments(args: Array[String]) = + args.mkString("[zinc] The Java compiler is invoked with:\n\t", "\n\t", "") } From 653c45c181b8b3709ecaccc25b7e0331d682266e Mon Sep 17 00:00:00 2001 From: friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Sun, 20 Oct 2024 18:36:03 -0700 Subject: [PATCH 17/30] Add reproducible flag to ConsistentAnalysisFormat --- .../scala/xsbt/AnalysisFormatBenchmark.scala | 13 +++++++--- .../consistent/ConsistentAnalysisFormat.scala | 26 ++++++++++++------- .../ConsistentFileAnalysisStore.scala | 12 ++++----- .../internal/inc/MixedAnalyzingCompiler.scala | 8 +++--- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala index 53f768423..eb54d69c2 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala @@ -56,7 +56,7 @@ class AnalysisFormatBenchmark { ) writeAll( "-ref-cbin-nosort", - ConsistentFileAnalysisStore.binary(_, ReadWriteMappers.getEmptyMappers, sort = false), + ConsistentFileAnalysisStore.binary(_, ReadWriteMappers.getEmptyMappers, reproducible = false), cached ) println("Sizes:") @@ -94,7 +94,11 @@ class AnalysisFormatBenchmark { bh.consume( writeAll( "-test-cbin-nosort", - ConsistentFileAnalysisStore.binary(_, ReadWriteMappers.getEmptyMappers, sort = false), + ConsistentFileAnalysisStore.binary( + _, + ReadWriteMappers.getEmptyMappers, + reproducible = false + ), cached ) ) @@ -104,7 +108,7 @@ class AnalysisFormatBenchmark { cached.foreach { case (s, a) => val ser = new NullSerializer - val af = new ConsistentAnalysisFormat(ReadWriteMappers.getEmptyMappers, sort = true) + val af = new ConsistentAnalysisFormat(ReadWriteMappers.getEmptyMappers, reproducible = true) af.write(ser, a.getAnalysis, a.getMiniSetup) bh.consume(ser.count) } @@ -115,7 +119,8 @@ class AnalysisFormatBenchmark { cached.foreach { case (s, a) => val ser = new NullSerializer - val af = new ConsistentAnalysisFormat(ReadWriteMappers.getEmptyMappers, sort = false) + val af = + new ConsistentAnalysisFormat(ReadWriteMappers.getEmptyMappers, reproducible = false) af.write(ser, a.getAnalysis, a.getMiniSetup) bh.consume(ser.count) } diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala index 78aea1106..271de3492 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala @@ -36,7 +36,7 @@ import Compat._ * - Faster serialization and deserialization than the existing binary format. * - Smaller implementation than either of the existing formats. */ -class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { +class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, reproducible: Boolean) { import ConsistentAnalysisFormat._ private[this] final val VERSION = 1100029 @@ -52,6 +52,7 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { writeAPIs(out, analysis0.apis, setup.storeApis()) writeSourceInfos(out, analysis0.infos) // we do not read or write the Compilations + // as zinc does not use Compilations from deserialized analysis out.int(VERSION) out.end() } @@ -64,6 +65,7 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { val apis = readAPIs(in, setup.storeApis()) val infos = readSourceInfos(in) // we do not read or write the Compilations + // as zinc does not use Compilations from deserialized analysis val compilations = Compilations.of(Nil) readVersion(in) in.end() @@ -76,9 +78,12 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { name: String, map: scala.collection.Iterable[(String, V)], perEntry: Int = 1 - )(f: V => Unit): Unit = - if (sort) out.writeSortedStringMap(name, map, perEntry)(f) + )(f: V => Unit): Unit = { + // For reproducible output, need to write strings in sorted order + // otherwise strings may be written in different order resulting in different output + if (reproducible) out.writeSortedStringMap(name, map, perEntry)(f) else out.writeColl(name, map, perEntry + 1) { kv => out.string(kv._1); f(kv._2) } + } private[this] def readVersion(in: Deserializer): Unit = { val ver = in.int() @@ -158,7 +163,7 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { out.string(ac.provenance()) out.int(ac.extraHash()) val nh0 = ac.nameHashes() - val nh = if (nh0.length > 1 && sort) { + val nh = if (nh0.length > 1 && reproducible) { val nh = nh0.clone() Arrays.sort(nh, nameHashComparator) nh @@ -199,14 +204,17 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { } private[this] def writeAPIs(out: Serializer, apis: APIs, storeApis: Boolean): Unit = { - def write(n: String, m: Map[String, AnalyzedClass]): Unit = + def write(n: String, m: Map[String, AnalyzedClass]): Unit = { writeMaybeSortedStringMap( out, n, - m.mapValues(_.withCompilationTimestamp(DefaultCompilationTimestamp)) + if (reproducible) m.mapValues(_.withCompilationTimestamp(DefaultCompilationTimestamp)) + else m ) { ac => writeAnalyzedClass(out, ac, storeApis) } + } + write("internal", apis.internal) write("external", apis.external) } @@ -353,7 +361,7 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { rel.forwardMap.view.map { case (k, vs) => kf(k) -> vs } ) { vs => val a = vs.iterator.map(vf).toArray - if (sort) Arrays.sort(a, implicitly[Ordering[String]]) + if (reproducible) Arrays.sort(a, implicitly[Ordering[String]]) out.writeColl("item", a)(out.string) } def wrS(name: String, rel: Relation[String, String]): Unit = @@ -428,11 +436,11 @@ class ConsistentAnalysisFormat(val mappers: ReadWriteMappers, sort: Boolean) { if (sc.contains(UseScope.PatMatTarget)) i += 4 (un.name, i.toByte) }.toArray.groupBy(_._2) - val groups = if (sort) groups0.toVector.sortBy(_._1) else groups0 + val groups = if (reproducible) groups0.toVector.sortBy(_._1) else groups0 out.writeColl("groups", groups, 2) { case (g, gNames) => out.byte(g) val names = gNames.map(_._1) - if (sort) Arrays.sort(names, implicitly[Ordering[String]]) + if (reproducible) Arrays.sort(names, implicitly[Ordering[String]]) out.writeStringColl("names", names) } } diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala index 2cec0baa3..469c3a72c 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala @@ -35,12 +35,12 @@ object ConsistentFileAnalysisStore { def text( file: File, mappers: ReadWriteMappers, - sort: Boolean = true, + reproducible: Boolean = true, parallelism: Int = Runtime.getRuntime.availableProcessors() ): XAnalysisStore = new AStore( file, - new ConsistentAnalysisFormat(mappers, sort), + new ConsistentAnalysisFormat(mappers, reproducible), SerializerFactory.text, parallelism ) @@ -49,7 +49,7 @@ object ConsistentFileAnalysisStore { binary( file, mappers = ReadWriteMappers.getEmptyMappers(), - sort = true, + reproducible = true, ) def binary( @@ -59,18 +59,18 @@ object ConsistentFileAnalysisStore { binary( file, mappers, - sort = true, + reproducible = true, ) def binary( file: File, mappers: ReadWriteMappers, - sort: Boolean, + reproducible: Boolean, parallelism: Int = Runtime.getRuntime.availableProcessors() ): XAnalysisStore = new AStore( file, - new ConsistentAnalysisFormat(mappers, sort), + new ConsistentAnalysisFormat(mappers, reproducible), SerializerFactory.binary, parallelism ) diff --git a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala index b08b699d1..5a934a91e 100644 --- a/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala +++ b/zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala @@ -507,7 +507,7 @@ object MixedAnalyzingCompiler { useTextAnalysis = useTextAnalysis, useConsistent = false, mappers = ReadWriteMappers.getEmptyMappers(), - sort = true, + reproducible = true, parallelism = Runtime.getRuntime.availableProcessors(), ) @@ -516,7 +516,7 @@ object MixedAnalyzingCompiler { useTextAnalysis: Boolean, useConsistent: Boolean, mappers: ReadWriteMappers, - sort: Boolean, + reproducible: Boolean, parallelism: Int, ): AnalysisStore = { val fileStore = (useTextAnalysis, useConsistent) match { @@ -526,7 +526,7 @@ object MixedAnalyzingCompiler { ConsistentFileAnalysisStore.binary( file = analysisFile.toFile, mappers = mappers, - sort = sort, + reproducible = reproducible, parallelism = parallelism, ) case (true, false) => @@ -535,7 +535,7 @@ object MixedAnalyzingCompiler { ConsistentFileAnalysisStore.text( file = analysisFile.toFile, mappers = mappers, - sort = sort, + reproducible = reproducible, parallelism = parallelism, ) } From eb96c194c44a1d6479d4d4d38b8d93cc5e5faa6e Mon Sep 17 00:00:00 2001 From: friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Sun, 24 Nov 2024 00:54:17 -0800 Subject: [PATCH 18/30] Let Scala Steward auto-update protobuf version --- .scala-steward.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 00e3eba3a..365e48913 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -2,9 +2,7 @@ # either. hopefully this is a reasonable compromise value? pullRequests.frequency = "14 days" -updates.ignore = [ - # as per discussion on sbt/zinc#1236, this is - # "if it ain't broke don't fix it" territory - { groupId = "com.google.protobuf" }, - { groupId = "org.eclipse.jgit" } +updates.pin = [ + { groupId = "com.google.protobuf", artifactId = "protobuf-java", version="3." }, + { groupId = "org.eclipse.jgit", artifactId = "org.eclipse.jgit", version="6." } ] From 4c2eee3f9065cbf4191613e6c707ee0e9c239a22 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 25 Nov 2024 18:50:02 +0000 Subject: [PATCH 19/30] Update sbt-projectmatrix to 0.10.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c22f84ac1..034ac53e6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,6 +9,6 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") -addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") +addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2") From aa033b89029bf499b8ca0524428235af2ca27fec Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:45:55 -0800 Subject: [PATCH 20/30] Pin com.google.protobuf.protoc --- .scala-steward.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.scala-steward.conf b/.scala-steward.conf index 365e48913..bca00ae02 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -4,5 +4,7 @@ pullRequests.frequency = "14 days" updates.pin = [ { groupId = "com.google.protobuf", artifactId = "protobuf-java", version="3." }, + { groupId = "com.google.protobuf", artifactId = "protoc", version="3." }, + # jgit 7 requires Java 17+ { groupId = "org.eclipse.jgit", artifactId = "org.eclipse.jgit", version="6." } ] From 45702eae0412eeeafa6ca89f14bbb8161adcb28e Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:14:08 -0800 Subject: [PATCH 21/30] remove usage of blacklist --- .../src/main/scala/sbt/internal/inc/ScalaInstance.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala index b28230152..5ff49a030 100644 --- a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala +++ b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala @@ -266,12 +266,12 @@ object ScalaInstance { /** Return all the required Scala jars from a path `scalaHome`. */ def allJars(scalaHome: File): Seq[File] = - IO.listFiles(scalaLib(scalaHome)).toIndexedSeq.filter(f => !blacklist(f.getName)) + IO.listFiles(scalaLib(scalaHome)).toIndexedSeq.filter(f => !excludeList(f.getName)) private[this] def scalaLib(scalaHome: File): File = new File(scalaHome, "lib") - private[this] val blacklist: Set[String] = Set( + private[this] val excludeList: Set[String] = Set( "scala-actors.jar", "scalacheck.jar", "scala-partest.jar", From baba381dbe8f70783e5c7d82c17b9eaf71bc4ad8 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 29 Nov 2024 22:25:37 -0500 Subject: [PATCH 22/30] util 1.10.6 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ab76968e5..65c7acf11 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,8 +15,8 @@ object Dependencies { val compilerBridgeVersions = Seq(scala212, scala210, scala211, scala213) val scala212_213 = Seq(defaultScalaVersion, scala213) - private val ioVersion = nightlyVersion.getOrElse("1.10.1") - private val utilVersion = nightlyVersion.getOrElse("1.10.5") + private val ioVersion = nightlyVersion.getOrElse("1.10.2") + private val utilVersion = nightlyVersion.getOrElse("1.10.6") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From af2004f4f2c2558d84e2256585a5342cb99eebf3 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 3 Dec 2024 10:13:54 +1000 Subject: [PATCH 23/30] Exclude anon classes from dependency registration These can show in edge cases like: ``` package demo class SRC[_] class Filter class Refined { def select(cols: SRC[_]*) = new { def where(filter: Filter => Filter)(implicit d: DummyImplicit) = { new { def using(opt: Box[SRC[_]] => Some[SRC[_]])(implicit d: DummyImplicit) = opt } } } } ``` ``` package demo class Client { def temp = new Refined().select(null).where(null).using(null) } ``` This can leak an existential type owned by an anon-class into `Client`, at least prior to this compiler fix: https://github.com/scala/scala/pull/10940 --- .../compiler-bridge/src/main/scala/xsbt/Dependency.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala index e7425ca1b..08a13f355 100644 --- a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala +++ b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala @@ -291,9 +291,12 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with assert(fromClass.isClass, Feedback.expectedClassSymbol(fromClass)) val depClass = enclOrModuleClass(dep) val dependency = ClassDependency(fromClass, depClass) + // An anonymous class be the enclosing class of an existential type symbol inferred from refinements, + // prior to https://github.com/scala/scala/pull/10940. Allowing this here leads to a dependency on class name + // that does not exist. Guard against it here to avoid the issue with legacy compiler versions. if ( !cache.contains(dependency) && - !depClass.isRefinementClass + !depClass.isAnonOrRefinementClass ) { process(dependency) cache.add(dependency) @@ -484,7 +487,8 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with case m @ MacroExpansionOf(original) if inspectedOriginalTrees.add(original) => // TODO: typesTouchedDuringMacroExpansion can be provided by compiler - // in the form of tree attachment + // in the form + // of tree attachment val typesTouchedDuringMacroExpansion = original match { case Apply(TypeApply(_, args), _) => args.map(_.tpe) case TypeApply(_, args) => args.map(_.tpe) From f1547d0ea8b71e5aa3e28415c9881d14c4af99d1 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 3 Dec 2024 10:14:24 +1000 Subject: [PATCH 24/30] Add some notes to the saga of absent associatedFile --- .../src/main/scala/xsbt/Dependency.scala | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala index 08a13f355..e49e47865 100644 --- a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala +++ b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala @@ -189,6 +189,27 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with * but when it does we must ensure the incremental compiler tries its best no to lose * any dependency. Therefore, we do a last-time effort to get the origin of the symbol * by inspecting the classpath manually. + * + * UPDATE: This can also happen without compiler bugs if the symbol is simply uninitialized. + * Example, `class Client { def foo = Server.foo }`. When compiling client, the type `Foo` returned + * by `Server.foo` does not need to be initialized as we do not select from it or check its + * conformance to another type. + * + * Initializing `targetSymbol` before calling `assosicatedFile` would work but is problematic + * see zinc/zinc#949 + * + * Perhaps consider this? + * val file = targetSymbol.associatedFile match { + * case NoAbstractFile => sym.rawInfo match { + * case cfl: global.loaders.ClassfileLoader => + * val f = cfl.associatedFile(sym) // Gets the file from the loader + * if (f.exists) f else NoAbstractFile + * case f => f + * } + * } + * + * Or the status quo might just be perfectly fine -- if compilation doesn't need to force `Foo`, + * then there isn't a real dependency. */ val fqn = fullName(targetSymbol, '.', targetSymbol.moduleSuffix, false) global.findAssociatedFile(fqn) match { From 9e0c6635613843007cdfc8382e59ec57e3012371 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 3 Dec 2024 23:42:45 +1000 Subject: [PATCH 25/30] Precompile a regex in hot code --- .../compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala b/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala index fb77ed6c4..28de452dc 100644 --- a/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala +++ b/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala @@ -19,6 +19,7 @@ import xsbti.api._ import scala.annotation.tailrec import scala.tools.nsc.Global import scala.PartialFunction.cond +import ExtractAPI.ConstructorWithDefaultArgument /** * Extracts full (including private members) API representation out of Symbols and Types. @@ -836,9 +837,8 @@ class ExtractAPI[GlobalType <: Global]( constructorNameAsString(s.enclClass) else { val decoded = name.decode - val constructorWithDefaultArgument = "\\$default\\$(\\d+)".r decoded match { - case constructorWithDefaultArgument(index) => constructorNameAsString(s.enclClass, index) + case ConstructorWithDefaultArgument(index) => constructorNameAsString(s.enclClass, index) case _ => decoded } } @@ -866,4 +866,5 @@ class ExtractAPI[GlobalType <: Global]( object ExtractAPI { private val emptyAnnotationArray = new Array[xsbti.api.Annotation](0) + private val ConstructorWithDefaultArgument = "\\$default\\$(\\d+)".r } From c752dae13e3c3527e0d709165dccd888557868c5 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 4 Dec 2024 09:28:55 +1000 Subject: [PATCH 26/30] Update internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala Co-authored-by: Jiahui (Jerry) Tan <66892505+Friendseeker@users.noreply.github.com> --- internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala index e49e47865..6b1c2ec15 100644 --- a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala +++ b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala @@ -508,8 +508,7 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with case m @ MacroExpansionOf(original) if inspectedOriginalTrees.add(original) => // TODO: typesTouchedDuringMacroExpansion can be provided by compiler - // in the form - // of tree attachment + // in the form of tree attachment val typesTouchedDuringMacroExpansion = original match { case Apply(TypeApply(_, args), _) => args.map(_.tpe) case TypeApply(_, args) => args.map(_.tpe) From bb0112856ebe2efcf54f07e59c2f72b20d90eef3 Mon Sep 17 00:00:00 2001 From: friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:45:06 -0800 Subject: [PATCH 27/30] Bump sbt to 1.10.6 --- build.sbt | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 5657218bd..49758c7a8 100644 --- a/build.sbt +++ b/build.sbt @@ -46,7 +46,7 @@ ThisBuild / version := { nightlyVersion match { case Some(v) => v case _ => - if ((ThisBuild / isSnapshot).value) "1.10.4-SNAPSHOT" + if ((ThisBuild / isSnapshot).value) "1.10.6-SNAPSHOT" else old } } diff --git a/project/build.properties b/project/build.properties index db1723b08..e88a0d817 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6 From f032a9a5ff975492534e9a468f577f1626cdbf2d Mon Sep 17 00:00:00 2001 From: Andrew Brett Date: Wed, 4 Dec 2024 17:53:52 +0400 Subject: [PATCH 28/30] Ensure we register a cycle if we've got scala sources but pipelining is disabled --- .../scala/sbt/internal/inc/Incremental.scala | 22 ++++++++++++++----- .../sbt/internal/inc/IncrementalCommon.scala | 12 +++++----- .../scala/sbt/internal/inc/IncHandler.scala | 19 ++++++++++++++++ .../check-cycles-no-pipelining/A.scala | 13 +++++++++++ .../changes/A.scala | 16 ++++++++++++++ .../incOptions.properties | 1 + .../profiler/check-cycles-no-pipelining/test | 5 +++++ .../sbt-test/profiler/check-cycles/A.scala | 13 +++++++++++ .../profiler/check-cycles/changes/A.scala | 16 ++++++++++++++ zinc/src/sbt-test/profiler/check-cycles/test | 5 +++++ 10 files changed, 109 insertions(+), 13 deletions(-) create mode 100644 zinc/src/sbt-test/profiler/check-cycles-no-pipelining/A.scala create mode 100644 zinc/src/sbt-test/profiler/check-cycles-no-pipelining/changes/A.scala create mode 100644 zinc/src/sbt-test/profiler/check-cycles-no-pipelining/incOptions.properties create mode 100644 zinc/src/sbt-test/profiler/check-cycles-no-pipelining/test create mode 100644 zinc/src/sbt-test/profiler/check-cycles/A.scala create mode 100644 zinc/src/sbt-test/profiler/check-cycles/changes/A.scala create mode 100644 zinc/src/sbt-test/profiler/check-cycles/test diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala index 7a3fa13c1..5d90c4df4 100644 --- a/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala +++ b/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala @@ -70,14 +70,18 @@ object Incremental { * Merge latest analysis as of pickling into pruned previous analysis, compute invalidations * and decide whether we need another cycle. */ - def mergeAndInvalidate(partialAnalysis: Analysis, completingCycle: Boolean): CompileCycleResult + def mergeAndInvalidate( + partialAnalysis: Analysis, + shouldRegisterCycle: Boolean + ): CompileCycleResult /** * Merge latest analysis as of analyzer into pruned previous analysis and inform file manager. */ def completeCycle( prev: Option[CompileCycleResult], - partialAnalysis: Analysis + partialAnalysis: Analysis, + shouldRegisterCycle: Boolean ): CompileCycleResult def previousAnalysisPruned: Analysis @@ -938,7 +942,13 @@ private final class AnalysisCallback( if (!writtenEarlyArtifacts) // writing implies the updates merge has happened mergeUpdates() // must merge updates each cycle or else scalac will clobber it } - incHandler.completeCycle(invalidationResults, getAnalysis) + + val partialAnalysis = getAnalysis + val hasScala = Analysis.sources(partialAnalysis).scala.nonEmpty + // If we had early output and scala sources, then the cycle has already been registered + val shouldRegisterCycle = earlyOutput.isEmpty || !hasScala + + incHandler.completeCycle(invalidationResults, partialAnalysis, shouldRegisterCycle) } else { throw new IllegalStateException( "can't call AnalysisCallback#getCycleResultOnce more than once" @@ -1090,12 +1100,12 @@ private final class AnalysisCallback( override def apiPhaseCompleted(): Unit = { // If we know we're done with cycles (presumably because all sources were invalidated) we can store early analysis - // and picke data now. Otherwise, we need to wait for dependency information to decide if there are more cycles. + // and pickle data now. Otherwise, we need to wait for dependency information to decide if there are more cycles. incHandlerOpt foreach { incHandler => if (earlyOutput.isDefined && incHandler.isFullCompilation) { val a = getAnalysis val CompileCycleResult(continue, invalidations, merged) = - incHandler.mergeAndInvalidate(a, false) + incHandler.mergeAndInvalidate(a, shouldRegisterCycle = true) if (lookup.shouldDoEarlyOutput(merged)) { assert( !continue && invalidations.isEmpty, @@ -1113,7 +1123,7 @@ private final class AnalysisCallback( if (earlyOutput.isDefined && invalidationResults.isEmpty) { val a = getAnalysis val CompileCycleResult(continue, invalidations, merged) = - incHandler.mergeAndInvalidate(a, false) + incHandler.mergeAndInvalidate(a, shouldRegisterCycle = true) // Store invalidations and continuation decision; the analysis will be computed again after Analyze phase. invalidationResults = Some(CompileCycleResult(continue, invalidations, Analysis.empty)) // If there will be no more compilation cycles, store the early analysis file and update the pickle jar diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala index 19cfff70e..2326ae9dd 100644 --- a/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala +++ b/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala @@ -158,7 +158,7 @@ private[inc] abstract class IncrementalCommon( override def mergeAndInvalidate( partialAnalysis: Analysis, - completingCycle: Boolean + shouldRegisterCycle: Boolean, ): CompileCycleResult = { val analysis = if (isFullCompilation) @@ -190,10 +190,7 @@ private[inc] abstract class IncrementalCommon( val continue = nextInvalidations.nonEmpty && lookup.shouldDoIncrementalCompilation(nextInvalidations, analysis) - val hasScala = Analysis.sources(partialAnalysis).scala.nonEmpty - - // If we're completing the cycle and we had scala sources, then mergeAndInvalidate has already been called - if (!completingCycle || !hasScala) { + if (shouldRegisterCycle) { registerCycle(recompiledClasses, newApiChanges, nextInvalidations, continue) } CompileCycleResult(continue, nextInvalidations, analysis) @@ -201,12 +198,13 @@ private[inc] abstract class IncrementalCommon( override def completeCycle( prev: Option[CompileCycleResult], - partialAnalysis: Analysis + partialAnalysis: Analysis, + shouldRegisterCycle: Boolean ): CompileCycleResult = { classFileManager.generated(partialAnalysis.relations.allProducts.map(toVf).toArray) prev match { case Some(prev) => prev.copy(analysis = pruned ++ partialAnalysis) - case _ => mergeAndInvalidate(partialAnalysis, true) + case _ => mergeAndInvalidate(partialAnalysis, shouldRegisterCycle) } } } diff --git a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala index d282f4338..8b8d19305 100644 --- a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala +++ b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala @@ -26,11 +26,14 @@ import xsbti.{ FileConverter, Problem, Severity, VirtualFileRef, VirtualFile } import xsbti.compile.{ AnalysisContents, AnalysisStore, + ClassFileManager => XClassFileManager, ClasspathOptionsUtil, CompileAnalysis, CompileOrder, CompileProgress, + DefaultExternalHooks, DefinesClass, + ExternalHooks, IncOptions, IncOptionsUtil, PerClasspathEntryLookup, @@ -222,6 +225,9 @@ class IncHandler(directory: Path, cacheDir: Path, scriptedLog: ManagedLogger, co onArgs("checkIterations") { case (p, x :: Nil, i) => p.checkNumberOfCompilerIterations(i, x.toInt) }, + onArgs("checkCycles") { + case (p, x :: Nil, i) => p.checkNumberOfCycles(i, x.toInt) + }, // note that this can only tell us the *last* round a class got compiled in. // it can't tell us *every* round something got compiled in, since only // still-extant classfiles are available for inspection @@ -328,6 +334,7 @@ case class ProjectStructure( val earlyCacheFile = baseDirectory / "target" / "early" / "inc_compile.zip" val earlyAnalysisStore = FileAnalysisStore.binary(earlyCacheFile.toFile) // val earlyCachedStore = AnalysisStore.cached(fileStore) + val profiler = new ZincInvalidationProfiler // We specify the class file manager explicitly even though it's noew possible // to specify it in the incremental option property file (this is the default for sbt) @@ -424,6 +431,15 @@ case class ProjectStructure( () } + def checkNumberOfCycles(i: IncState, expected: Int): Future[Unit] = + compile(i).map { _ => + import scala.collection.JavaConverters._ + val count = profiler.toProfile.getRunsList.asScala.map(_.getCyclesList.size).sum + val msg = s"Expected $expected cycles, got $count" + assert(count == expected, msg) + () + } + def checkClasses(i: IncState, src: String, expected: List[String]): Future[Unit] = compile(i).map { analysis => def classes(src: String): Set[String] = @@ -783,10 +799,13 @@ case class ProjectStructure( import scala.collection.JavaConverters._ val map = new java.util.HashMap[String, String] properties.asScala foreach { case (k: String, v: String) => map.put(k, v) } + val externalHooks = new DefaultExternalHooks(Optional.empty[ExternalHooks.Lookup], Optional.empty[XClassFileManager]) + .withInvalidationProfiler(profiler) val base = IncOptions .of() .withPipelining(defaultPipelining) .withApiDebug(true) + .withExternalHooks(externalHooks) // .withRelationsDebug(true) val incOptions = { val opts = IncOptionsUtil.fromStringMap(base, map, scriptedLog) diff --git a/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/A.scala b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/A.scala new file mode 100644 index 000000000..fb24dcd51 --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/A.scala @@ -0,0 +1,13 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + +class A() + diff --git a/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/changes/A.scala b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/changes/A.scala new file mode 100644 index 000000000..017538128 --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/changes/A.scala @@ -0,0 +1,16 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + +class A() + + + +// random placeholder change \ No newline at end of file diff --git a/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/incOptions.properties b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/incOptions.properties new file mode 100644 index 000000000..e7b9a57ec --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/incOptions.properties @@ -0,0 +1 @@ +pipelining = false \ No newline at end of file diff --git a/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/test b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/test new file mode 100644 index 000000000..3c91240b7 --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles-no-pipelining/test @@ -0,0 +1,5 @@ +> compile + +$ copy-file changes/A.scala A.scala + +> checkCycles 2 \ No newline at end of file diff --git a/zinc/src/sbt-test/profiler/check-cycles/A.scala b/zinc/src/sbt-test/profiler/check-cycles/A.scala new file mode 100644 index 000000000..fb24dcd51 --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles/A.scala @@ -0,0 +1,13 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + +class A() + diff --git a/zinc/src/sbt-test/profiler/check-cycles/changes/A.scala b/zinc/src/sbt-test/profiler/check-cycles/changes/A.scala new file mode 100644 index 000000000..017538128 --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles/changes/A.scala @@ -0,0 +1,16 @@ +/* + * Zinc - The incremental compiler for Scala. + * Copyright Scala Center, Lightbend, and Mark Harrah + * + * Licensed under Apache License 2.0 + * SPDX-License-Identifier: Apache-2.0 + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + +class A() + + + +// random placeholder change \ No newline at end of file diff --git a/zinc/src/sbt-test/profiler/check-cycles/test b/zinc/src/sbt-test/profiler/check-cycles/test new file mode 100644 index 000000000..3c91240b7 --- /dev/null +++ b/zinc/src/sbt-test/profiler/check-cycles/test @@ -0,0 +1,5 @@ +> compile + +$ copy-file changes/A.scala A.scala + +> checkCycles 2 \ No newline at end of file From d2cd28a8b7ccebf7cd3ff45fd1586c687f8fff3c Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Thu, 5 Dec 2024 13:18:22 +0100 Subject: [PATCH 29/30] new CLA url --- .github/workflows/cla.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index f9ead39fd..91f51361e 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -10,15 +10,15 @@ jobs: AUTHOR: ${{ github.event.pull_request.user.login }} run: | echo "Pull request submitted by $AUTHOR"; - signed=$(curl -s "https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR" | jq -r ".signed"); + signed=$(curl -s "https://contribute.akka.io/contribute/cla/scala/check/$AUTHOR" | jq -r ".signed"); if [ "$signed" = "true" ] ; then echo "CLA check for $AUTHOR successful"; else echo "CLA check for $AUTHOR failed"; echo "Please sign the Scala CLA to contribute to the Scala compiler."; - echo "Go to https://www.lightbend.com/contribute/cla/scala and then"; + echo "Go to https://contribute.akka.io/contribute/cla/scala and then"; echo "comment on the pull request to ask for a new check."; echo ""; - echo "Check if CLA is signed: https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR"; + echo "Check if CLA is signed: https://contribute.akka.io/contribute/cla/scala/check/$AUTHOR"; exit 1; fi; From 23219b42aedd231738ed205ad2efe3ddeac98c0c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 11 Dec 2024 20:15:26 +0000 Subject: [PATCH 30/30] Update sbt-pgp to 2.3.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 034ac53e6..ce70d171b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ scalacOptions += "-feature" addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.7.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")