Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration test for KSP processing #1165

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions .bazelproject
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ directories:

targets:
//:all_local_tests
# These targets are built for the ide only. Primary purpose is to ensure the builder can build the targets, but it's
# also a good way of testing the intellij plugin.
//src/main/kotlin/io/bazel/kotlin/builder/tasks:tasks_for_ide
//src/main/kotlin/io/bazel/kotlin/builder/utils:utils_for_ide
//src/main/kotlin/io/bazel/kotlin/builder/toolchain:toolchain_for_ide
//src/main/kotlin/io/bazel/kotlin/compiler:compiler_for_ide
//kotlin:stardoc
//src/main/starlark/core/repositories:all

Expand All @@ -35,6 +29,4 @@ additional_languages:
kotlin

import_run_configurations:
src/test/Bazel_all_local_tests.xml

android_sdk_platform: android-31
src/test/Bazel_all_local_tests.xml
3 changes: 2 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use_repo(
"rules_android",
)

# Once the released rules_koltin is defined, configure it.
# Once the released rules_kotlin is defined, configure it.
rules_kotlin_bootstrap_extensions = use_extension(
"//src/main/starlark/core/repositories:bzlmod_bootstrap.bzl",
"rules_kotlin_bootstrap_extensions",
Expand Down Expand Up @@ -76,6 +76,7 @@ maven.install(
"com.squareup.moshi:moshi-kotlin:1.15.0",
"com.squareup.moshi:moshi-kotlin-codegen:1.15.0",
"com.google.auto.service:auto-service-annotations:jar:1.1.1",
"org.apache.commons:commons-compress:1.26.1",
],
fail_if_repin_required = True,
fetch_sources = True,
Expand Down
5 changes: 2 additions & 3 deletions examples/ksp/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@rules_java//java:defs.bzl", "java_binary", "java_plugin")

# Copyright 2018 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -14,6 +11,8 @@ load("@rules_java//java:defs.bzl", "java_binary", "java_plugin")
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@rules_java//java:defs.bzl", "java_binary", "java_plugin")
load("@rules_kotlin//kotlin:core.bzl", "define_kt_toolchain", "kt_compiler_plugin", "kt_ksp_plugin", "kt_plugin_cfg")
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")

Expand Down
126 changes: 120 additions & 6 deletions kotlin_rules_maven_install.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -763710014,
"__RESOLVED_ARTIFACTS_HASH": -640184638,
"__INPUT_ARTIFACTS_HASH": 131470593,
"__RESOLVED_ARTIFACTS_HASH": -1372986127,
"conflict_resolution": {
"com.google.auto.service:auto-service-annotations:1.0.1": "com.google.auto.service:auto-service-annotations:1.1.1",
"com.google.guava:guava:27.1-jre": "com.google.guava:guava:32.1.1-jre"
Expand Down Expand Up @@ -217,6 +217,20 @@
},
"version": "1.13.2"
},
"commons-codec:commons-codec": {
"shasums": {
"jar": "ec87bfb55f22cbd1b21e2190eeda28b2b312ed2a431ee49fbdcc01812d04a5e4",
"sources": "1b9d7336bef950cd45dbefd5351222ee88e4efde09a9454e851a458c34f813be"
},
"version": "1.16.1"
},
"commons-io:commons-io": {
"shasums": {
"jar": "a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154",
"sources": "50cb24bb83c1edcb1c1007a4b6c7ea024c71ac0fa018b80a57391d7c7b5b8246"
},
"version": "2.15.1"
},
"dev.zacsweers.autoservice:auto-service-ksp": {
"shasums": {
"jar": "290457e26274b41f625f96b24e033dd18639c6353a6f81304f0a15e2b22eec35",
Expand Down Expand Up @@ -280,12 +294,19 @@
},
"version": "1.9.9"
},
"org.apache.commons:commons-compress": {
"shasums": {
"jar": "27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04",
"sources": "767c5e39eb93f7c460926278a2aa7a7cec146aa1f32f8b6664a56acfdcc2e812"
},
"version": "1.26.1"
},
"org.apache.commons:commons-lang3": {
"shasums": {
"jar": "734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b",
"sources": "4709f16a9e0f8fd83ae155083d63044e23045aac8f6f0183a2db09f492491b12"
"jar": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c",
"sources": "ab3b86afb898f1026dbe43aaf71e9c1d719ec52d6e41887b362d86777c299b6f"
},
"version": "3.4"
"version": "3.14.0"
},
"org.apache.maven:maven-artifact": {
"shasums": {
Expand Down Expand Up @@ -593,6 +614,11 @@
"org.apache.ant:ant": [
"org.apache.ant:ant-launcher"
],
"org.apache.commons:commons-compress": [
"commons-codec:commons-codec",
"commons-io:commons-io",
"org.apache.commons:commons-lang3"
],
"org.apache.maven:maven-artifact": [
"org.apache.commons:commons-lang3",
"org.codehaus.plexus:plexus-utils"
Expand Down Expand Up @@ -943,6 +969,32 @@
"com.squareup:kotlinpoet-ksp": [
"com.squareup.kotlinpoet.ksp"
],
"commons-codec:commons-codec": [
"org.apache.commons.codec",
"org.apache.commons.codec.binary",
"org.apache.commons.codec.cli",
"org.apache.commons.codec.digest",
"org.apache.commons.codec.language",
"org.apache.commons.codec.language.bm",
"org.apache.commons.codec.net"
],
"commons-io:commons-io": [
"org.apache.commons.io",
"org.apache.commons.io.build",
"org.apache.commons.io.channels",
"org.apache.commons.io.charset",
"org.apache.commons.io.comparator",
"org.apache.commons.io.file",
"org.apache.commons.io.file.attribute",
"org.apache.commons.io.file.spi",
"org.apache.commons.io.filefilter",
"org.apache.commons.io.function",
"org.apache.commons.io.input",
"org.apache.commons.io.input.buffer",
"org.apache.commons.io.monitor",
"org.apache.commons.io.output",
"org.apache.commons.io.serialization"
],
"dev.zacsweers.autoservice:auto-service-ksp": [
"dev.zacsweers.autoservice.ksp"
],
Expand Down Expand Up @@ -1070,19 +1122,63 @@
"org.apache.ant:ant-launcher": [
"org.apache.tools.ant.launch"
],
"org.apache.commons:commons-compress": [
"org.apache.commons.compress",
"org.apache.commons.compress.archivers",
"org.apache.commons.compress.archivers.ar",
"org.apache.commons.compress.archivers.arj",
"org.apache.commons.compress.archivers.cpio",
"org.apache.commons.compress.archivers.dump",
"org.apache.commons.compress.archivers.examples",
"org.apache.commons.compress.archivers.jar",
"org.apache.commons.compress.archivers.sevenz",
"org.apache.commons.compress.archivers.tar",
"org.apache.commons.compress.archivers.zip",
"org.apache.commons.compress.changes",
"org.apache.commons.compress.compressors",
"org.apache.commons.compress.compressors.brotli",
"org.apache.commons.compress.compressors.bzip2",
"org.apache.commons.compress.compressors.deflate",
"org.apache.commons.compress.compressors.deflate64",
"org.apache.commons.compress.compressors.gzip",
"org.apache.commons.compress.compressors.lz4",
"org.apache.commons.compress.compressors.lz77support",
"org.apache.commons.compress.compressors.lzma",
"org.apache.commons.compress.compressors.lzw",
"org.apache.commons.compress.compressors.pack200",
"org.apache.commons.compress.compressors.snappy",
"org.apache.commons.compress.compressors.xz",
"org.apache.commons.compress.compressors.z",
"org.apache.commons.compress.compressors.zstandard",
"org.apache.commons.compress.harmony",
"org.apache.commons.compress.harmony.archive.internal.nls",
"org.apache.commons.compress.harmony.pack200",
"org.apache.commons.compress.harmony.unpack200",
"org.apache.commons.compress.harmony.unpack200.bytecode",
"org.apache.commons.compress.harmony.unpack200.bytecode.forms",
"org.apache.commons.compress.java.util.jar",
"org.apache.commons.compress.parallel",
"org.apache.commons.compress.utils"
],
"org.apache.commons:commons-lang3": [
"org.apache.commons.lang3",
"org.apache.commons.lang3.arch",
"org.apache.commons.lang3.builder",
"org.apache.commons.lang3.compare",
"org.apache.commons.lang3.concurrent",
"org.apache.commons.lang3.concurrent.locks",
"org.apache.commons.lang3.event",
"org.apache.commons.lang3.exception",
"org.apache.commons.lang3.function",
"org.apache.commons.lang3.math",
"org.apache.commons.lang3.mutable",
"org.apache.commons.lang3.reflect",
"org.apache.commons.lang3.stream",
"org.apache.commons.lang3.text",
"org.apache.commons.lang3.text.translate",
"org.apache.commons.lang3.time",
"org.apache.commons.lang3.tuple"
"org.apache.commons.lang3.tuple",
"org.apache.commons.lang3.util"
],
"org.apache.maven:maven-artifact": [
"org.apache.maven.artifact",
Expand Down Expand Up @@ -1423,6 +1519,10 @@
"com.squareup:kotlinpoet-ksp",
"com.squareup:kotlinpoet-ksp:jar:sources",
"com.squareup:kotlinpoet:jar:sources",
"commons-codec:commons-codec",
"commons-codec:commons-codec:jar:sources",
"commons-io:commons-io",
"commons-io:commons-io:jar:sources",
"dev.zacsweers.autoservice:auto-service-ksp",
"dev.zacsweers.autoservice:auto-service-ksp:jar:sources",
"javax.annotation:javax.annotation-api",
Expand All @@ -1441,6 +1541,8 @@
"org.apache.ant:ant-launcher",
"org.apache.ant:ant-launcher:jar:sources",
"org.apache.ant:ant:jar:sources",
"org.apache.commons:commons-compress",
"org.apache.commons:commons-compress:jar:sources",
"org.apache.commons:commons-lang3",
"org.apache.commons:commons-lang3:jar:sources",
"org.apache.maven:maven-artifact",
Expand Down Expand Up @@ -1556,6 +1658,10 @@
"com.squareup:kotlinpoet-ksp",
"com.squareup:kotlinpoet-ksp:jar:sources",
"com.squareup:kotlinpoet:jar:sources",
"commons-codec:commons-codec",
"commons-codec:commons-codec:jar:sources",
"commons-io:commons-io",
"commons-io:commons-io:jar:sources",
"dev.zacsweers.autoservice:auto-service-ksp",
"dev.zacsweers.autoservice:auto-service-ksp:jar:sources",
"javax.annotation:javax.annotation-api",
Expand All @@ -1574,6 +1680,8 @@
"org.apache.ant:ant-launcher",
"org.apache.ant:ant-launcher:jar:sources",
"org.apache.ant:ant:jar:sources",
"org.apache.commons:commons-compress",
"org.apache.commons:commons-compress:jar:sources",
"org.apache.commons:commons-lang3",
"org.apache.commons:commons-lang3:jar:sources",
"org.apache.maven:maven-artifact",
Expand Down Expand Up @@ -1689,6 +1797,10 @@
"com.squareup:kotlinpoet-ksp",
"com.squareup:kotlinpoet-ksp:jar:sources",
"com.squareup:kotlinpoet:jar:sources",
"commons-codec:commons-codec",
"commons-codec:commons-codec:jar:sources",
"commons-io:commons-io",
"commons-io:commons-io:jar:sources",
"dev.zacsweers.autoservice:auto-service-ksp",
"dev.zacsweers.autoservice:auto-service-ksp:jar:sources",
"javax.annotation:javax.annotation-api",
Expand All @@ -1707,6 +1819,8 @@
"org.apache.ant:ant-launcher",
"org.apache.ant:ant-launcher:jar:sources",
"org.apache.ant:ant:jar:sources",
"org.apache.commons:commons-compress",
"org.apache.commons:commons-compress:jar:sources",
"org.apache.commons:commons-lang3",
"org.apache.commons:commons-lang3:jar:sources",
"org.apache.maven:maven-artifact",
Expand Down
18 changes: 18 additions & 0 deletions src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ kt_jvm_test(
],
)

kt_jvm_test(
name = "KspCompileTest",
srcs = [
"KspCompileTest.kt",
],
resources = [
"//:rules_kotlin_release.tgz",
],
test_class = "io.bazel.kotlin.integration.KspCompileTest",
deps = [
":lib",
"//kotlin/compiler:kotlin-test",
"@kotlin_rules_maven//:com_google_truth_truth",
"@kotlin_rules_maven//:junit_junit",
"@kotlin_rules_maven//:org_apache_commons_commons_compress",
],
)

kt_jvm_test(
name = "MixedSourceCompileTest",
srcs = ["MixedSourceCompileTest.kt"],
Expand Down