diff --git a/.gitignore b/.gitignore index 00eefa9b6..e3feb1bef 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,3 @@ bin # Vim .*.sw[nop] -# Vogar benchmarks -vogar-results/* diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9687414e..20f85f611 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,8 @@ [versions] bnd = "6.4.0" bouncycastle = "1.67" -caliper = "1.0-beta-2" errorprone = "2.31.0" jacoco = "0.8.12" -jmh = "1.37" -jmh-plugin = "0.7.2" junit = "4.13.2" mockito = "2.28.2" netty-handler = "4.1.24.Final" @@ -14,13 +11,9 @@ shadow = "7.1.2" [plugins] bnd = { id = "biz.aQute.bnd.builder", version.ref = "bnd" } -jmh = { id = "me.champeau.jmh", version.ref = "jmh-plugin" } shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } [libraries] -# Android tooling -caliper = { module = "com.google.caliper:caliper", version.ref = "caliper" } - # Bouncycastle bouncycastle-apis = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastle" } bouncycastle-provider = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" } @@ -32,13 +25,6 @@ jacoco-ant = { module = "org.jacoco:org.jacoco.ant", version.ref = "jacoco" } junit = { module = "junit:junit", version.ref = "junit" } mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" } -# JMH Benchmarking -jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } -jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } -jmh-generator-bytecode = { module = "org.openjdk.jmh:jmh-generator-bytecode", version.ref = "jmh" } -jmh-generator-reflection = { module = "org.openjdk.jmh:jmh-generator-reflection", version.ref = "jmh" } - # Netty netty-handler = { module = "io.netty:netty-handler", version.ref = "netty-handler" } netty-tcnative = { module = "io.netty:netty-tcnative-boringssl-static", version.ref = "netty-tcnative" } - diff --git a/openjdk/build.gradle b/openjdk/build.gradle index b63b4c8de..763024867 100644 --- a/openjdk/build.gradle +++ b/openjdk/build.gradle @@ -126,10 +126,6 @@ ext { assert !nativeBuilds.isEmpty() : "No native builds selected." assert buildToTest != null : "No test build selected for os.arch = ${osdetector.arch}" - - // Compatibility with other sub-projects - preferredSourceSet = buildToTest.mavenClassifier() - preferredNativeFileDir = buildToTest.nativeResourcesDir() } // Since we're not taking a direct dependency on the constants module, we need to add an @@ -160,8 +156,6 @@ sourceSets { } resources { srcDirs += "${rootDir}/common/src/test/resources" - // This shouldn't be needed but seems to help IntelliJ locate the native artifact. - // srcDirs += preferredNativeFileDir srcDirs += buildToTest.nativeResourcesDir() } } @@ -288,7 +282,7 @@ dependencies { libs.junit, libs.mockito - testRuntimeOnly sourceSets["$preferredSourceSet"].output + testRuntimeOnly sourceSets[buildToTest.mavenClassifier()].output platformCompileOnly sourceSets.main.output } diff --git a/settings.gradle b/settings.gradle index 830dc8e7a..7cfcc6792 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,31 +18,23 @@ if (System.env.ANDROID_HOME && file(System.env.ANDROID_HOME).exists()) { include ":conscrypt-android" include ":conscrypt-android-platform" include ":conscrypt-android-stub" - include ":conscrypt-benchmark-android" include ":conscrypt-libcore-stub" project(':conscrypt-android').projectDir = "$rootDir/android" as File project(':conscrypt-android-platform').projectDir = "$rootDir/platform" as File project(':conscrypt-android-stub').projectDir = "$rootDir/android-stub" as File - project(':conscrypt-benchmark-android').projectDir = "$rootDir/benchmark-android" as File project(':conscrypt-libcore-stub').projectDir = "$rootDir/libcore-stub" as File } else { logger.warn('Android SDK has not been detected. Skipping Android projects.') } include ":conscrypt-api-doclet" -include ":conscrypt-benchmark-base" -include ":conscrypt-benchmark-graphs" -include ":conscrypt-benchmark-jmh" include ":conscrypt-constants" include ":conscrypt-openjdk" include ":conscrypt-openjdk-uber" include ":conscrypt-testing" project(':conscrypt-api-doclet').projectDir = "$rootDir/api-doclet" as File -project(':conscrypt-benchmark-base').projectDir = "$rootDir/benchmark-base" as File -project(':conscrypt-benchmark-graphs').projectDir = "$rootDir/benchmark-graphs" as File -project(':conscrypt-benchmark-jmh').projectDir = "$rootDir/benchmark-jmh" as File project(':conscrypt-constants').projectDir = "$rootDir/constants" as File project(':conscrypt-openjdk').projectDir = "$rootDir/openjdk" as File project(':conscrypt-openjdk-uber').projectDir = "$rootDir/openjdk-uber" as File