Kevin Gessner kevingessner

## diff.patch
diff --git a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
index 711cdd199e..713d6886d8 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
@@ -46,6 +46,7 @@ import io.grpc.Status.Code;
 import io.grpc.StatusRuntimeException;
 import io.netty.util.AbstractReferenceCounted;
 import io.netty.util.ReferenceCounted;
+import java.io.FileOutputStream;
 import java.io.IOException;

## ensure-bazel-test-targets.sh
#!/bin/bash

# Checks if all Java and Scala test files in the repository have corresponding Bazel test targets.  If not, prints the names of
# the missing ones and exits 1.
#
# Unlike gradle, Bazel does not automatically discover new test files.  This script will help us ensure that we don't
# have test files lingering that aren't being executed.

set -euo pipefail

## bazel.diff
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index 025812d..0e7b2a3 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -130,6 +130,73 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
   }

   @Test
+  public void testJavaRuntimeProviderJavaLauncher() throws Exception {
+    scratch.file(

## gist:87247b7c5f6c7b01dcf92c44a3bc635c
### Keybase proof

I hereby claim:

  * I am kevingessner on github.
  * I am kevingessner (https://keybase.io/kevingessner) on keybase.
  * I have a public key ASDvVDzG9JX8GS71KJqEOjbArV_DzfV0jpt8mr25cS334Qo

To claim this, I am signing this object:

## java.bzl
JAVACOPTS = [ ... ]

def java_library(javacopts = [], **kwargs):
    """Loaded by prelude_bazel to shadow the existing `java_library` and add additional javacopts when building local java code."""
    updated_opts = []
    updated_opts += javacopts
    if native.repository_name() == "@":
        # When building any java target in our repository (i.e. not ones that are loaded into the WORKSPACE with
        # http_archive and friends), apply our javac options.  We don't apply them to external code because that code
        # may not adhere to our rules.

## patch.diff
diff --git a/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala b/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala
index c8fe497..cc1e42a 100644
--- a/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala
+++ b/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala
@@ -21,6 +21,7 @@ class NormalizerTest extends FunSuite  {
     val bird1 = "a:bird:1.0"
     val bird2 = "a:bird:2.0"
     val seed1 = "a:seed:1.0"
+    val dog1 = "a:dog:1.0"
     /**

## lol.php
<?php

class × {
    static function ¼($n) {
        return $n/4;
    }

    static function ½($n) {
        return $n/2;
    }

## index.html
<!DOCTYPE html>
<html>
    <head>
        <title>Sea Change</title>
        <style>
            body {
                background: #335;
                text-align: center;
            }
        </style>

## gist:9509148
<html>
  <head>
    <style type="text/css">
    table table {
      width: 600px !important;
    }
    table div + div { /* main content */
      width: 65%;
      float: left;
    }

## gist:9274224
php > $a = [['foo' => 'bar']];
php > foreach ($a as $b) $b['foo'] = 'quux';
php > print_r($a);
Array
(
    [0] => Array
        (
            [foo] => bar
        )
	diff --git a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
	index 711cdd199e..713d6886d8 100644
	--- a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
	+++ b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
	@@ -46,6 +46,7 @@ import io.grpc.Status.Code;
	import io.grpc.StatusRuntimeException;
	import io.netty.util.AbstractReferenceCounted;
	import io.netty.util.ReferenceCounted;
	+import java.io.FileOutputStream;
	import java.io.IOException;
	#!/bin/bash

	# Checks if all Java and Scala test files in the repository have corresponding Bazel test targets. If not, prints the names of
	# the missing ones and exits 1.
	#
	# Unlike gradle, Bazel does not automatically discover new test files. This script will help us ensure that we don't
	# have test files lingering that aren't being executed.

	set -euo pipefail
	diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
	index 025812d..0e7b2a3 100644
	--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
	+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
	@@ -130,6 +130,73 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
	}

	@Test
	+ public void testJavaRuntimeProviderJavaLauncher() throws Exception {
	+ scratch.file(
	### Keybase proof

	I hereby claim:

	* I am kevingessner on github.
	* I am kevingessner (https://keybase.io/kevingessner) on keybase.
	* I have a public key ASDvVDzG9JX8GS71KJqEOjbArV_DzfV0jpt8mr25cS334Qo

	To claim this, I am signing this object:
	JAVACOPTS = [ ... ]

	def java_library(javacopts = [], **kwargs):
	"""Loaded by prelude_bazel to shadow the existing `java_library` and add additional javacopts when building local java code."""
	updated_opts = []
	updated_opts += javacopts
	if native.repository_name() == "@":
	# When building any java target in our repository (i.e. not ones that are loaded into the WORKSPACE with
	# http_archive and friends), apply our javac options. We don't apply them to external code because that code
	# may not adhere to our rules.
	diff --git a/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala b/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala
	index c8fe497..cc1e42a 100644
	--- a/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala
	+++ b/test/scala/com/github/johnynek/bazel_deps/NormalizerTest.scala
	@@ -21,6 +21,7 @@ class NormalizerTest extends FunSuite {
	val bird1 = "a:bird:1.0"
	val bird2 = "a:bird:2.0"
	val seed1 = "a:seed:1.0"
	+ val dog1 = "a:dog:1.0"
	/**
	<?php

	class × {
	static function ¼($n) {
	return $n/4;
	}

	static function ½($n) {
	return $n/2;
	}
	<!DOCTYPE html>
	<html>
	<head>
	<title>Sea Change</title>
	<style>
	body {
	background: #335;
	text-align: center;
	}
	</style>
	<html>
	<head>
	<style type="text/css">
	table table {
	width: 600px !important;
	}
	table div + div { /* main content */
	width: 65%;
	float: left;
	}
	php > $a = [['foo' => 'bar']];
	php > foreach ($a as $b) $b['foo'] = 'quux';
	php > print_r($a);
	Array
	(
	[0] => Array
	(
	[foo] => bar
	)