From 3f128acc789208430125e60bd30309d94c890bf1 Mon Sep 17 00:00:00 2001 From: Daniel Tereshchenko Date: Mon, 8 Apr 2024 09:23:46 +0000 Subject: [PATCH] [maintenance] Add android e2e tests to TC; roll back protobuf roll back protobuf to 3.25.3 add new e2e tests for Android and Android kotlin projects update TC config version Merge-request: BAZEL-MR-1001 Merged-by: Danil Tereshchenko --- .teamcity/settings.kts | 6 +++++- MODULE.bazel | 2 +- MODULE.bazel.lock | 8 ++++---- maven_install.json | 10 +++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index e8cb672fa..cb144e22e 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -5,7 +5,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs import jetbrains.buildServer.configs.kotlin.v2019_2.Project -version = "2023.11" +version = "2024.03" project(BazelBsp) @@ -32,6 +32,8 @@ object BazelBsp : Project({ buildType(BazelBspLocalBazelJdkTest) buildType(BazelBspRemoteBazelJdkTest) buildType(ServerDownloadsBazeliskTest) + buildType(AndroidProjectTest) + buildType(AndroidKotlinProjectTest) buildType(KotlinProjectTest) buildType(RegularBenchmark) } @@ -66,6 +68,8 @@ object BazelBsp : Project({ RelativeId("E2eTestsE2eRemoteJdkTest"), RelativeId("E2eTestsE2eServerDownloadsBazeliskTest"), RelativeId("E2eTestsE2eKotlinProjectTest"), + RelativeId("E2eTestsE2eAndroidProjectTest"), + RelativeId("E2eTestsE2eAndroidKotlinProjectTest"), RelativeId("Benchmark1001Targets"), RelativeId("BazelBspResults") ) diff --git a/MODULE.bazel b/MODULE.bazel index e0e022f93..bba842bbf 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -85,7 +85,7 @@ maven.install( "org.slf4j:slf4j-nop:1.7.36", # cannot be 2.0.0+ unless slf4j-api dependency in velocity-engine-core is 2.0.0+ "com.fasterxml.jackson.core:jackson-databind:2.17.0", "com.fasterxml.jackson.module:jackson-module-kotlin:2.16.2", - "com.google.protobuf:protobuf-java:4.26.1", + "com.google.protobuf:protobuf-java:3.25.3", "io.grpc:grpc-stub:1.63.0", "io.grpc:grpc-protobuf:1.63.0", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 51c549616..e7cd1ec7a 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "8f384de6c7214d0941c7adfc992e460d286cde9e512d31158f74dfde82dcee9b", + "moduleFileHash": "146cc37ec8514605963ea29442744d832566434a5bebc18d2f2d7666ed8bc151", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -139,7 +139,7 @@ "org.slf4j:slf4j-nop:1.7.36", "com.fasterxml.jackson.core:jackson-databind:2.17.0", "com.fasterxml.jackson.module:jackson-module-kotlin:2.16.2", - "com.google.protobuf:protobuf-java:4.26.1", + "com.google.protobuf:protobuf-java:3.25.3", "io.grpc:grpc-stub:1.63.0", "io.grpc:grpc-protobuf:1.63.0", "org.junit.jupiter:junit-jupiter:5.10.2", @@ -4105,7 +4105,7 @@ "{ \"group\": \"org.slf4j\", \"artifact\": \"slf4j-nop\", \"version\": \"1.7.36\" }", "{ \"group\": \"com.fasterxml.jackson.core\", \"artifact\": \"jackson-databind\", \"version\": \"2.17.0\" }", "{ \"group\": \"com.fasterxml.jackson.module\", \"artifact\": \"jackson-module-kotlin\", \"version\": \"2.16.2\" }", - "{ \"group\": \"com.google.protobuf\", \"artifact\": \"protobuf-java\", \"version\": \"4.26.1\" }", + "{ \"group\": \"com.google.protobuf\", \"artifact\": \"protobuf-java\", \"version\": \"3.25.3\" }", "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-stub\", \"version\": \"1.63.0\" }", "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-protobuf\", \"version\": \"1.63.0\" }", "{ \"group\": \"org.junit.jupiter\", \"artifact\": \"junit-jupiter\", \"version\": \"5.10.2\" }", @@ -6463,7 +6463,7 @@ "{ \"group\": \"org.slf4j\", \"artifact\": \"slf4j-nop\", \"version\": \"1.7.36\" }", "{ \"group\": \"com.fasterxml.jackson.core\", \"artifact\": \"jackson-databind\", \"version\": \"2.17.0\" }", "{ \"group\": \"com.fasterxml.jackson.module\", \"artifact\": \"jackson-module-kotlin\", \"version\": \"2.16.2\" }", - "{ \"group\": \"com.google.protobuf\", \"artifact\": \"protobuf-java\", \"version\": \"4.26.1\" }", + "{ \"group\": \"com.google.protobuf\", \"artifact\": \"protobuf-java\", \"version\": \"3.25.3\" }", "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-stub\", \"version\": \"1.63.0\" }", "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-protobuf\", \"version\": \"1.63.0\" }", "{ \"group\": \"org.junit.jupiter\", \"artifact\": \"junit-jupiter\", \"version\": \"5.10.2\" }", diff --git a/maven_install.json b/maven_install.json index 270056bc8..942b58da3 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1901928072, - "__RESOLVED_ARTIFACTS_HASH": 1592221676, + "__INPUT_ARTIFACTS_HASH": 1760165926, + "__RESOLVED_ARTIFACTS_HASH": -108836618, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.10.1", "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.23.0", @@ -117,10 +117,10 @@ }, "com.google.protobuf:protobuf-java": { "shasums": { - "jar": "091933e5870af810748326f7ace4a673aca721253177542842f044b546f14282", - "sources": "a7af45fee27cce2996790a10186fd743ae0fd31b18eba9bcd00deecbf906e445" + "jar": "e90d8ddb963b20a972a6a59b5093ade2b07cbe546cab3279aaf4383260385f58", + "sources": "1bc9c4b7f5f5a89781ba06ca23ac651b979c3bfd93b2d60d8156ec2389017392" }, - "version": "4.26.1" + "version": "3.25.3" }, "com.google.truth:truth": { "shasums": {