Merge branch 'master' into mac_stress

Author: prbprbprb

android-stub/build.gradle

@@ -1,3 +1,8 @@
+plugins {
+    id 'conventions.common'
+    id 'conventions.jvm'
+}
+
 description = 'Conscrypt: Android-Stub'
 
 dependencies {

android/build.gradle

@@ -1,5 +1,8 @@
 plugins {
-    alias(libs.plugins.android.library)
+    id 'conventions.common'
+    id 'conventions.versionprops'
+    id 'conventions.boringssl'
+    id 'conventions.android'
 }
 
 description = 'Conscrypt: Android'

benchmark-android/build.gradle

@@ -1,5 +1,6 @@
 plugins {
-    alias(libs.plugins.android.library)
+    id 'conventions.common'
+    id 'conventions.android'
 }
 
 description = 'Conscrypt: Android Benchmarks'

benchmark-base/build.gradle

@@ -1,3 +1,8 @@
+plugins {
+    id 'conventions.common'
+    id 'conventions.jvm'
+}
+
 description = 'Conscrypt: Base library for benchmarks'
 
 dependencies {

benchmark-graphs/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id 'conventions.common'
+}
+
 apply plugin: 'application'
 
 dependencies {

benchmark-jmh/build.gradle

@@ -1,4 +1,6 @@
 plugins {
+    id 'conventions.common'
+    id 'conventions.jvm'
     alias libs.plugins.jmh
 }
 

build-logic/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    `kotlin-dsl`
+    `java-gradle-plugin`
+    id("groovy-gradle-plugin")
+}
+
+repositories {
+    mavenCentral()
+    google()
+    gradlePluginPortal()
+}
+
+// Annoyingly, build-logic is pre-built before the rest of the subprojects and so cannot
+// make use of the version catalogue in libs.versions.toml.
+dependencies {
+    // AGP
+    implementation("com.android.tools.build:gradle:7.4.2")
+    implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
+    implementation("com.google.gradle:osdetector-gradle-plugin:1.7.3")
+    implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.3.3")
+    implementation("com.dorongold.plugins:task-tree:3.0.0")
+    implementation(gradleApi())
+}

build-logic/src/main/groovy/conventions.android.gradle

@@ -0,0 +1,12 @@
+plugins {
+    id "com.android.library"
+}
+
+repositories {
+    google()
+}
+
+ext {
+    // Needs to be binary compatible with androidMinSdkVersion
+    androidMinJavaVersion = JavaVersion.VERSION_1_8
+}

build-logic/src/main/groovy/conventions.boringssl.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id 'org.ajoberstar.grgit'
+}
+
+def boringHome = (project.findProperty('boringsslHome') ?: System.getenv('BORINGSSL_HOME'))
+if (!boringHome) {
+    throw new GradleException("boringsslHome not set. Provide -PboringsslHome or \$BORINGSSL_HOME.")
+}
+
+def boringInclude = file("${boringHome}/include").absolutePath
+if (!file(boringInclude).exists()) {
+    throw new GradleException("BoringSSL include dir not found: ${boringInclude}")
+}
+
+ext {
+    boringsslHome       = boringHome
+    boringsslIncludeDir = boringInclude
+    boringSslVersion    = org.ajoberstar.grgit.Grgit.open(dir: boringHome).head().id
+}

build-logic/src/main/groovy/conventions.common.gradle

@@ -0,0 +1,26 @@
+plugins {
+    id 'jacoco'
+    id 'net.ltgt.errorprone'
+    id 'com.dorongold.task-tree'
+}
+
+group = "org.conscrypt"
+
+repositories {
+    mavenCentral()
+}
+
+jacoco {
+    toolVersion = libs.versions.jacoco
+}
+
+configurations {
+    jacocoAnt
+    jacocoAgent
+}
+
+dependencies {
+    jacocoAnt libs.jacoco.ant
+    jacocoAgent libs.jacoco.agent
+    errorprone libs.errorprone
+}