Skip to content

Commit 9256135

Browse files
committed
- upgrades gradle from 4.5 to 6.6
1 parent b04bbb7 commit 9256135

6 files changed

Lines changed: 94 additions & 143 deletions

File tree

‎build.gradle‎

Lines changed: 34 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
/*
2-
* This build file was generated by the Gradle 'init' task.
2+
* This file was generated by the Gradle 'init' task.
33
*
44
* This generated file contains a sample Java Library project to get you started.
55
* For more details take a look at the Java Libraries chapter in the Gradle
6-
* user guide available at https://docs.gradle.org/4.5/userguide/java_library_plugin.html
6+
* User Manual available at https://docs.gradle.org/6.6/userguide/java_library_plugin.html
77
*/
88

9-
// Apply the java-library plugin to add support for Java Library
10-
apply plugin: 'java-library'
11-
apply plugin: 'java'
12-
apply plugin: 'eclipse'
13-
apply plugin: 'maven'
14-
apply plugin: 'maven-publish'
15-
apply plugin: 'signing'
16-
apply plugin: 'jacoco'
9+
plugins {
10+
// Apply the java-library plugin to add support for Java Library
11+
id 'java-library'
12+
id 'java'
13+
id 'eclipse'
14+
id 'maven-publish'
15+
id 'signing'
16+
id 'jacoco'
17+
}
1718

1819
// In this section you declare where to find the dependencies of your project
1920
repositories {
@@ -33,7 +34,7 @@ dependencies {
3334
api 'com.squareup.okhttp3:okhttp:3.12.1'
3435

3536
// https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple
36-
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
37+
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
3738
}
3839

3940
def pomConfig = {
@@ -50,7 +51,21 @@ def pomConfig = {
5051
//Maven Central Snapshot: publishSnapshotPublicationToMavenRepository
5152
//Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
5253
//Bintray Snapshot: publishSnapshotPublicationToMaven3Repository
53-
//Bintray Release: uploadArchives
54+
55+
task sourceJar(type: Jar) {
56+
from sourceSets.main.allJava
57+
archiveClassifier = 'sources'
58+
}
59+
60+
task javadocJar(type: Jar, dependsOn: javadoc) {
61+
from javadoc.destinationDir
62+
archiveClassifier = 'javadoc'
63+
}
64+
65+
signing {
66+
sign configurations.archives
67+
}
68+
tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
5469

5570
publishing {
5671

@@ -67,6 +82,7 @@ publishing {
6782
from components.java
6883

6984
artifact sourceJar
85+
artifact javadocJar
7086
pom.withXml {
7187
def root = asNode()
7288
root.appendNode('name', 'Microsoft Graph Core SDK for Java')
@@ -87,12 +103,8 @@ publishing {
87103
def pomFile = file("${project.buildDir}/generated-pom.xml")
88104
writeTo(pomFile)
89105
}
90-
artifact(sourceJar) {
91-
classifier = 'sources'
92-
}
93-
artifact(javadocJar) {
94-
classifier = 'javadoc'
95-
}
106+
artifact sourceJar
107+
artifact javadocJar
96108
}
97109

98110
mavenCentralRelease(MavenPublication) {
@@ -110,12 +122,8 @@ publishing {
110122
extension = 'pom.asc'
111123
}
112124
}
113-
artifact(sourceJar) {
114-
classifier = 'sources'
115-
}
116-
artifact(javadocJar) {
117-
classifier = 'javadoc'
118-
}
125+
artifact sourceJar
126+
artifact javadocJar
119127
project.tasks.signArchives.signatureFiles.each {
120128
artifact(it) {
121129
def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
@@ -188,14 +196,9 @@ publishing {
188196

189197
}
190198

191-
task sourceJar(type: Jar) {
192-
classifier = 'sources'
193-
from sourceSets.main.allJava
194-
}
195-
196199
compileJava {
197-
sourceCompatibility = 1.7
198-
targetCompatibility = 1.7
200+
sourceCompatibility = 1.8
201+
targetCompatibility = 1.8
199202
}
200203

201204
def getVersionCode() {
@@ -206,74 +209,12 @@ def getVersionName() {
206209
return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
207210
}
208211

209-
uploadArchives {
210-
211-
def bintrayUsername = ""
212-
213-
def bintrayApikey = ""
214-
215-
if (project.rootProject.file('local.properties').exists()) {
216-
217-
Properties properties = new Properties()
218-
219-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
220-
221-
bintrayUsername = properties.getProperty('bintray.user')
222-
223-
bintrayApikey = properties.getProperty('bintray.apikey')
224-
225-
}
226-
227-
configuration = configurations.archives
228-
229-
repositories.mavenDeployer {
230-
231-
pom {
232-
233-
setGroupId project.mavenGroupId
234-
235-
setArtifactId project.mavenArtifactId
236-
237-
setVersion getVersionName()
238-
239-
}
240-
241-
repository (url: project.mavenRepoUrl) {
242-
243-
url = url + "/" + getVersionName()
244-
245-
authentication(
246-
247-
// put these values in local file ~/.gradle/gradle.properties
248-
249-
userName: project.hasProperty("bintrayUsername") ? project.bintrayUsername : bintrayUsername,
250-
251-
password: project.hasProperty("bintrayApikey") ? project.bintrayApikey : bintrayApikey
252-
253-
)
254-
255-
}
256-
257-
}
258-
259-
}
260-
261-
task javadocJar(type: Jar, dependsOn: javadoc) {
262-
classifier = 'javadoc'
263-
from javadoc.destinationDir
264-
}
265-
266212
artifacts {
267213
archives jar
268214
archives sourceJar
269215
archives javadocJar
270216
}
271217

272-
signing {
273-
sign configurations.archives
274-
}
275-
tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
276-
277218
def customizePom(pom) {
278219
pom.withXml {
279220
def root = asNode()

‎gradle/wrapper/gradle-wrapper.jar‎

4.32 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

‎gradlew‎

Lines changed: 33 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 24 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)