mirror of https://github.com/grpc/grpc-java.git
Bump Gradle to 8.14.3 and upgrade plugins
The syntax changes adding `=` were to address: https://docs.gradle.org/8.14.3/userguide/upgrading_version_8.html#groovy_space_assignment_syntax
This commit is contained in:
parent
36fe276a50
commit
6ffcbd927e
|
|
@ -10,7 +10,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'io.grpc.android.integrationtest'
|
namespace = 'io.grpc.android.integrationtest'
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
java {
|
java {
|
||||||
|
|
@ -41,7 +41,7 @@ android {
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
multiDexEnabled true
|
multiDexEnabled = true
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
debug { minifyEnabled false }
|
debug { minifyEnabled false }
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ plugins {
|
||||||
description = 'gRPC: Android'
|
description = 'gRPC: Android'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'io.grpc.android'
|
namespace = 'io.grpc.android'
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
|
@ -20,7 +20,7 @@ android {
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
lintOptions { abortOnError true }
|
lintOptions { abortOnError = true }
|
||||||
publishing {
|
publishing {
|
||||||
singleVariant('release') {
|
singleVariant('release') {
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ plugins {
|
||||||
description = 'gRPC BinderChannel'
|
description = 'gRPC BinderChannel'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'io.grpc.binder'
|
namespace = 'io.grpc.binder'
|
||||||
compileSdkVersion 34
|
compileSdkVersion 34
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility 1.8
|
sourceCompatibility 1.8
|
||||||
|
|
@ -18,16 +18,16 @@ android {
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
multiDexEnabled true
|
multiDexEnabled = true
|
||||||
}
|
}
|
||||||
lintOptions { abortOnError false }
|
lintOptions { abortOnError = false }
|
||||||
publishing {
|
publishing {
|
||||||
singleVariant('release') {
|
singleVariant('release') {
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
withJavadocJar()
|
withJavadocJar()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
testFixtures { enable true }
|
testFixtures { enable = true }
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
|
||||||
10
build.gradle
10
build.gradle
|
|
@ -25,7 +25,7 @@ subprojects {
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { // The google mirror is less flaky than mavenCentral()
|
maven { // The google mirror is less flaky than mavenCentral()
|
||||||
url "https://maven-central.storage-download.googleapis.com/maven2/"
|
url = "https://maven-central.storage-download.googleapis.com/maven2/"
|
||||||
metadataSources {
|
metadataSources {
|
||||||
mavenPom()
|
mavenPom()
|
||||||
ignoreGradleMetadataRedirection()
|
ignoreGradleMetadataRedirection()
|
||||||
|
|
@ -241,9 +241,9 @@ subprojects {
|
||||||
tasks.named("test").configure {
|
tasks.named("test").configure {
|
||||||
testLogging {
|
testLogging {
|
||||||
exceptionFormat = 'full'
|
exceptionFormat = 'full'
|
||||||
showExceptions true
|
showExceptions = true
|
||||||
showCauses true
|
showCauses = true
|
||||||
showStackTraces true
|
showStackTraces = true
|
||||||
}
|
}
|
||||||
maxHeapSize = '1500m'
|
maxHeapSize = '1500m'
|
||||||
}
|
}
|
||||||
|
|
@ -410,7 +410,7 @@ subprojects {
|
||||||
}
|
}
|
||||||
|
|
||||||
signing {
|
signing {
|
||||||
required false
|
required = false
|
||||||
sign publishing.publications.maven
|
sign publishing.publications.maven
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("javadoc").configure {
|
tasks.named("javadoc").configure {
|
||||||
failOnError false // no public or protected classes found to document
|
failOnError = false // no public or protected classes found to document
|
||||||
exclude 'io/grpc/census/internal/**'
|
exclude 'io/grpc/census/internal/**'
|
||||||
exclude 'io/grpc/census/Internal*'
|
exclude 'io/grpc/census/Internal*'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'io.grpc.cronet'
|
namespace = 'io.grpc.cronet'
|
||||||
compileSdkVersion 33
|
compileSdkVersion 33
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ tasks.named("compileJava").configure {
|
||||||
|
|
||||||
tasks.named("javadoc").configure {
|
tasks.named("javadoc").configure {
|
||||||
// Do not publish javadoc since currently there is no public API.
|
// Do not publish javadoc since currently there is no public API.
|
||||||
failOnError false // no public or protected classes found to document
|
failOnError = false // no public or protected classes found to document
|
||||||
exclude 'io/grpc/lookup/v1/**'
|
exclude 'io/grpc/lookup/v1/**'
|
||||||
exclude 'io/grpc/rls/*Provider.java'
|
exclude 'io/grpc/rls/*Provider.java'
|
||||||
exclude 'io/grpc/rls/internal/**'
|
exclude 'io/grpc/rls/internal/**'
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ pluginManagement {
|
||||||
// https://github.com/GoogleCloudPlatform/appengine-plugins/releases
|
// https://github.com/GoogleCloudPlatform/appengine-plugins/releases
|
||||||
id "com.google.cloud.tools.appengine" version "2.8.0"
|
id "com.google.cloud.tools.appengine" version "2.8.0"
|
||||||
// https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md
|
// https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md
|
||||||
id "com.google.cloud.tools.jib" version "3.4.4"
|
id "com.google.cloud.tools.jib" version "3.4.5"
|
||||||
// https://github.com/google/osdetector-gradle-plugin/tags
|
// https://github.com/google/osdetector-gradle-plugin/tags
|
||||||
id "com.google.osdetector" version "1.7.3"
|
id "com.google.osdetector" version "1.7.3"
|
||||||
// https://github.com/google/protobuf-gradle-plugin/releases
|
// https://github.com/google/protobuf-gradle-plugin/releases
|
||||||
|
|
@ -21,11 +21,11 @@ pluginManagement {
|
||||||
// https://github.com/melix/japicmp-gradle-plugin/blob/master/CHANGELOG.txt
|
// https://github.com/melix/japicmp-gradle-plugin/blob/master/CHANGELOG.txt
|
||||||
id "me.champeau.gradle.japicmp" version "0.4.2"
|
id "me.champeau.gradle.japicmp" version "0.4.2"
|
||||||
// https://github.com/melix/jmh-gradle-plugin/releases
|
// https://github.com/melix/jmh-gradle-plugin/releases
|
||||||
id "me.champeau.jmh" version "0.7.2"
|
id "me.champeau.jmh" version "0.7.3"
|
||||||
// https://github.com/tbroyer/gradle-errorprone-plugin/releases
|
// https://github.com/tbroyer/gradle-errorprone-plugin/releases
|
||||||
id "net.ltgt.errorprone" version "4.1.0"
|
id "net.ltgt.errorprone" version "4.3.0"
|
||||||
// https://github.com/xvik/gradle-animalsniffer-plugin/releases
|
// https://github.com/xvik/gradle-animalsniffer-plugin/releases
|
||||||
id "ru.vyarus.animalsniffer" version "2.0.0"
|
id "ru.vyarus.animalsniffer" version "2.0.1"
|
||||||
}
|
}
|
||||||
resolutionStrategy {
|
resolutionStrategy {
|
||||||
eachPlugin {
|
eachPlugin {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue