Avoid duplicate repl-jline.properties entries in compiler/packageBin#8687
Merged
dwijnand merged 1 commit intoscala:2.12.xfrom Feb 3, 2020
Merged
Avoid duplicate repl-jline.properties entries in compiler/packageBin#8687dwijnand merged 1 commit intoscala:2.12.xfrom
dwijnand merged 1 commit intoscala:2.12.xfrom
Conversation
I removed `generatePropertiesFileSettings` from commonSettings leaving projects that really need to use it to directly add it to the settings. This was already being done (redundatly in some cases) in `library`, `reflect`, `compiler`, `partestExtras` and `partestJavaAgent`. Before this PR (but after the SBT upgrade on 2.12.x branch): ``` ➜ sbt 'show compiler/Compile/packageBin/mappings' | egrep 'repl-jline\.properties' [info] * (/Users/jz/code/scala-2.12.x-reference/build/quick/classes/repl-jline/repl-jline.properties,repl-jline.properties) [info] * (/Users/jz/code/scala-2.12.x-reference/build/quick/classes/repl-jline-embedded/repl-jline.properties,repl-jline.properties) ➜ sbt scala [info] Loading global plugins from /Users/jz/.sbt/1.0/plugins [info] Loading settings for project scala-2-12-x-reference-build-build from plugins.sbt ... [info] Loading project definition from /Users/jz/code/scala-2.12.x-reference/project/project [info] Loading settings for project scala-2-12-x-reference-build from plugins.sbt,build.sbt ... [info] Loading project definition from /Users/jz/code/scala-2.12.x-reference/project [info] Loading settings for project root from build.sbt ... [info] Resolving key references (18230 settings) ... [error] Could not determine commit date + SHA: org.eclipse.jgit.errors.MissingObjectException: Missing unknown b8c33ad [info] *** Welcome to the sbt build definition for Scala! *** [info] Check README.md for more information. [error] java.util.zip.ZipException: duplicate entry: repl-jline.properties ``` After this PR: ``` fg: no current job ➜ sbt 'show compiler/Compile/packageBin/mappings' | egrep 'repl-jline\.properties' [info] * (/Users/jz/code/scala-2.12.x-reference/build/quick/classes/repl-jline-embedded/repl-jline.properties,repl-jline.properties) ➜ sbt scala [info] Loading global plugins from /Users/jz/.sbt/1.0/plugins [info] Loading settings for project scala-2-12-x-reference-build-build from plugins.sbt ... [info] Loading project definition from /Users/jz/code/scala-2.12.x-reference/project/project [info] Loading settings for project scala-2-12-x-reference-build from plugins.sbt,build.sbt ... [info] Loading project definition from /Users/jz/code/scala-2.12.x-reference/project [info] Loading settings for project root from build.sbt ... [info] Resolving key references (18194 settings) ... [info] *** Welcome to the sbt build definition for Scala! *** [info] Check README.md for more information. [info] running (fork) scala.tools.nsc.MainGenericRunner -usejavacp Welcome to Scala 2.12.11-20200203-035143-5bdfd31 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_221). Type in expressions for evaluation. Or try :help. ``` Prior to the SBT upgrade, we also had the duplicate mapping: ``` sbt 'show compiler/compile:packageBin::mappings' | egrep 'repl-jline\.properties' [info] * (/Users/jz/code/scala-2.12.x-reference/build/quick/classes/repl-jline/repl-jline.properties,repl-jline.properties) [info] * (/Users/jz/code/scala-2.12.x-reference/build/quick/classes/repl-jline-embedded/repl-jline.properties,repl-jline.properties) ```
dwijnand
approved these changes
Feb 3, 2020
Member
|
Btw, I get duplicate entries using current 2.12.x (I noticed I got them upgrading 2.12.x to sbt 1.3.8 and noticed I got them before too): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I removed
generatePropertiesFileSettingsfrom commonSettingsleaving projects that really need to use it to directly add it
to the settings. This was already being done (redundatly in some
cases) in
library,reflect,compiler,partestExtrasand
partestJavaAgent.Before this PR (but after the SBT upgrade on 2.12.x branch):
After this PR:
Prior to the SBT upgrade, we also had the duplicate mapping: