Revert "remove opt-in from this PR and extraneous files"

This reverts commit 2945fa7.
jeffzoch · Dec 4, 2020 · cb5de1c · cb5de1c
1 parent 9dcdc12
commit cb5de1c
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 1 deletion.
diff --git a/examples/anvil/app/.gradle/6.6.1/fileChanges/last-build.bin b/examples/anvil/app/.gradle/6.6.1/fileChanges/last-build.bin
diff --git a/examples/anvil/app/.gradle/6.6.1/fileHashes/fileHashes.lock b/examples/anvil/app/.gradle/6.6.1/fileHashes/fileHashes.lock
diff --git a/examples/anvil/app/.gradle/6.6.1/gc.properties b/examples/anvil/app/.gradle/6.6.1/gc.properties
diff --git a/examples/anvil/app/.gradle/checksums/checksums.lock b/examples/anvil/app/.gradle/checksums/checksums.lock
diff --git a/examples/anvil/app/.gradle/configuration-cache/gc.properties b/examples/anvil/app/.gradle/configuration-cache/gc.properties
diff --git a/examples/anvil/app/.gradle/vcs-1/gc.properties b/examples/anvil/app/.gradle/vcs-1/gc.properties
diff --git a/kotlin/internal/jvm/compile.bzl b/kotlin/internal/jvm/compile.bzl
@@ -194,6 +194,8 @@ def _kotlinc_options_provider_to_flags(opts):
         flags.append("-Xinline-classes")
     if opts.x_allow_result_return_type:
         flags.append("-Xallow-result-return-type")
+    if opts.x_opt_in:
+        flags.extend(["-Xopt-in=%s" % check for check in opts.x_opt_in])
     return flags
 
 def _javac_options_provider_to_flags(opts):

diff --git a/kotlin/internal/opts.bzl b/kotlin/internal/opts.bzl
@@ -59,7 +59,7 @@ _KOPTS = {
     "x_allow_result_return_type": struct(
         args = dict(
             default = False,
-            doc = "Enable kotlin.Result as a return type",
+            doc = "Enable result in return types",
         ),
         type = attr.bool,
     ),