From 7841f7947817af7a9eced047337165780297c88b Mon Sep 17 00:00:00 2001 From: Lim Min Kuan Date: Mon, 9 May 2022 23:58:54 +0800 Subject: [PATCH] Use rules_kotlin >= 1.5.0 format changes --- .../grab/grazel/bazel/rules/KotlinRules.kt | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/KotlinRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/KotlinRules.kt index b6a3668c..e8054f2f 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/KotlinRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/KotlinRules.kt @@ -58,14 +58,18 @@ fun StatementsBuilder.kotlinCompiler( KOTLINC_RELEASE_SHA eq kotlinCompilerReleaseSha.quote() newLine() - KOTLINC_RELEASE eq obj { - "urls".quote() eq array( - """"https://github.com/JetBrains/kotlin/releases/download/v{v}/kotlin-compiler-{v}.zip".format(v = $KOTLIN_VERSION)""" - ) - "sha256".quote() eq KOTLINC_RELEASE_SHA - } + load( + "@io_bazel_rules_kotlin//kotlin:repositories.bzl", + "kotlin_repositories", + "kotlinc_version" + ) + + KOTLINC_RELEASE eq """kotlinc_version( + release = $KOTLIN_VERSION, + sha256 = $KOTLINC_RELEASE_SHA + ) + """.trimIndent() - load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories") add("""kotlin_repositories(compiler_release = $KOTLINC_RELEASE)""") } @@ -99,7 +103,7 @@ fun StatementsBuilder.rootKotlinSetup( val kotlinCTarget = "kt_kotlinc_options" val javaTarget = "kt_javac_options" load( - "@io_bazel_rules_kotlin//kotlin:kotlin.bzl", + "@io_bazel_rules_kotlin//kotlin:core.bzl", javaTarget, kotlinCTarget, "define_kt_toolchain" @@ -138,7 +142,7 @@ fun StatementsBuilder.loadKtRules( "kt_db_android_library" ) isAndroid -> load("@$GRAB_BAZEL_COMMON//tools/kotlin:android.bzl", "kt_android_library") - isJvm -> load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") + isJvm -> load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") } }