Support Kotlin 1.8 (#910)

Bencodes · web-flow · commit 113e91bb34bb · 2023-01-20T15:10:23.000-06:00
* Support Kotlin 1.8
* Update Anvil to 2.4.3-1-8-0-RC
* Use the latest compose release
diff --git a/examples/anvil/BUILD.bazel b/examples/anvil/BUILD.bazel
@@ -2,6 +2,5 @@ load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")
 
 define_kt_toolchain(
     name = "kotlin_toolchain",
-    api_version = "1.6",
-    language_version = "1.6",
+    jvm_target = "1.8",
 )
diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE
@@ -60,8 +60,8 @@ maven_install(
         "com.google.dagger:dagger:2.44.2",
         "com.google.dagger:dagger-compiler:2.44.2",
         "com.google.dagger:dagger-producers:2.44.2",
-        "com.squareup.anvil:compiler:2.4.3",
-        "com.squareup.anvil:annotations:2.4.3",
+        "com.squareup.anvil:compiler:2.4.4",
+        "com.squareup.anvil:annotations:2.4.4",
         "androidx.activity:activity:1.0.0",
         "androidx.annotation:annotation:1.1.0",
         "androidx.appcompat:appcompat-resources:1.1.0",
@@ -76,7 +76,6 @@ maven_install(
         "androidx.cursoradapter:cursoradapter:1.0.0",
         "androidx.customview:customview:1.0.0",
         "androidx.drawerlayout:drawerlayout:1.0.0",
-        "androidx.fragment:fragment:1.0.0",
         "androidx.fragment:fragment:1.1.0",
         "androidx.interpolator:interpolator:1.0.0",
         "androidx.lifecycle:lifecycle-common:2.1.0",
diff --git a/examples/jetpack_compose/BUILD b/examples/jetpack_compose/BUILD
@@ -10,9 +10,7 @@ default_java_toolchain(
 
 define_kt_toolchain(
     name = "kotlin_toolchain",
-    api_version = "1.6",
     jvm_target = "1.8",
-    language_version = "1.6",
 )
 
 # Define the compose compiler plugin
diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE
@@ -2,11 +2,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 _COMPOSE_VERSION = "1.2.1"
 
-_COMPOSE_COMPILER_VERSION = "1.3.2"
+_COMPOSE_COMPILER_VERSION = "1.4.0"
 
-_KOTLIN_COMPILER_VERSION = "1.7.20"
+_KOTLIN_COMPILER_VERSION = "1.8.0"
 
-_KOTLIN_COMPILER_SHA = "5e3c8d0f965410ff12e90d6f8dc5df2fc09fd595a684d514616851ce7e94ae7d"
+_KOTLIN_COMPILER_SHA = "0bb9419fac9832a56a3a19cad282f8f2d6f1237d2d467dc8dfe9bd4a2a43c42e"
 
 # Setup Kotlin
 
diff --git a/kotlin/internal/opts.bzl b/kotlin/internal/opts.bzl
@@ -13,13 +13,13 @@
 # limitations under the License.
 
 load(
-    "@rkt_1_7//starlark/kotlin:opts.bzl",
+    "@rkt_1_8//starlark/kotlin:opts.bzl",
     _KotlincOptions = "KotlincOptions",
     _kotlinc_options_to_flags = "kotlinc_options_to_flags",
     _kt_kotlinc_options = "kt_kotlinc_options",
 )
 load(
-    "@rkt_1_7//starlark/jvm:opts.bzl",
+    "@rkt_1_8//starlark/jvm:opts.bzl",
     _JavacOptions = "JavacOptions",
     _javac_options_to_flags = "javac_options_to_flags",
     _kt_javac_options = "kt_javac_options",
diff --git a/kotlin/internal/toolchains.bzl b/kotlin/internal/toolchains.bzl
@@ -119,7 +119,7 @@ _kt_toolchain = rule(
         ),
         "language_version": attr.string(
             doc = "this is the -language_version flag [see](https://kotlinlang.org/docs/reference/compatibility.html)",
-            default = "1.7",
+            default = "1.8",
             values = [
                 "1.1",
                 "1.2",
@@ -132,7 +132,7 @@ _kt_toolchain = rule(
         ),
         "api_version": attr.string(
             doc = "this is the -api_version flag [see](https://kotlinlang.org/docs/reference/compatibility.html).",
-            default = "1.7",
+            default = "1.8",
             values = [
                 "1.1",
                 "1.2",
@@ -141,6 +141,7 @@ _kt_toolchain = rule(
                 "1.5",
                 "1.6",
                 "1.7",
+                "1.8",
             ],
         ),
         "debug": attr.string_list(
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/tasks/js/Kotlin2JsTaskExecutor.kt b/src/main/kotlin/io/bazel/kotlin/builder/tasks/js/Kotlin2JsTaskExecutor.kt
@@ -50,6 +50,7 @@ class Kotlin2JsTaskExecutor @Inject constructor(
       it.addAll(passThroughFlagsList)
       it.addAll("-libraries", inputs.librariesList.joinToString(":"))
       it.addAll("-output", outputs.js)
+      it.addAll("-Xuse-deprecated-legacy-compiler")
       it.addAll(inputs.kotlinSourcesList)
     }
     context.whenTracing { printLines("js compile args", args) }
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/SkipCodeGen.kt b/src/main/kotlin/io/bazel/kotlin/plugin/SkipCodeGen.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 /**
  *  SkipCodeGen registers an extension to skip code generation. Must be the last compiler plugin.
  */
+@OptIn(org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi::class)
 class SkipCodeGen : ComponentRegistrar {
 
   companion object {
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenCommandLineProcessor.kt b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenCommandLineProcessor.kt
@@ -7,6 +7,7 @@ import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
 
+@OptIn(org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi::class)
 class JdepsGenCommandLineProcessor : CommandLineProcessor {
   companion object {
     val COMPILER_PLUGIN_ID = "io.bazel.kotlin.plugin.jdeps.JDepsGen"
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenComponentRegistrar.kt b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/JdepsGenComponentRegistrar.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 
+@OptIn(org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi::class)
 class JdepsGenComponentRegistrar : ComponentRegistrar {
 
   override fun registerProjectComponents(
diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl
@@ -60,18 +60,21 @@ versions = struct(
         sha256 = "5f6412986b351cc569baa6cfde2e8ff8bc527a7bc15af4fe5a49cfd76b73b569",
     ),
     KOTLIN_CURRENT_COMPILER_RELEASE = version(
-        version = "1.7.22",
+        version = "1.8.0",
         url_templates = [
             "https://github.com/JetBrains/kotlin/releases/download/v{version}/kotlin-compiler-{version}.zip",
         ],
-        sha256 = "9db4b467743c1aea8a21c08e1c286bc2aeb93f14c7ba2037dbd8f48adc357d83",
+        sha256 = "0bb9419fac9832a56a3a19cad282f8f2d6f1237d2d467dc8dfe9bd4a2a43c42e",
     ),
     ANDROID = struct(
         VERSION = "0.1.1",
         SHA = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
         URLS = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % "0.1.1"],
     ),
     CORE = {
+        "rkt_1_8": struct(
+            prefix = "1.8",
+        ),
         "rkt_1_7": struct(
             prefix = "1.7",
         ),
diff --git a/src/rkt_1_8/BUILD.bazel b/src/rkt_1_8/BUILD.bazel
@@ -0,0 +1,13 @@
+load("@dev_io_bazel_rules_kotlin//src/main/starlark/release:packager.bzl", "release_archive")
+
+release_archive(
+    name = "pkg",
+    srcs = ["WORKSPACE"],
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+    deps = [
+        "//starlark/jvm:pkg",
+        "//starlark/kotlin:pkg",
+    ],
+)
diff --git a/src/rkt_1_8/BUILD.release.bazel b/src/rkt_1_8/BUILD.release.bazel
diff --git a/src/rkt_1_8/WORKSPACE b/src/rkt_1_8/WORKSPACE
@@ -0,0 +1 @@
+workspace(name = "rkt_1_8")
diff --git a/src/rkt_1_8/starlark/BUILD.bazel b/src/rkt_1_8/starlark/BUILD.bazel
@@ -0,0 +1,10 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "starlark",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//starlark/jvm",
+        "//starlark/kotlin",
+    ],
+)
diff --git a/src/rkt_1_8/starlark/jvm/BUILD.bazel b/src/rkt_1_8/starlark/jvm/BUILD.bazel
@@ -0,0 +1,24 @@
+load("@dev_io_bazel_rules_kotlin//src/main/starlark/release:packager.bzl", "release_archive")
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+exports_files(
+    ["opts.bzl"],
+    visibility = ["//visibility:public"],
+)
+
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+)
+
+bzl_library(
+    name = "jvm",
+    srcs = glob(["*.bzl"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "@dev_io_bazel_rules_kotlin//src/main/starlark",
+    ],
+)
diff --git a/src/rkt_1_8/starlark/jvm/BUILD.release.bazel b/src/rkt_1_8/starlark/jvm/BUILD.release.bazel
diff --git a/src/rkt_1_8/starlark/jvm/opts.bzl b/src/rkt_1_8/starlark/jvm/opts.bzl
@@ -0,0 +1,92 @@
+load("@dev_io_bazel_rules_kotlin//src/main/starlark/core/options:derive.bzl", "derive")
+load("@dev_io_bazel_rules_kotlin//src/main/starlark/core/options:convert.bzl", "convert")
+
+_JOPTS = {
+    "warn": struct(
+        args = dict(
+            default = "report",
+            doc = "Control warning behaviour.",
+            values = ["off", "report", "error"],
+        ),
+        type = attr.string,
+        value_to_flag = {
+            "off": ["-nowarn"],
+            "error": ["-Werror"],
+            "report": None,
+        },
+    ),
+    "x_ep_disable_all_checks": struct(
+        args = dict(
+            default = False,
+            doc = "See javac -XepDisableAllChecks documentation",
+        ),
+        type = attr.bool,
+        value_to_flag = {
+            True: ["-XepDisableAllChecks"],
+        },
+    ),
+    "x_lint": struct(
+        args = dict(
+            default = [],
+            doc = "See javac -Xlint: documentation",
+        ),
+        type = attr.string_list,
+        value_to_flag = {
+            derive.info: derive.repeated_values_for("-Xlint:"),
+        },
+    ),
+    "xd_suppress_notes": struct(
+        args = dict(
+            default = False,
+            doc = "See javac -XDsuppressNotes documentation",
+        ),
+        type = attr.bool,
+        value_to_flag = {
+            True: ["-XDsuppressNotes"],
+        },
+    ),
+    "x_explicit_api_mode": struct(
+        args = dict(
+            default = "off",
+            doc = "Enable explicit API mode for Kotlin libraries.",
+            values = ["off", "warning", "strict"],
+        ),
+        type = attr.string,
+        value_to_flag = {
+            "off": None,
+            "warning": ["-Xexplicit-api=warning"],
+            "strict": ["-Xexplicit-api=strict"],
+        },
+    ),
+}
+
+def _javac_options_impl(ctx):
+    return struct(
+        providers = [
+            JavacOptions(**{n: getattr(ctx.attr, n, None) for n in _JOPTS}),
+        ],
+    )
+
+JavacOptions = provider(
+    fields = {
+        name: o.args["doc"]
+        for name, o in _JOPTS.items()
+    },
+)
+
+kt_javac_options = rule(
+    implementation = _javac_options_impl,
+    doc = "Define java compiler options for `kt_jvm_*` rules with java sources.",
+    provides = [JavacOptions],
+    attrs = {n: o.type(**o.args) for n, o in _JOPTS.items()},
+)
+
+def javac_options_to_flags(javac_options):
+    """Translate JavacOptions to worker flags
+
+    Args:
+        javac_options of type JavacOptions or None
+    Returns:
+        list of flags to add to the command line.
+    """
+    return convert.javac_options_to_flags(_JOPTS, javac_options)
diff --git a/src/rkt_1_8/starlark/kotlin/BUILD.bazel b/src/rkt_1_8/starlark/kotlin/BUILD.bazel
@@ -0,0 +1,21 @@
+load("@dev_io_bazel_rules_kotlin//src/main/starlark/release:packager.bzl", "release_archive")
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+exports_files(
+    ["opts.bzl"],
+    visibility = ["//visibility:public"],
+)
+
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+)
+
+bzl_library(
+    name = "kotlin",
+    srcs = glob(["*.bzl"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/src/rkt_1_8/starlark/kotlin/BUILD.release.bazel b/src/rkt_1_8/starlark/kotlin/BUILD.release.bazel
diff --git a/src/rkt_1_8/starlark/kotlin/opts.bzl b/src/rkt_1_8/starlark/kotlin/opts.bzl
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/js/KotlinBuilderJsTest.java b/src/test/kotlin/io/bazel/kotlin/builder/tasks/js/KotlinBuilderJsTest.java

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@ load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")`
`2`	`2`
`3`	`3`	`define_kt_toolchain(`
`4`	`4`	`name = "kotlin_toolchain",`
`5`		`- api_version = "1.6",`
`6`		`- language_version = "1.6",`
	`5`	`+ jvm_target = "1.8",`
`7`	`6`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ default_java_toolchain(`
`10`	`10`
`11`	`11`	`define_kt_toolchain(`
`12`	`12`	`name = "kotlin_toolchain",`
`13`		`- api_version = "1.6",`
`14`	`13`	`jvm_target = "1.8",`
`15`		`- language_version = "1.6",`
`16`	`14`	`)`
`17`	`15`
`18`	`16`	`# Define the compose compiler plugin`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ class Kotlin2JsTaskExecutor @Inject constructor(`
`50`	`50`	`it.addAll(passThroughFlagsList)`
`51`	`51`	`it.addAll("-libraries", inputs.librariesList.joinToString(":"))`
`52`	`52`	`it.addAll("-output", outputs.js)`
	`53`	`+ it.addAll("-Xuse-deprecated-legacy-compiler")`
`53`	`54`	`it.addAll(inputs.kotlinSourcesList)`
`54`	`55`	`}`
`55`	`56`	`context.whenTracing { printLines("js compile args", args) }`