Skip to content

Commit 8c187e0

Browse files
committed
apply suggested casing changes to other new strings: TASTy and ProGuard
1 parent e332ced commit 8c187e0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/scala/com/typesafe/sbt/SbtProguard.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ object SbtProguard extends AutoPlugin {
112112
runProguard(proguardConfigurationValue, javaOptionsInProguardValue, managedClasspathValue.files, streamsValue.log)
113113

114114
if (scalaBinaryVersion.value == "3") {
115-
streamsValue.log.info("This is a Scala 3 build - will now remove the tasty files from the proguard outputs")
115+
streamsValue.log.info("This is a Scala 3 build - will now remove the TASTy files from the ProGuard outputs")
116116
val mappingsFile = findMappingsFileConfig(
117117
options = (Proguard/proguardOptions).value,
118118
baseDir = (Proguard/proguardDirectory).value
119119
).getOrElse(throw new AssertionError(
120120
"""mappings file not found in proguardOptions. Please configure it using e.g. `-printmapping mapings.txt`
121-
| - it must be configured for a Scala 3 build so we can remove the tasty files for obfuscated classes""".stripMargin
121+
| - it must be configured for a Scala 3 build so we can remove the TASTy files for obfuscated classes""".stripMargin
122122
))
123123
removeTastyFilesForObfuscatedClasses(
124124
mappingsFile,
@@ -153,16 +153,16 @@ object SbtProguard extends AutoPlugin {
153153
val obfuscatedClasses = findObfuscatedClasses(mappingsFile)
154154

155155
if (obfuscatedClasses.nonEmpty) {
156-
logger.info(s"found ${obfuscatedClasses.size} classes that have been obfuscated; will now remove their tasty files (bar some that are still required), since those contain even more information than the class files")
157-
// note: we must not delete the tasty files for unobfuscated classes since that would break the REPL
156+
logger.info(s"found ${obfuscatedClasses.size} classes that have been obfuscated; will now remove their TASTy files (bar some that are still required), since those contain even more information than the class files")
157+
// note: we must not delete the TASTy files for unobfuscated classes since that would break the REPL
158158
val tastyEntriesForObfuscatedClasses = obfuscatedClasses.map { className =>
159159
val zipEntry = "/" + className.replaceAll("\\.", "/") // `/` instead of `.`
160160
val tastyFileConvention = zipEntry.replaceFirst("\\$.*", "")
161161
s"$tastyFileConvention.tasty"
162162
}
163163

164164
val deletedEntries = deleteFromJar(proguardOutputJar, tastyEntriesForObfuscatedClasses)
165-
logger.info(s"deleted ${deletedEntries.size} tasty files from $proguardOutputJar")
165+
logger.info(s"deleted ${deletedEntries.size} TASTy files from $proguardOutputJar")
166166
deletedEntries.foreach(println)
167167
}
168168
}

0 commit comments

Comments
 (0)