Skip to content

Commit 74dee5d

Browse files
authored
chore: update gradle and build dependencies (#977)
* chore: update gradle and build dependencies * chore: update jar bundling classifier * chore: format Java file to googleJavaFormat
1 parent 71444e9 commit 74dee5d

9 files changed

Lines changed: 243 additions & 161 deletions

File tree

build.gradle

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ buildscript {
1313

1414
plugins {
1515
id 'com.github.ben-manes.versions' version '0.51.0'
16-
id 'com.github.sherter.google-java-format' version '0.8'
17-
id "de.marcphilipp.nexus-publish" version "0.4.0"
18-
id 'io.codearte.nexus-staging' version '0.30.0'
16+
id 'com.github.sherter.google-java-format' version '0.9'
17+
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
1918
}
2019

2120
apply plugin: 'java'
@@ -34,14 +33,18 @@ repositories {
3433
mavenCentral()
3534
}
3635

36+
googleJavaFormat {
37+
toolVersion = "1.1"
38+
}
39+
3740
task javadocJar(type: Jar, dependsOn: javadoc) {
38-
classifier = 'javadoc'
41+
archiveClassifier = 'javadoc'
3942
from 'build/docs/javadoc'
4043
}
4144

4245
task sourcesJar(type: Jar) {
4346
from sourceSets.main.allSource
44-
classifier = 'sources'
47+
archiveClassifier = 'sources'
4548
}
4649

4750
artifacts {
@@ -104,8 +107,8 @@ jacoco {
104107

105108
jacocoTestReport {
106109
reports {
107-
xml.enabled = true // coveralls plugin depends on xml format report
108-
html.enabled = true
110+
xml.required = true // coveralls plugin depends on xml format report
111+
html.required = true
109112
}
110113
}
111114

@@ -184,6 +187,7 @@ publishing {
184187
}
185188

186189
nexusPublishing {
190+
packageGroup = "com.google.maps"
187191
repositories {
188192
sonatype {
189193
username = sonatypeUsername
@@ -193,12 +197,6 @@ nexusPublishing {
193197
}
194198
}
195199

196-
nexusStaging {
197-
username = sonatypeUsername
198-
password = sonatypePassword
199-
packageGroup = "com.google.maps"
200-
}
201-
202200
signing {
203201
sign publishing.publications.MapsJavaUtils
204202
}

gradle/wrapper/gradle-wrapper.jar

10 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 21 20:20:36 EST 2015
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 commit comments

Comments
 (0)