From 1c3f11e78af9f8f4a446a314964b098ff0ee69ac Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Mon, 10 Apr 2023 13:38:39 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2077285 -> 2111178 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 8c6309e..84c744d 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From 50bb067826adfbd8c739fdd5b203a4c80500de34 Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Thu, 13 Apr 2023 10:55:23 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111178 -> 2111390 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 84c744d..129ef91 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From 71d5ac6ab3ef9eafe2c4f287f7d2e16cd371daf8 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Thu, 13 Apr 2023 11:12:13 -0700 Subject: Normalize timestamps to an explicit fixed timestamp PiperOrigin-RevId: 524051339 --- tools/java/com/google/devtools/kotlin/SourceJarZipper.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt b/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt index c2d34d8..8748052 100644 --- a/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt +++ b/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt @@ -22,6 +22,7 @@ import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths import java.nio.file.StandardCopyOption +import java.time.LocalDateTime import java.util.zip.ZipEntry import java.util.zip.ZipInputStream import java.util.zip.ZipOutputStream @@ -85,6 +86,9 @@ private fun clearSingletonEmptyPath(list: MutableList) { } } +// Normalize timestamps +val DEFAULT_TIMESTAMP = LocalDateTime.of(2010, 1, 1, 0, 0, 0) + fun MutableMap.writeToStream( zipper: ZipOutputStream, prefix: String = "", @@ -92,7 +96,7 @@ fun MutableMap.writeToStream( for ((zipPath, sourcePath) in this) { BufferedInputStream(Files.newInputStream(sourcePath)).use { inputStream -> val entry = ZipEntry(Paths.get(prefix).resolve(zipPath).toString()) - entry.time = 0 + entry.timeLocal = DEFAULT_TIMESTAMP zipper.putNextEntry(entry) inputStream.copyTo(zipper, bufferSize = 1024) } -- cgit v1.2.3 From 7bb04967e091961f2a196a7aaf1b0340d7c2d1d1 Mon Sep 17 00:00:00 2001 From: nickreid Date: Thu, 13 Apr 2023 13:53:25 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111390 -> 2111379 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 129ef91..14cf79e 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From 7805c0de66863cbd0bc978d42389ed34efc89eb9 Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Tue, 2 May 2023 13:33:04 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111379 -> 2111390 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 14cf79e..129ef91 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From 93fc71f1086f2044194c9fa0f3b4b92bdb2fe569 Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Tue, 2 May 2023 13:35:15 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111390 -> 2111379 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 129ef91..6ff80d3 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From 5b321cccd7c0ee4c27864c58e41335b33f187be5 Mon Sep 17 00:00:00 2001 From: Kotlin Google Eng Date: Wed, 24 May 2023 15:08:50 -0700 Subject: include `default_applicable_licenses` to subpackages of `bazel_rules/rules_kotlin` package PiperOrigin-RevId: 534996173 Change-Id: If70094090f4e4e51692340cf9f09dcf00021b5c9 --- tools/BUILD | 4 +++- tools/java/com/google/devtools/kotlin/BUILD | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/BUILD b/tools/BUILD index 02f945c..812302f 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -17,7 +17,9 @@ load("//bazel:deploy_jar_freshness_golden_test.bzl", "deploy_jar_freshness_golde licenses(["notice"]) -package(default_visibility = ["//:internal"]) +package( + default_visibility = ["//:internal"], +) # JAR that contains a marker entry, for identifying apps built by rules_kotlin. genrule( diff --git a/tools/java/com/google/devtools/kotlin/BUILD b/tools/java/com/google/devtools/kotlin/BUILD index 544536b..0b7a223 100644 --- a/tools/java/com/google/devtools/kotlin/BUILD +++ b/tools/java/com/google/devtools/kotlin/BUILD @@ -16,7 +16,9 @@ load("//kotlin:rules.bzl", "kt_jvm_library") -package(default_visibility = ["//:internal"]) +package( + default_visibility = ["//:internal"], +) licenses(["notice"]) -- cgit v1.2.3 From d1eb7be05571b338df25ea9f794f4d971adf5ee7 Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Fri, 14 Jul 2023 10:52:17 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111379 -> 2111655 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 6ff80d3..6325694 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From 14a9b742231c8aab648ce22fa734fdf0d4274803 Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Fri, 14 Jul 2023 11:53:12 -0700 Subject: Fix SourceJarZipper to handle leading underscores and trailing comments. Also improve some existing regex and add some more invalid package name tests. PiperOrigin-RevId: 548184086 Change-Id: Ibca54f024fe0e506556b38824ff6a328b39254d8 --- tools/java/com/google/devtools/kotlin/SourceJarZipper.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt b/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt index 8748052..2ad7568 100644 --- a/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt +++ b/tools/java/com/google/devtools/kotlin/SourceJarZipper.kt @@ -42,6 +42,7 @@ import picocli.CommandLine.Spec ) class SourceJarZipper : Runnable { @Spec private lateinit var spec: CommandSpec + override fun run() { throw ParameterException(spec.commandLine(), "Specify a command: zip, zip_resources or unzip") } @@ -129,9 +130,11 @@ class Zip : Runnable { ) val commonSrcs = mutableListOf() - companion object { + private companion object { const val PACKAGE_SPACE = "package " - val PACKAGE_NAME_REGEX = "[a-zA-Z][a-zA-Z0-9_]*(\\.[a-zA-Z0-9_]+)*".toRegex() + // can't start with digit and can't be all underscores + val IDENTIFIER_REGEX = Regex("(?:[a-zA-Z]|_+[a-zA-Z0-9])\\w*") + val PACKAGE_NAME_REGEX = Regex("$IDENTIFIER_REGEX(?:\\.$IDENTIFIER_REGEX)*") } override fun run() { @@ -153,9 +156,14 @@ class Zip : Runnable { // Kotlin allows usage of reserved words in package names framing them // with backquote symbol "`" val packageName = - line.substring(PACKAGE_SPACE.length).trim().replace(";", "").replace("`", "") + line + .removePrefix(PACKAGE_SPACE) + .substringBefore("//") + .trim() + .removeSuffix(";") + .replace(Regex("\\B`(.+?)`\\B"), "$1") if (!PACKAGE_NAME_REGEX.matches(packageName)) { - errors.add("${this} contains an invalid package name") + errors.add("$this contains an invalid package name") return this.fileName } return Paths.get(packageName.replace(".", "/")).resolve(this.fileName) -- cgit v1.2.3 From b72789f6fd2738e461830defdb4e8fc94d386797 Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Mon, 17 Jul 2023 10:29:20 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111655 -> 2111658 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 6325694..1bcfa6f 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3 From dd11338bc0a42254a426725960107badc52e67b6 Mon Sep 17 00:00:00 2001 From: Polina Mitrikovskaia Date: Mon, 17 Jul 2023 15:02:45 -0700 Subject: Rebuild source_jar_zipper_deploy.jar --- tools/bin/source_jar_zipper_deploy.jar | Bin 2111658 -> 2149157 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tools') diff --git a/tools/bin/source_jar_zipper_deploy.jar b/tools/bin/source_jar_zipper_deploy.jar index 1bcfa6f..b181e8a 100755 Binary files a/tools/bin/source_jar_zipper_deploy.jar and b/tools/bin/source_jar_zipper_deploy.jar differ -- cgit v1.2.3